[grisbi-cvs] grisbi/src accueil.c, 1.193, 1.194 gsb_assistant_first.c, 1.18, 1.19 gsb_data_account.c, 1.62, 1.63 gsb_file_config.c, 1.67, 1.68 gsb_reconcile.c, 1.28, 1.29 main.c, 1.137, 1.138

Pierre Biava pbiava at users.sourceforge.net
Fri Jan 30 19:40:06 CET 2009


Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24547/src

Modified Files:
	accueil.c gsb_assistant_first.c gsb_data_account.c 
	gsb_file_config.c gsb_reconcile.c main.c 
Log Message:
update strings fr.po, fixed various bugs and bug 468

Index: gsb_assistant_first.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_first.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gsb_assistant_first.c	25 Jan 2009 07:50:09 -0000	1.18
+++ gsb_assistant_first.c	30 Jan 2009 18:40:04 -0000	1.19
@@ -283,7 +283,7 @@
     g_signal_connect ( G_OBJECT (button),
                         "selection-changed",
                         G_CALLBACK (gsb_config_backup_dir_chosen),
-                        NULL );
+                        dialog );
     gtk_box_pack_start ( GTK_BOX ( hbox ), button,
 			 FALSE, TRUE, 0);
 

Index: gsb_reconcile.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_reconcile.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- gsb_reconcile.c	15 Dec 2008 22:21:58 -0000	1.28
+++ gsb_reconcile.c	30 Jan 2009 18:40:04 -0000	1.29
@@ -50,6 +50,7 @@
 #include "./gsb_data_transaction.h"
 #include "./include.h"
 #include "./gsb_real.h"
+#include "./erreur.h"
 /*END_INCLUDE*/
 
 /*START_STATIC*/
@@ -57,9 +58,9 @@
 				gpointer null );
 static gboolean gsb_reconcile_finish_reconciliation ( GtkWidget *button,
 					       gpointer null );
-static gboolean gsb_reconcile_key_press_event ( GtkWidget *entry,
-					 GdkEventKey *event,
-					 gpointer null );
+//~ static gboolean gsb_reconcile_key_press_event ( GtkWidget *entry,
+					 //~ GdkEventKey *event,
+					 //~ gpointer null );
 static void gsb_reconcile_sensitive ( gboolean sensitive );
 /*END_STATIC*/
 
@@ -110,8 +111,8 @@
     gtk_container_add ( GTK_CONTAINER ( frame ), vbox );
 
     /* if we use the arrows in the reconcile widget, work on the transaction list */
-    g_signal_connect ( G_OBJECT ( vbox ), "key_press_event",
-		       G_CALLBACK ( gsb_transactions_list_key_press ), NULL );
+    //~ g_signal_connect ( G_OBJECT ( vbox ), "key_press_event",
+		       //~ G_CALLBACK ( gsb_transactions_list_key_press ), NULL );
 
     /* the title of the frame */ 
     label = gtk_label_new ( NULL );
@@ -130,9 +131,9 @@
     reconcile_number_entry = gtk_entry_new ();
     gtk_widget_set_tooltip_text ( GTK_WIDGET (reconcile_number_entry),
 				  SPACIFY(_("If reconciliation reference ends in a digit, it is automatically incremented at each reconciliation.\nYou can let it empty if you don't want to keep a trace of the reconciliation.")));
-    g_signal_connect ( G_OBJECT ( reconcile_number_entry ),
-		       "key-press-event",
-		       G_CALLBACK ( gsb_reconcile_key_press_event ), NULL );
+    //~ g_signal_connect ( G_OBJECT ( reconcile_number_entry ),
+		       //~ "key-press-event",
+		       //~ G_CALLBACK ( gsb_reconcile_key_press_event ), NULL );
     gtk_box_pack_start ( GTK_BOX ( hbox ), reconcile_number_entry, TRUE, TRUE, 0);
 
     separator = gtk_hseparator_new();
@@ -169,18 +170,18 @@
     g_signal_connect ( G_OBJECT ( reconcile_initial_balance_entry ), "changed",
 		       G_CALLBACK (gsb_reconcile_update_amounts),
 		       NULL );
-    g_signal_connect ( G_OBJECT ( reconcile_initial_balance_entry ),
-		       "key-press-event",
-		       G_CALLBACK ( gsb_reconcile_key_press_event ), NULL );
+    //~ g_signal_connect ( G_OBJECT ( reconcile_initial_balance_entry ),
+		       //~ "key-press-event",
+		       //~ G_CALLBACK ( gsb_reconcile_key_press_event ), NULL );
     gtk_table_attach_defaults ( GTK_TABLE ( table ), reconcile_initial_balance_entry,
 				2, 3, 2, 3 );
 
     /* make the new date entry */
     reconcile_new_date_entry = gsb_calendar_entry_new (TRUE);
     gtk_widget_set_size_request ( reconcile_new_date_entry, 50, -1 );
-    g_signal_connect ( G_OBJECT ( reconcile_new_date_entry ),
-		       "key-press-event",
-		       G_CALLBACK( gsb_reconcile_key_press_event ), NULL );
+    //~ g_signal_connect ( G_OBJECT ( reconcile_new_date_entry ),
+		       //~ "key-press-event",
+		       //~ G_CALLBACK( gsb_reconcile_key_press_event ), NULL );
     gtk_table_attach_defaults ( GTK_TABLE ( table ), reconcile_new_date_entry,
 				0, 1, 4, 5 );
 
@@ -190,9 +191,9 @@
     g_signal_connect ( G_OBJECT ( reconcile_final_balance_entry ), "changed",
 		       G_CALLBACK (gsb_reconcile_update_amounts),
 		       NULL );
