[grisbi-cvs] grisbi/src etats_config.c, 1.163, 1.164 etats_onglet.c, 1.126, 1.127 gsb_account.c, 1.38, 1.39 gsb_form_transaction.c, 1.38, 1.39 gsb_transactions_list.c, 1.145, 1.146

Martin Stromberger fabiolla at users.sourceforge.net
Tue Jan 6 18:01:29 CET 2009


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

Modified Files:
	etats_config.c etats_onglet.c gsb_account.c 
	gsb_form_transaction.c gsb_transactions_list.c 
Log Message:
replacement of gtk_object_get/set_data with
g_object_get/set_data

Index: gsb_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- gsb_account.c	6 Jan 2009 13:52:54 -0000	1.38
+++ gsb_account.c	6 Jan 2009 17:01:27 -0000	1.39
@@ -493,7 +493,7 @@
 	if (  i >= 0 && ( !gsb_data_account_get_closed_account (i) || include_closed ) )
 	{
 	    item = gtk_menu_item_new_with_label ( gsb_data_account_get_name (i));
-	    gtk_object_set_data ( GTK_OBJECT ( item ),
+	    g_object_set_data ( G_OBJECT ( item ),
 				  "account_number",
 				  GINT_TO_POINTER (i));
 	    if ( func )

Index: gsb_transactions_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- gsb_transactions_list.c	1 Jan 2009 20:43:49 -0000	1.145
+++ gsb_transactions_list.c	6 Jan 2009 17:01:27 -0000	1.146
@@ -2453,7 +2453,7 @@
     if (! assert_selected_transaction()) return FALSE;
 
     source_account = gsb_gui_navigation_get_current_account ();
-    target_account = GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT(menu_item),
+    target_account = GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT(menu_item),
 							     "account_number" ) );
 
     if ( gsb_transactions_list_move_transaction_to_account ( gsb_data_account_get_current_transaction_number (source_account),

Index: etats_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_config.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- etats_config.c	1 Jan 2009 20:43:49 -0000	1.163
+++ etats_config.c	6 Jan 2009 17:01:27 -0000	1.164
@@ -1439,7 +1439,7 @@
 					    gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_titre_changement )));
 
     gsb_data_report_set_sorting_report ( current_report_number,
-					 GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU ( bouton_choix_classement_ope_etat ) -> menu_item ),
+					 GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU ( bouton_choix_classement_ope_etat ) -> menu_item ),
 										 "no_classement" )));
 
     gsb_data_report_set_report_can_click ( current_report_number,
@@ -1523,10 +1523,10 @@
     gsb_data_report_set_period_split ( current_report_number,
 				       gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_separe_plages_etat )));
     gsb_data_report_set_period_split_type ( current_report_number,
-					    GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU ( bouton_type_separe_plages_etat ) -> menu_item ),
+					    GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU ( bouton_type_separe_plages_etat ) -> menu_item ),
 										    "type" )));
     gsb_data_report_set_period_split_day ( current_report_number,
-					   GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU ( bouton_debut_semaine ) -> menu_item ),
+					   GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU ( bouton_debut_semaine ) -> menu_item ),
 										   "day" )));
 
     /* récupération des comptes */
@@ -1751,19 +1751,19 @@
 
 	if ( gsb_data_report_text_comparison_get_button_link (text_comparison_number))
 	    gsb_data_report_text_comparison_set_link_to_last_text_comparison ( text_comparison_number,
-									       GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_link (text_comparison_number)) -> menu_item ),
+									       GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_link (text_comparison_number)) -> menu_item ),
 														       "no_lien" )));
 	else
 	    gsb_data_report_text_comparison_set_link_to_last_text_comparison ( text_comparison_number,
 									       -1 );
 
 	gsb_data_report_text_comparison_set_field ( text_comparison_number,
-						    GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_field (text_comparison_number)) -> menu_item ),
+						    GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_field (text_comparison_number)) -> menu_item ),
 											    "no_champ" )));
 	gsb_data_report_text_comparison_set_use_text ( text_comparison_number,
 						       gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (gsb_data_report_text_comparison_get_button_use_text (text_comparison_number))));
 	gsb_data_report_text_comparison_set_operator ( text_comparison_number,
-						       GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_operator (text_comparison_number)) -> menu_item ),
+						       GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_operator (text_comparison_number)) -> menu_item ),
 											       "no_operateur" )));
 
 	string = gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_text_comparison_get_entry_text (text_comparison_number)));
