[grisbi-cvs] grisbi/src etats_affiche.c, 1.109, 1.110 gsb_currency.c, 1.58, 1.59 gsb_form.c, 1.158, 1.159 import.c, 1.330, 1.331

[Pierre Biava]

Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29383/src

Modified Files:
	etats_affiche.c gsb_currency.c gsb_form.c import.c 
Log Message:
fixed bug 1051 and minor corrections

Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -d -r1.330 -r1.331
--- import.c	14 Apr 2010 20:54:12 -0000	1.330
+++ import.c	15 Apr 2010 20:55:49 -0000	1.331
@@ -2637,7 +2637,7 @@
         break;
         case OFX_XFER:
         /* Transfer = Virement */
-        payment_number = gsb_data_payment_get_number_by_name ( _("Transfert"),
+        payment_number = gsb_data_payment_get_number_by_name ( _("Transfer"),
                         account_number );
         gsb_data_transaction_set_method_of_payment_number (transaction_number, payment_number);
         break;
@@ -2655,7 +2655,7 @@
         break;
         case OFX_DIRECTDEP:
         /* Direct deposit remplacé par Transfert = Virement */
-        payment_number = gsb_data_payment_get_number_by_name ( _("Transfert"),
+        payment_number = gsb_data_payment_get_number_by_name ( _("Transfer"),
                         account_number );
         gsb_data_transaction_set_method_of_payment_number (transaction_number, payment_number);
         break;

Index: etats_affiche.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_affiche.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- etats_affiche.c	7 Feb 2010 20:04:16 -0000	1.109
+++ etats_affiche.c	15 Apr 2010 20:55:48 -0000	1.110
@@ -1841,7 +1841,7 @@
 		if ( gsb_data_transaction_get_contra_transaction_number (transaction_number) > 0)
 		{
 		    pointeur_char = g_strconcat ( decalage_categ,
-						  _("Transfert"),
+						  _("Transfer"),
 						  NULL );
 		    ancienne_categ_speciale_etat = 1;
 		}

Index: gsb_form.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- gsb_form.c	10 Apr 2010 21:03:14 -0000	1.158
+++ gsb_form.c	15 Apr 2010 20:55:48 -0000	1.159
@@ -2271,7 +2271,7 @@
         case GDK_T:
         case GDK_v:
         case GDK_V:
-            payment_number = gsb_data_payment_get_number_by_name ( _("Transfert"),
+            payment_number = gsb_data_payment_get_number_by_name ( _("Transfer"),
                         account_number );
             if ( payment_number )
                 gsb_payment_method_set_combobox_history ( widget, payment_number );

Index: gsb_currency.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_currency.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- gsb_currency.c	5 Apr 2010 21:24:53 -0000	1.58
+++ gsb_currency.c	15 Apr 2010 20:55:48 -0000	1.59
@@ -268,7 +268,7 @@
 
     /* XXX still buggy, very slow on the gtk_list_store_clear() call,
      * try to find why. */
-    if ( detail_devise_compte )
+    if ( detail_devise_compte && G_IS_OBJECT ( detail_devise_compte ) )
     {
         handler_id = (gulong) g_object_get_data ( G_OBJECT 
                             (detail_devise_compte), "changed-hook" );
@@ -280,7 +280,7 @@
                             (detail_devise_compte));
         }
     }
-    if ( combo_devise_totaux_tiers )
+    if ( combo_devise_totaux_tiers && G_IS_OBJECT ( combo_devise_totaux_tiers ) )
     {
         handler_id = (gulong) g_object_get_data ( G_OBJECT 
                             (combo_devise_totaux_tiers), "changed-hook" );
@@ -289,7 +289,7 @@
                             (gulong) g_object_get_data ( G_OBJECT 
                             (combo_devise_totaux_tiers), "changed-hook" ) );
     }
-    if ( combo_devise_totaux_categ )
+    if ( combo_devise_totaux_categ  && G_IS_OBJECT ( combo_devise_totaux_categ ) )
     {
         handler_id = (gulong) g_object_get_data ( G_OBJECT 
                             (combo_devise_totaux_categ), "changed-hook" );
@@ -298,7 +298,7 @@
                             (gulong) g_object_get_data ( G_OBJECT 
                             (combo_devise_totaux_categ), "changed-hook" ) );
     }
-    if ( combo_devise_totaux_ib )
+    if ( combo_devise_totaux_ib  && G_IS_OBJECT ( combo_devise_totaux_ib ) )
     {
         handler_id = (gulong) g_object_get_data ( G_OBJECT 
                             (combo_devise_totaux_ib), "changed-hook" );
@@ -347,7 +347,7 @@
     mise_a_jour_liste_echeances_manuelles_accueil = 1;
     mise_a_jour_liste_echeances_auto_accueil = 1;
 
-    if ( detail_devise_compte )
+    if ( detail_devise_compte && G_IS_OBJECT ( detail_devise_compte ) )
     {
         handler_id = (gulong) g_object_get_data ( G_OBJECT 
                             (detail_devise_compte), "changed-hook" );
@@ -359,7 +359,7 @@
                             (detail_devise_compte), "changed-hook" ) );
         }
     }
-    if ( combo_devise_totaux_tiers )
+    if ( combo_devise_totaux_tiers && G_IS_OBJECT ( combo_devise_totaux_tiers ) )
     {
         handler_id = (gulong) g_object_get_data ( G_OBJECT 
                             (combo_devise_totaux_tiers), "changed-hook" );
@@ -372,7 +372,7 @@
                             (combo_devise_totaux_tiers), "changed-hook" ) );
         }
     }
-    if ( combo_devise_totaux_categ )
+    if ( combo_devise_totaux_categ  && G_IS_OBJECT ( combo_devise_totaux_categ ) )
     {
         handler_id = (gulong) g_object_get_data ( G_OBJECT 
                             (combo_devise_totaux_categ), "changed-hook" );
@@ -385,7 +385,7 @@
                             (combo_devise_totaux_categ), "changed-hook" ) );
         }
     }
-    if ( combo_devise_totaux_ib )
+    if ( combo_devise_totaux_ib  && G_IS_OBJECT ( combo_devise_totaux_ib ) )
     {
         handler_id = (gulong) g_object_get_data ( G_OBJECT 
                             (combo_devise_totaux_ib), "changed-hook" );