[grisbi-cvs] grisbi/src balance_estimate_config.c, 1.14, 1.15 fenetre_principale.c, 1.133, 1.134 fenetre_principale.h, 1.32, 1.33 gsb_account.c, 1.47, 1.48 gsb_account_property.c, 1.51, 1.52 gsb_data_payment.c, 1.20, 1.21 comptes_onglet.c, 1.45, NONE comptes_onglet.h, 1.9, NONE

Pierre Biava pbiava at users.sourceforge.net
Sun Apr 18 16:38:31 CEST 2010 

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

Modified Files:
	balance_estimate_config.c fenetre_principale.c 
	fenetre_principale.h gsb_account.c gsb_account_property.c 
	gsb_data_payment.c 
Removed Files:
	comptes_onglet.c comptes_onglet.h 
Log Message:
delete files src/comptes_onglet.c src/comptes_onglet.h

Index: gsb_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- gsb_account.c	24 Aug 2009 13:11:48 -0000	1.47
+++ gsb_account.c	18 Apr 2010 14:38:28 -0000	1.48
@@ -133,16 +133,16 @@
      * (can come here at the end of the new file assistant...) */
     if (notebook_general)
     {
-	/* Add an entry in navigation pane. */
-	gsb_gui_navigation_add_account ( account_number,
-					 TRUE );
+        /* Add an entry in navigation pane. */
+        gsb_gui_navigation_add_account ( account_number, TRUE );
 
-	/* Go to accounts properties */
-	gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook_general ),
-				GSB_ACCOUNT_PAGE );
-	gtk_notebook_set_current_page ( GTK_NOTEBOOK ( account_page ), 1 );
+        /* Go to accounts properties */
+        gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook_general ),
+                    GSB_ACCOUNT_PAGE );
+        gtk_notebook_set_current_page ( GTK_NOTEBOOK ( account_page ),
+                        gsb_gui_on_account_get_property_page ( GTK_NOTEBOOK ( account_page ) ) );
 
-	gsb_account_property_fill_page ();
+        gsb_account_property_fill_page ();
     }
 
     if ( etat.modification_fichier == 0 )

--- comptes_onglet.c DELETED ---

Index: fenetre_principale.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- fenetre_principale.h	5 Apr 2010 21:24:53 -0000	1.32
+++ fenetre_principale.h	18 Apr 2010 14:38:28 -0000	1.33
@@ -22,6 +22,7 @@
 void gsb_gui_headings_update_suffix ( gchar * suffix );
 void gsb_gui_headings_update_title ( gchar * title );
 void gsb_gui_notebook_change_page ( GsbGeneralNotebookPages page );
+gint gsb_gui_on_account_get_property_page ( GtkNotebook *account_page );
 gboolean gsb_gui_on_account_switch_page ( GtkNotebook *notebook,
                         GtkNotebookPage *page,
                         guint page_number,

Index: balance_estimate_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_config.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- balance_estimate_config.c	18 Apr 2010 07:53:06 -0000	1.14
+++ balance_estimate_config.c	18 Apr 2010 14:38:28 -0000	1.15
@@ -683,51 +683,69 @@
                         gpointer null )
 {
     GtkWidget *notebook;
-    GtkWidget *widget;
-    GtkWidget *button;
-    gpointer ptr;
+    GtkWidget *widget = NULL;
+    GtkWidget *button = NULL;
+    gpointer ptr = NULL;
     gint account_number;
     gint param;
     gint months;
 
+    devel_debug (NULL);
     notebook = g_object_get_data ( G_OBJECT ( notebook_general ), "account_notebook" );
     account_number = gsb_account_get_combo_account_number ( combo );
 
     param = gsb_data_account_get_bet_spin_range ( account_number );
     months = gsb_data_account_get_bet_months ( account_number );
     button = g_object_get_data ( G_OBJECT ( notebook ), "bet_config_account_spin_button" );
-    ptr = g_object_get_data ( G_OBJECT ( button ), "pointer" );
-    g_signal_handlers_block_by_func ( G_OBJECT ( button ),
+    if ( button && G_IS_OBJECT ( button ) )
+    {
+        ptr = g_object_get_data ( G_OBJECT ( button ), "pointer" );
+        g_signal_handlers_block_by_func ( G_OBJECT ( button ),
                         G_CALLBACK ( bet_config_duration_number_changed ),
                         ptr );
+    }
 
     if ( param == 0 )
     {
         widget = g_object_get_data ( G_OBJECT ( notebook ), "bet_config_account_previous" );
-        g_signal_handlers_block_by_func ( G_OBJECT ( widget ),
+        if ( widget && G_IS_OBJECT ( widget ) )
+        {
+            g_signal_handlers_block_by_func ( G_OBJECT ( widget ),
                         G_CALLBACK ( bet_config_duration_button_clicked ),
                         button );
-        gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), TRUE );
-        gtk_spin_button_set_range ( GTK_SPIN_BUTTON ( button ), 1.0, 240.0 );
-        gtk_spin_button_set_value ( GTK_SPIN_BUTTON ( button ),
-                        (gdouble) months );
+            gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), TRUE );
+        }
+        if ( button )
+        {
+            gtk_spin_button_set_range ( GTK_SPIN_BUTTON ( button ), 1.0, 20.0 );
+            gtk_spin_button_set_value ( GTK_SPIN_BUTTON ( button ),
+                        (gdouble) months / 12.0 );
+        }
     }
     else
     {
         widget = g_object_get_data ( G_OBJECT ( notebook ), "bet_config_account_widget" );
-        g_signal_handlers_block_by_func ( G_OBJECT ( widget ),
+        if ( widget && G_IS_OBJECT ( widget ) )
+        {
+            g_signal_handlers_block_by_func ( G_OBJECT ( widget ),
                         G_CALLBACK ( bet_config_duration_button_clicked ),
                         button );
-        gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), TRUE );
-        gtk_spin_button_set_range ( GTK_SPIN_BUTTON ( button ), 1.0, 20.0 );
-        gtk_spin_button_set_value ( GTK_SPIN_BUTTON ( button ),
+            gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), TRUE );
+        }
+        if ( button )
+        {
+            gtk_spin_button_set_range ( GTK_SPIN_BUTTON ( button ), 1.0, 20.0 );
+            gtk_spin_button_set_value ( GTK_SPIN_BUTTON ( button ),
                         (gdouble) months / 12.0 );
+        }
     }
 