-    g_signal_connect ( G_OBJECT ( reconcile_final_balance_entry ),
-		       "key-press-event",
-		       G_CALLBACK ( gsb_reconcile_key_press_event ), NULL );
+    //~ g_signal_connect ( G_OBJECT ( reconcile_final_balance_entry ),
+		       //~ "key-press-event",
+		       //~ G_CALLBACK ( gsb_reconcile_key_press_event ), NULL );
     gtk_table_attach_defaults ( GTK_TABLE ( table ), reconcile_final_balance_entry,
 				2, 3, 4, 5 );
 
@@ -700,35 +701,36 @@
  *
  * \return FALSE
  * */
-gboolean gsb_reconcile_key_press_event ( GtkWidget *entry,
-					 GdkEventKey *event,
-					 gpointer null )
-{
-    switch ( event -> keyval )
-    {
-	case GDK_Tab:
-	    /* This is hardcoded because normal cycle does not work
-	     * ... why? -- benj */
-	    if ( entry == reconcile_number_entry )
-	    {
-		gtk_widget_grab_focus ( GTK_WIDGET ( reconcile_new_date_entry ) );
-	    }
-	    if ( entry == reconcile_new_date_entry )
-	    {
-		gtk_widget_grab_focus ( GTK_WIDGET ( reconcile_final_balance_entry ) );
-	    }
-	    if ( entry == reconcile_final_balance_entry )
-	    {
-		gtk_widget_grab_focus ( GTK_WIDGET ( reconcile_number_entry ) );
-	    }
-	    return FALSE;
-
-	default:
-	    /* Reverting to default handler */
-	    return FALSE;
-    }
-    return TRUE;
-}
+//~ gboolean gsb_reconcile_key_press_event ( GtkWidget *entry,
+					 //~ GdkEventKey *event,
+					 //~ gpointer null )
+//~ {
+    //~ switch ( event -> keyval )
+    //~ {
+	//~ case GDK_Tab:
+	    //~ /* This is hardcoded because normal cycle does not work
+	     //~ * ... why? -- benj 
+         //~ * tabs now operating normally in my configuration pbiava*/
+        //~ devel_debug ("GDK_Tab");
+	    //~ if ( entry == reconcile_number_entry )
+	    //~ {
+            //~ gtk_widget_grab_focus ( GTK_WIDGET ( reconcile_new_date_entry ) );
+	    //~ }
+	    //~ else if ( entry == reconcile_new_date_entry )
+	    //~ {
+            //~ gtk_widget_grab_focus ( GTK_WIDGET ( reconcile_final_balance_entry ) );
+	    //~ }
+	    //~ else if ( entry == reconcile_final_balance_entry )
+	    //~ {
+            //~ gtk_widget_grab_focus ( GTK_WIDGET ( reconcile_number_entry ) );
+	    //~ }
+	    //~ return FALSE;
+	//~ default:
+	    //~ /* Reverting to default handler */
+	    //~ return FALSE;
+    //~ }
+    //~ return TRUE;
+//~ }
 
 
 /**

Index: accueil.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/accueil.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- accueil.c	24 Jan 2009 17:56:58 -0000	1.193
+++ accueil.c	30 Jan 2009 18:40:04 -0000	1.194
@@ -77,8 +77,8 @@
 extern gsb_real null_real ;
 extern GSList *scheduled_transactions_taken;
 extern GSList *scheduled_transactions_to_take;
-extern gchar *titre_fichier ;
-extern GtkWidget *window ;
+extern gchar *titre_fichier;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 GtkWidget *logo_accueil = NULL;

Index: gsb_data_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_account.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- gsb_data_account.c	24 Jan 2009 17:56:58 -0000	1.62
+++ gsb_data_account.c	30 Jan 2009 18:40:04 -0000	1.63
@@ -2585,11 +2585,12 @@
     }
     pixbuf = gdk_pixbuf_new_from_file ( g_build_filename (PIXMAPS_DIR,
                            account_icon, NULL), &error );
-    g_object_set_data ( G_OBJECT ( pixbuf ), "name_icon",  
-                           g_build_filename (PIXMAPS_DIR,
-                           account_icon, NULL) );
+    if ( pixbuf )
+        g_object_set_data ( G_OBJECT ( pixbuf ), "name_icon",  
+                               g_build_filename (PIXMAPS_DIR,
+                               account_icon, NULL) );
 
-    if ( ! pixbuf )
+    else
         devel_debug ( error -> message );
 
     return pixbuf;

Index: main.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/main.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- main.c	24 Jan 2009 17:56:58 -0000	1.137
+++ main.c	30 Jan 2009 18:40:04 -0000	1.138
@@ -1,7 +1,7 @@
 /* *******************************************************************************/
 /*                                 GRISBI                                        */
 /* Programme de gestion financière personnelle                                   */
-/*           	  license : GPL                                                  */
+/*           	  license : GPLv2                                             */
 /*                                                                               */
 /*     Copyright (C)    2000-2008 Cédric Auger (cedric at grisbi.org)               */
 /*                      2003-2008 Benjamin Drieu (bdrieu at april.org)              */

Index: gsb_file_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_config.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- gsb_file_config.c	25 Jan 2009 07:50:09 -0000	1.67
+++ gsb_file_config.c	30 Jan 2009 18:40:04 -0000	1.68
@@ -508,10 +508,12 @@
 				"General",
 				"Font name",
 				etat.font_string );
+    if (etat.latex_command)
     g_key_file_set_string ( config,
 			    "General",
 			    "Latex command",
 			    etat.latex_command );
+    if (etat.dvips_command)
     g_key_file_set_string ( config,
 			    "General",
 			    "Dvips command",



More information about the cvs mailing list