r17054 - gnucash/branches/2.2/src/import-export - [r17043] Avoid critical warnings in the import account matcher dialog.

[Christian Stimming]

Author: cstim
Date: 2008-03-26 17:04:48 -0400 (Wed, 26 Mar 2008)
New Revision: 17054
Trac: http://svn.gnucash.org/trac/changeset/17054

Modified:
   gnucash/branches/2.2/src/import-export/import-account-matcher.c
Log:
[r17043] Avoid critical warnings in the import account matcher dialog.

If no account is selected, simply do not call engine functions on it.


Modified: gnucash/branches/2.2/src/import-export/import-account-matcher.c
===================================================================
--- gnucash/branches/2.2/src/import-export/import-account-matcher.c	2008-03-26 21:04:40 UTC (rev 17053)
+++ gnucash/branches/2.2/src/import-export/import-account-matcher.c	2008-03-26 21:04:48 UTC (rev 17054)
@@ -228,17 +228,19 @@
 	switch (response) {
 	 case GTK_RESPONSE_OK:
 	  retval = gnc_tree_view_account_get_selected_account(picker->account_tree);
-	  retval_name = xaccAccountGetName(retval);
-	  DEBUG("Selected account %p, %s", retval,
-		retval_name ? retval_name : "(null)");
+	  if (retval)
+	    retval_name = xaccAccountGetName(retval);
+	  if (!retval_name)
+	    retval_name = "(null)";
+	  DEBUG("Selected account %p, %s", retval, retval_name);
 
 	  /* See if the selected account is a placeholder. */
-	  if (xaccAccountGetPlaceholder (retval)) {
+	  if (retval && xaccAccountGetPlaceholder (retval)) {
 	    gnc_error_dialog
 	      (picker->dialog,
 	       _("The account %s is a placeholder account and does not allow "
 		 "transactions. Please choose a different account."),
-	       retval_name ? retval_name : "(null)");
+	       retval_name);
 	    response = GNC_RESPONSE_NEW;
 	    break;
 	  }