-    g_signal_handlers_unblock_by_func ( G_OBJECT ( widget ),
+    if ( widget && G_IS_OBJECT ( widget ) )
+        g_signal_handlers_unblock_by_func ( G_OBJECT ( widget ),
                         G_CALLBACK ( bet_config_duration_button_clicked ),
                         button );
-    g_signal_handlers_unblock_by_func ( G_OBJECT ( button ),
+    if ( button && G_IS_OBJECT ( button ) )
+        g_signal_handlers_unblock_by_func ( G_OBJECT ( button ),
                         G_CALLBACK ( bet_config_duration_number_changed ),
                         ptr );
 
@@ -738,7 +756,8 @@
     else
         button = g_object_get_data ( G_OBJECT ( notebook ), "bet_config_hist_button_1" );
 
-    gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button ), TRUE );
+    if ( button )
+        gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button ), TRUE );
 
     param = gsb_data_account_get_bet_hist_fyear ( account_number );
     widget = g_object_get_data ( G_OBJECT ( notebook ), "bet_config_hist_fyear_combo" );

Index: fenetre_principale.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- fenetre_principale.c	18 Apr 2010 07:53:06 -0000	1.133
+++ fenetre_principale.c	18 Apr 2010 14:38:28 -0000	1.134
@@ -250,7 +250,7 @@
 #endif /* ENABLE_BALANCE_ESTIMATE */
 
     gtk_notebook_append_page ( GTK_NOTEBOOK ( account_page ),
-                        creation_onglet_comptes (),
+                        gsb_account_property_create_page (),
                         gtk_label_new (SPACIFY(_("Properties"))) );
 
     g_signal_connect ( G_OBJECT (account_page),
@@ -448,6 +448,26 @@
 
     return FALSE;
 }
+
+
+gint gsb_gui_on_account_get_property_page ( GtkNotebook *account_page )
+{
+    GtkWidget *child;
+    gint i = 0;
+
+    while ( ( child = gtk_notebook_get_nth_page ( account_page, i ) ) )
+    {
+        const gchar *label;
+
+        label = gtk_widget_get_name ( child );
+        if ( g_strcmp0 ( label, "properties_page" ) == 0 )
+            return i;
+        else
+            i++;
+    }
+
+    return 0;
+}
 /* Local Variables: */
 /* c-basic-offset: 4 */
 /* End: */

--- comptes_onglet.h DELETED ---

Index: gsb_data_payment.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_payment.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gsb_data_payment.c	5 Apr 2010 21:24:53 -0000	1.20
+++ gsb_data_payment.c	18 Apr 2010 14:38:28 -0000	1.21
@@ -35,6 +35,7 @@
 #include "./utils_str.h"
 #include "./gsb_data_account.h"
 #include "./include.h"
+#include "./erreur.h"
 /*END_INCLUDE*/
 
 
@@ -698,7 +699,7 @@
 {
     gint payment_number;
     GSList *sort_list = NULL;
-
+devel_debug_int ( account_number);
     switch (gsb_data_account_get_kind (account_number))
     {
 	case GSB_TYPE_CASH:

Index: gsb_account_property.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account_property.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- gsb_account_property.c	11 Apr 2010 18:10:36 -0000	1.51
+++ gsb_account_property.c	18 Apr 2010 14:38:28 -0000	1.52
@@ -202,6 +202,7 @@
 
     /* la fenetre ppale est une vbox avec les détails en haut et appliquer en bas */
     onglet = gtk_vbox_new ( FALSE, 5 );
+    gtk_widget_set_name ( onglet, "properties_page" );
     gtk_container_set_border_width ( GTK_CONTAINER ( onglet ), 10 );
 
     size_group = gtk_size_group_new ( GTK_SIZE_GROUP_HORIZONTAL );

More information about the cvs mailing list