@@ -1771,13 +1771,13 @@
 						   string );
 
 	gsb_data_report_text_comparison_set_first_comparison ( text_comparison_number,
-							       GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_first_comparison (text_comparison_number)) -> menu_item ),
+							       GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_first_comparison (text_comparison_number)) -> menu_item ),
 												       "no_comparateur" )));
 	gsb_data_report_text_comparison_set_link_first_to_second_part ( text_comparison_number,
-									GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_link_first_to_second_part (text_comparison_number)) -> menu_item ),
+									GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_link_first_to_second_part (text_comparison_number)) -> menu_item ),
 														"no_lien" )));
 	gsb_data_report_text_comparison_set_second_comparison ( text_comparison_number,
-								GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_second_comparison (text_comparison_number)) -> menu_item ),
+								GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_second_comparison (text_comparison_number)) -> menu_item ),
 													"no_comparateur" )));
 	gsb_data_report_text_comparison_set_first_amount ( text_comparison_number,
 							   utils_str_atoi ( gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_text_comparison_get_entry_first_amount (text_comparison_number)))));
@@ -1829,21 +1829,21 @@
 
 	    if ( gsb_data_report_amount_comparison_get_button_link (amount_comparison_number))
 		gsb_data_report_amount_comparison_set_link_to_last_amount_comparison ( amount_comparison_number,
-										       GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU (gsb_data_report_amount_comparison_get_button_link (amount_comparison_number)) -> menu_item ),
+										       GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_amount_comparison_get_button_link (amount_comparison_number)) -> menu_item ),
 															       "no_lien" )));
 	    else
 		gsb_data_report_amount_comparison_set_link_to_last_amount_comparison ( amount_comparison_number,
 										       -1 );
 
 	    gsb_data_report_amount_comparison_set_first_comparison ( amount_comparison_number,
-								     GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU (gsb_data_report_amount_comparison_get_button_first_comparison (amount_comparison_number)) -> menu_item ),
+								     GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_amount_comparison_get_button_first_comparison (amount_comparison_number)) -> menu_item ),
 													     "no_comparateur" )));
 
 	    gsb_data_report_amount_comparison_set_link_first_to_second_part ( amount_comparison_number,
-									      GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU (gsb_data_report_amount_comparison_get_button_link_first_to_second_part (amount_comparison_number)) -> menu_item ),
+									      GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_amount_comparison_get_button_link_first_to_second_part (amount_comparison_number)) -> menu_item ),
 														      "no_lien" )));
 	    gsb_data_report_amount_comparison_set_second_comparison ( amount_comparison_number,
-								      GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU (gsb_data_report_amount_comparison_get_button_second_comparison (amount_comparison_number)) -> menu_item ),
+								      GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_amount_comparison_get_button_second_comparison (amount_comparison_number)) -> menu_item ),
 													      "no_comparateur" )));
 	    gsb_data_report_amount_comparison_set_first_amount ( amount_comparison_number,
 								 gsb_real_get_from_string (gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_amount_comparison_get_entry_first_amount (amount_comparison_number)))));
