[grisbi-cvs] grisbi/src fenetre_principale.c, 1.125, 1.126 fenetre_principale.h, 1.29, 1.30 navigation.c, 1.137, 1.138

[Pierre Biava]

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

Modified Files:
	fenetre_principale.c fenetre_principale.h navigation.c 
Log Message:
Fixed the bug of display categories

Index: fenetre_principale.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- fenetre_principale.c	3 Mar 2010 22:21:49 -0000	1.125
+++ fenetre_principale.c	4 Mar 2010 18:36:07 -0000	1.126
@@ -234,7 +234,7 @@
     gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook ),
                         account_page,
                         gtk_label_new (SPACIFY(_("Accounts"))) );
-    g_object_set_data ( G_OBJECT (notebook), "account_notebook", account_page );
+    
     
     gtk_notebook_append_page ( GTK_NOTEBOOK ( account_page ),
                         creation_fenetre_operations (),
@@ -243,6 +243,8 @@
                         creation_onglet_comptes (),
                         gtk_label_new (SPACIFY(_("Properties"))) );
 
+g_object_set_data ( G_OBJECT (notebook), "account_notebook", account_page );
+
 #ifdef ENABLE_BALANCE_ESTIMATE
      /* append the balance estimate pages */
     gtk_notebook_append_page ( GTK_NOTEBOOK ( account_page ),

Index: navigation.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/navigation.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- navigation.c	3 Mar 2010 22:21:49 -0000	1.137
+++ navigation.c	4 Mar 2010 18:36:07 -0000	1.138
@@ -291,26 +291,6 @@
 		       NAVIGATION_SENSITIVE, 1,
 		       -1 );
 
-//~ #ifdef ENABLE_BALANCE_ESTIMATE 
-    //~ /* Balance estimate */
-    //~ tmpstr = g_build_filename( PIXMAPS_DIR,
-			       //~ "balance_estimate.png", NULL );
-    //~ pixbuf = gdk_pixbuf_new_from_file ( tmpstr , NULL );
-    //~ g_free ( tmpstr );
-    //~ gtk_tree_store_append(GTK_TREE_STORE(navigation_model), &iter, NULL);
-    //~ gtk_tree_store_set(GTK_TREE_STORE(navigation_model), &iter, 
-		       //~ NAVIGATION_PIX, pixbuf,
-		       //~ NAVIGATION_TEXT, _("Balance estimate"), 
-		       //~ NAVIGATION_PIX_VISIBLE, TRUE, 
-		       //~ NAVIGATION_FONT, 800,
-		       //~ NAVIGATION_PAGE, GSB_BALANCE_ESTIMATE_PAGE,
-		       //~ NAVIGATION_ACCOUNT, -1,
-		       //~ NAVIGATION_REPORT, -1,
-		       //~ NAVIGATION_SENSITIVE, 1,
-		       //~ -1 );
-//~ #endif /* ENABLE_BALANCE_ESTIMATE */
-
-
     /* Categories */
     tmpstr = g_build_filename( PIXMAPS_DIR,
 			       "categories.png", NULL );
@@ -1234,19 +1214,6 @@
 		payee_fill_tree ();
 	    break;
 
-//~ #ifdef ENABLE_BALANCE_ESTIMATE 
-	//~ case GSB_BALANCE_ESTIMATE_PAGE:
-	    //~ notice_debug ("Sold balance estimate page selected");
-
-	    //~ /* set the title */
-	    //~ title = g_strdup(_("Balance estimate"));
-
-	    //~ /* what to be done if switch to that page */
-	    //~ gsb_form_set_expander_visible (FALSE, FALSE);
-        //~ bet_array_update_estimate_tab ( );
-	    //~ break;
-//~ #endif /*_BALANCE_ESTIMATE_TAB_H*/
-
 	case GSB_CATEGORIES_PAGE:
 	    notice_debug ("Category page selected");
 

Index: fenetre_principale.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- fenetre_principale.h	20 Feb 2010 08:54:00 -0000	1.29
+++ fenetre_principale.h	4 Mar 2010 18:36:07 -0000	1.30
@@ -6,9 +6,6 @@
     GSB_ACCOUNT_PAGE,
     GSB_SCHEDULER_PAGE,
     GSB_PAYEES_PAGE,
-#ifdef ENABLE_BALANCE_ESTIMATE 
-    GSB_BALANCE_ESTIMATE_PAGE, 
-#endif /*_BALANCE_ESTIMATE_TAB_H*/
     GSB_CATEGORIES_PAGE,
     GSB_BUDGETARY_LINES_PAGE,
     GSB_REPORTS_PAGE,