AUDIT: r23526 - gnucash/trunk/src/import-export/qif-import - QifImport: Fix crash from attempting to import an empty file.
John Ralls
jralls at code.gnucash.org
Mon Dec 9 22:34:36 EST 2013
Author: jralls
Date: 2013-12-09 22:34:36 -0500 (Mon, 09 Dec 2013)
New Revision: 23526
Trac: http://svn.gnucash.org/trac/changeset/23526
Modified:
gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c
Log:
QifImport: Fix crash from attempting to import an empty file.
BP
Modified: gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c 2013-12-10 03:34:27 UTC (rev 23525)
+++ gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c 2013-12-10 03:34:36 UTC (rev 23526)
@@ -1547,7 +1547,7 @@
gint num = gtk_assistant_get_current_page (assistant);
GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
- /* Enable the Assistant Buttons */
+ /* Disable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, FALSE);
}
@@ -1885,7 +1885,7 @@
}
}
- /* Enable the assistant buttons */
+ /* Enable the assistant Forward button */
gtk_assistant_set_page_complete (GTK_ASSISTANT(wind->window), page, TRUE);
/* Set Pause and Start buttons */
@@ -1935,7 +1935,7 @@
gtk_widget_set_sensitive(wind->load_pause, FALSE);
gtk_widget_set_sensitive(wind->load_start, TRUE);
- /* Enable the assistant buttons */
+ /* Disable the assistant Forward button */
gtk_assistant_set_page_complete (assistant, page, FALSE);
}
@@ -2062,12 +2062,12 @@
if (!acct_name || acct_name[0] == 0)
{
- /* Disable the assistant Buttons */
+ /* Disable the assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, FALSE);
}
else
{
- /* Enable the assistant Buttons */
+ /* Enable the assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
}
}
@@ -2098,7 +2098,7 @@
scm_name = scm_from_locale_string(acct_name ? acct_name : "");
scm_call_2(fix_default, wind->selected_file, scm_name);
- /* Enable the assistant Buttons */
+ /* Enable the assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
update_file_page(wind);
@@ -2233,7 +2233,7 @@
PINFO("Total Number of Assistant Pages is %d", gtk_assistant_get_n_pages (assistant));
- /* Enable the Assistant Buttons */
+ /* Enable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
/* Jump to Summary page if load_stop TRUE */
@@ -2270,7 +2270,7 @@
update_memo_page(wind);
gnc_unset_busy_cursor(NULL);
- /* Enable the Assistant Buttons */
+ /* Enable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
}
@@ -2316,7 +2316,7 @@
PINFO("Total Number of Assistant Pages is %d", gtk_assistant_get_n_pages (assistant));
- /* Enable the Assistant Buttons */
+ /* Enable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
/* Jump to Summary page if load_stop TRUE */
@@ -2351,7 +2351,7 @@
gint num = gtk_assistant_get_current_page (assistant);
GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
- /* Enable the Assistant Buttons */
+ /* Enable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
/* If there are no category mappings, jump this step. */
@@ -2401,7 +2401,7 @@
PINFO("Total Number of Assistant Pages is %d", gtk_assistant_get_n_pages (assistant));
- /* Enable the Assistant Buttons */
+ /* Enable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
/* Jump to Summary page if load_stop TRUE */
@@ -2436,7 +2436,7 @@
gint num = gtk_assistant_get_current_page (assistant);
GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
- /* Enable the Assistant Buttons */
+ /* Enable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
/* If there are no memo mappings, jump this step. */
@@ -2503,7 +2503,7 @@
gtk_widget_hide (wind->book_option_message);
}
- /* Enable the Assistant Buttons */
+ /* Enable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
}
@@ -2569,7 +2569,7 @@
PINFO("Total Number of Assistant Pages is %d", gtk_assistant_get_n_pages (assistant));
- /* Enable the Assistant Buttons */
+ /* Enable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
/* Jump to Summary page if load_stop TRUE */
@@ -2606,6 +2606,8 @@
QIFAssistantPage *qpage = g_object_get_data(G_OBJECT(page), "page_struct");
const gchar *ns;
+ g_return_if_fail (qpage != NULL);
+
/* Get any entered namespace. */
ns = gtk_entry_get_text( GTK_ENTRY( gtk_bin_get_child( GTK_BIN( GTK_COMBO_BOX(qpage->namespace_combo)))));
@@ -2936,7 +2938,7 @@
wind->load_stop = TRUE;
}
- /* Enable the Assistant Buttons */
+ /* Enable the Assistant Forward Button */
gtk_assistant_set_page_complete (GTK_ASSISTANT(wind->window), page, TRUE);
/* Set Pause and Start buttons */
@@ -2988,7 +2990,7 @@
gtk_widget_set_sensitive(wind->convert_pause, FALSE);
gtk_widget_set_sensitive(wind->convert_start, TRUE);
- /* Enable the assistant buttons */
+ /* Disable the assistant Forward button */
gtk_assistant_set_page_complete (assistant, page, FALSE);
/* Before creating transactions, if this is a new book, let user specify
@@ -3017,7 +3019,7 @@
PINFO("Total Number of Assistant Pages is %d", gtk_assistant_get_n_pages (assistant));
- /* Enable the Assistant Buttons */
+ /* Enable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
/* Jump to Summary page if load_stop TRUE */
@@ -3109,7 +3111,7 @@
else
gtk_assistant_set_current_page (assistant, num + 1 );
- /* Enable the Assistant Buttons */
+ /* Enable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
}
@@ -3128,7 +3130,7 @@
gint num = gtk_assistant_get_current_page (assistant);
GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
- /* Enable the Assistant Buttons */
+ /* Enable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
}
@@ -3216,7 +3218,7 @@
g_free(text);
- /* Enable the Assistant Buttons */
+ /* Enable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, TRUE);
}
More information about the gnucash-changes
mailing list