@@ -4902,7 +4902,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("payee"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_champ",
 			  GINT_TO_POINTER ( 0 ));
     gtk_signal_connect_object ( GTK_OBJECT ( menu_item ),
@@ -4930,7 +4930,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("payee information"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_champ",
 			  GINT_TO_POINTER ( 1 ));
     gtk_signal_connect_object ( GTK_OBJECT ( menu_item ),
@@ -4958,7 +4958,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("category"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_champ",
 			  GINT_TO_POINTER ( 2 ));
     gtk_signal_connect_object ( GTK_OBJECT ( menu_item ),
@@ -4986,7 +4986,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("sub-category"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_champ",
 			  GINT_TO_POINTER ( 3 ));
     gtk_signal_connect_object ( GTK_OBJECT ( menu_item ),
@@ -5014,7 +5014,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("budgetary line"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_champ",
 			  GINT_TO_POINTER ( 4 ));
     gtk_signal_connect_object ( GTK_OBJECT ( menu_item ),
@@ -5042,7 +5042,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("sub-budgetary line"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_champ",
 			  GINT_TO_POINTER ( 5 ));
     gtk_signal_connect_object ( GTK_OBJECT ( menu_item ),
@@ -5070,7 +5070,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("note"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_champ",
 			  GINT_TO_POINTER ( 6 ));
     gtk_signal_connect_object ( GTK_OBJECT ( menu_item ),
@@ -5098,7 +5098,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("bank reference"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_champ",
 			  GINT_TO_POINTER ( 7 ));
     gtk_signal_connect_object ( GTK_OBJECT ( menu_item ),
@@ -5126,7 +5126,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("voucher"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_champ",
 			  GINT_TO_POINTER ( 8 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ),
@@ -5147,7 +5147,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("cheque number"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_champ",
 			  GINT_TO_POINTER ( 9 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ),
@@ -5167,7 +5167,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("reconciliation reference"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_champ",
 			  GINT_TO_POINTER ( 10 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ),
@@ -5222,7 +5222,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("contains"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_operateur",
 			  GINT_TO_POINTER ( 0 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ),
@@ -5234,7 +5234,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("doesn't contain"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_operateur",
 			  GINT_TO_POINTER ( 1 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ),
@@ -5246,7 +5246,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("begins with"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_operateur",
 			  GINT_TO_POINTER ( 2 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ),
@@ -5258,7 +5258,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("ends with"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_operateur",
 			  GINT_TO_POINTER ( 3 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ),
@@ -5270,7 +5270,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("is empty"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_operateur",
 			  GINT_TO_POINTER ( 4 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ),
@@ -5282,7 +5282,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("isn't empty"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_operateur",
 			  GINT_TO_POINTER ( 5 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ),
@@ -5757,7 +5757,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("and"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_lien",
 			  GINT_TO_POINTER ( 0 ));
     gtk_widget_show ( menu_item );
@@ -5765,7 +5765,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("or"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_lien",
 			  GINT_TO_POINTER ( 1 ));
     gtk_widget_show ( menu_item );
@@ -5773,7 +5773,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("except"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_lien",
 			  GINT_TO_POINTER ( 2 ));
     gtk_widget_show ( menu_item );
@@ -5803,7 +5803,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("equal"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 0 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -5815,7 +5815,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("less than"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 1 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -5827,7 +5827,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("less than or equal"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 2 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -5839,7 +5839,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("greater than"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 3 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -5851,7 +5851,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("greater than or equal"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 4 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -5863,7 +5863,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("different from"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 5 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -5875,7 +5875,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("null"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 6 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -5887,7 +5887,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("not null"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 7 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -5899,7 +5899,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("positive"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 8 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -5911,7 +5911,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("negative"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 9 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -5937,7 +5937,7 @@
 {
     gint sensitif;
 
-    switch ( GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( menu_item ),
+    switch ( GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( menu_item ),
 						     "no_comparateur" )))
     {
 	case 6:
@@ -5981,7 +5981,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("equal"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 0 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -5993,7 +5993,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("less than"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 1 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -6005,7 +6005,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("less than or equal"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 2 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -6017,7 +6017,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("greater than"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 3 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -6029,7 +6029,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("greater than or equal"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 4 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -6041,7 +6041,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("different from"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 5 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -6053,7 +6053,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("the biggest"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_comparateur",
 			  GINT_TO_POINTER ( 6 ));
     g_signal_connect ( G_OBJECT ( menu_item ),
@@ -6080,7 +6080,7 @@
 {
     gint sensitif;
 
-    if ( GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( menu_item ),
+    if ( GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( menu_item ),
 						 "no_comparateur" )) == 6 )
 	sensitif = 0;
     else
@@ -6114,7 +6114,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("and"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_lien",
 			  GINT_TO_POINTER ( 0 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ),
@@ -6126,7 +6126,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("or"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_lien",
 			  GINT_TO_POINTER ( 1 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ),
@@ -6138,7 +6138,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("except"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_lien",
 			  GINT_TO_POINTER ( 2 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ),
@@ -6150,7 +6150,7 @@
     menu_item = gtk_menu_item_new_with_label ( _("stop"));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_lien",
 			  GINT_TO_POINTER ( 3 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ),
@@ -6468,19 +6468,19 @@
 
     menu = gtk_menu_new ();
     menu_item = gtk_menu_item_new_with_label ( _("Day") );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ), "type", NULL );
+    g_object_set_data ( G_OBJECT ( menu_item ), "type", NULL );
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("Week") );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ), "type", GINT_TO_POINTER (1) );
+    g_object_set_data ( G_OBJECT ( menu_item ), "type", GINT_TO_POINTER (1) );
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("Month") );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ), "type", GINT_TO_POINTER (2) );
+    g_object_set_data ( G_OBJECT ( menu_item ), "type", GINT_TO_POINTER (2) );
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("Year") );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ), "type", GINT_TO_POINTER (3));
+    g_object_set_data ( G_OBJECT ( menu_item ), "type", GINT_TO_POINTER (3));
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
 
     gtk_option_menu_set_menu ( GTK_OPTION_MENU ( bouton_type_separe_plages_etat ), menu );
@@ -6512,7 +6512,7 @@
     while ( jours_semaine[i] )
     {
 	menu_item = gtk_menu_item_new_with_label ( _(jours_semaine[i]) );
-	gtk_object_set_data ( GTK_OBJECT ( menu_item ), "day", GINT_TO_POINTER (i));
+	g_object_set_data ( G_OBJECT ( menu_item ), "day", GINT_TO_POINTER (i));
 	gtk_menu_append ( GTK_MENU ( menu ), menu_item );
 	i++;
     }
@@ -6854,84 +6854,84 @@
     menu = gtk_menu_new ();
 
     menu_item = gtk_menu_item_new_with_label ( _("date"));
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_classement",
 			  GINT_TO_POINTER ( 0 ));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("value date"));
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_classement",
 			  GINT_TO_POINTER ( 1 ));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("transaction number"));
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_classement",
 			  GINT_TO_POINTER ( 2 ));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("payee"));
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_classement",
 			  GINT_TO_POINTER ( 3 ));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("category"));
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_classement",
 			  GINT_TO_POINTER ( 4 ));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("budgetary line"));
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_classement",
 			  GINT_TO_POINTER ( 5 ));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("note"));
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_classement",
 			  GINT_TO_POINTER ( 6 ));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("method of payment"));
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_classement",
 			  GINT_TO_POINTER ( 7 ));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("cheque/transfer number"));
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_classement",
 			  GINT_TO_POINTER ( 8 ));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("voucher"));
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_classement",
 			  GINT_TO_POINTER ( 9 ));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("bank reference"));
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_classement",
 			  GINT_TO_POINTER ( 10 ));
     gtk_menu_append ( GTK_MENU ( menu ),
 		      menu_item );
 
     menu_item = gtk_menu_item_new_with_label ( _("reconciliation reference"));
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ),
+    g_object_set_data ( G_OBJECT ( menu_item ),
 			  "no_classement",
 			  GINT_TO_POINTER ( 11 ));
     gtk_menu_append ( GTK_MENU ( menu ),

Index: etats_onglet.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_onglet.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- etats_onglet.c	1 Jan 2009 20:43:49 -0000	1.126
+++ etats_onglet.c	6 Jan 2009 17:01:27 -0000	1.127
@@ -310,7 +310,7 @@
 
     menu_item = gtk_menu_item_new_with_label ( _("Last month incomes and outgoings"));
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ), "no_etat",
+    g_object_set_data ( G_OBJECT ( menu_item ), "no_etat",
 			  GINT_TO_POINTER ( 0 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ), "activate",
 			 GTK_SIGNAL_FUNC ( change_choix_nouvel_etat ),
@@ -321,7 +321,7 @@
 
     menu_item = gtk_menu_item_new_with_label ( _("Current month incomes and outgoings"));
     gtk_menu_append ( GTK_MENU ( menu ), menu_item )
-	; gtk_object_set_data ( GTK_OBJECT ( menu_item ), "no_etat",
+	; g_object_set_data ( G_OBJECT ( menu_item ), "no_etat",
 				GINT_TO_POINTER ( 1 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ), "activate",
 			 GTK_SIGNAL_FUNC ( change_choix_nouvel_etat ),
@@ -329,7 +329,7 @@
 
     menu_item = gtk_menu_item_new_with_label ( _("Annual budget"));
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ), "no_etat",
+    g_object_set_data ( G_OBJECT ( menu_item ), "no_etat",
 			  GINT_TO_POINTER ( 2 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ), "activate",
 			 GTK_SIGNAL_FUNC ( change_choix_nouvel_etat ),
@@ -337,7 +337,7 @@
 
     menu_item = gtk_menu_item_new_with_label ( _("Cheques deposit"));
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ), "no_etat",
+    g_object_set_data ( G_OBJECT ( menu_item ), "no_etat",
 			  GINT_TO_POINTER ( 4 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ), "activate",
 			 GTK_SIGNAL_FUNC ( change_choix_nouvel_etat ),
@@ -345,7 +345,7 @@
 
     menu_item = gtk_menu_item_new_with_label ( _("Monthly outgoings by payee"));
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ), "no_etat",
+    g_object_set_data ( G_OBJECT ( menu_item ), "no_etat",
 			  GINT_TO_POINTER ( 5 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ), "activate",
 			 GTK_SIGNAL_FUNC ( change_choix_nouvel_etat ),
@@ -353,7 +353,7 @@
 
     menu_item = gtk_menu_item_new_with_label ( _("Search"));
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ), "no_etat",
+    g_object_set_data ( G_OBJECT ( menu_item ), "no_etat",
 			  GINT_TO_POINTER ( 6 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ), "activate",
 			 GTK_SIGNAL_FUNC ( change_choix_nouvel_etat ),
@@ -361,7 +361,7 @@
 
     menu_item = gtk_menu_item_new_with_label ( _("Blank report"));
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
-    gtk_object_set_data ( GTK_OBJECT ( menu_item ), "no_etat",
+    g_object_set_data ( G_OBJECT ( menu_item ), "no_etat",
 			  GINT_TO_POINTER ( 3 ));
     gtk_signal_connect ( GTK_OBJECT ( menu_item ), "activate",
 			 GTK_SIGNAL_FUNC ( change_choix_nouvel_etat ),
@@ -383,7 +383,7 @@
 
     /* get the wanted report */
 
-    resultat = GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( GTK_OPTION_MENU ( option_menu ) -> menu_item ),
+    resultat = GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU ( option_menu ) -> menu_item ),
 						       "no_etat" ));
     gtk_widget_destroy ( GTK_WIDGET ( dialog ));
 
@@ -937,7 +937,7 @@
 {
     gchar *description;
 
-    switch ( GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT ( menu_item ),
+    switch ( GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( menu_item ),
 						     "no_etat" )))
     {
 	case 0:

Index: gsb_form_transaction.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_transaction.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- gsb_form_transaction.c	26 Oct 2008 22:05:41 -0000	1.38
+++ gsb_form_transaction.c	6 Jan 2009 17:01:27 -0000	1.39
@@ -511,7 +511,7 @@
     account_number = gsb_form_get_account_number ();
     gtk_widget_grab_focus ( gsb_form_widget_get_widget (TRANSACTION_FORM_DATE));
 
-    transaction_number = GPOINTER_TO_INT (gtk_object_get_data ( GTK_OBJECT ( gsb_form_get_form_widget () ),
+    transaction_number = GPOINTER_TO_INT (g_object_get_data ( G_OBJECT ( gsb_form_get_form_widget () ),
 								"transaction_number_in_form" ));
 
     account_currency_number = gsb_data_account_get_currency (account_number);



More information about the cvs mailing list