[grisbi-cvs] grisbi/src etats_config.c, 1.164, 1.165 etats_gtktable.c, 1.94, 1.95 etats_onglet.c, 1.127, 1.128

Martin Stromberger fabiolla at users.sourceforge.net
Tue Jan 6 23:16:46 CET 2009


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

Modified Files:
	etats_config.c etats_gtktable.c etats_onglet.c 
Log Message:
replacement of deprecated symbols

Index: etats_gtktable.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_gtktable.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- etats_gtktable.c	5 Oct 2008 09:46:59 -0000	1.94
+++ etats_gtktable.c	6 Jan 2009 22:16:44 -0000	1.95
@@ -132,17 +132,17 @@
 	style->fg[GTK_STATE_PRELIGHT] = color;
 
 	event_box = gtk_event_box_new ();
-	gtk_signal_connect ( GTK_OBJECT ( event_box ),
+	g_signal_connect ( G_OBJECT ( event_box ),
 			     "enter_notify_event",
-			     GTK_SIGNAL_FUNC ( met_en_prelight ),
+			     G_CALLBACK ( met_en_prelight ),
 			     NULL );
-	gtk_signal_connect ( GTK_OBJECT ( event_box ),
+	g_signal_connect ( G_OBJECT ( event_box ),
 			     "leave_notify_event",
-			     GTK_SIGNAL_FUNC ( met_en_normal ),
+			     G_CALLBACK ( met_en_normal ),
 			     NULL );
-	gtk_signal_connect_object ( GTK_OBJECT ( event_box ),
+	g_signal_connect_swapped ( G_OBJECT ( event_box ),
 				    "button_press_event",
-				    GTK_SIGNAL_FUNC ( gtktable_click_sur_ope_etat ),
+				    G_CALLBACK ( gtktable_click_sur_ope_etat ),
 				    (GtkObject *) GINT_TO_POINTER (transaction_number) );
 	gtk_table_attach ( GTK_TABLE ( table_etat ), event_box,
 			   x, x2, y, y2,

Index: etats_onglet.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_onglet.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- etats_onglet.c	6 Jan 2009 17:01:27 -0000	1.127
+++ etats_onglet.c	6 Jan 2009 22:16:44 -0000	1.128
@@ -312,9 +312,9 @@
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
     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 ),
-			 GTK_OBJECT ( label_description ));
+    g_signal_connect ( G_OBJECT ( menu_item ), "activate",
+			 G_CALLBACK ( change_choix_nouvel_etat ),
+			 G_OBJECT ( label_description ));
 
     /* on met le texte du 1er choix */
     change_choix_nouvel_etat ( menu_item, label_description );
@@ -323,49 +323,49 @@
     gtk_menu_append ( GTK_MENU ( menu ), menu_item )
 	; 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 ),
-			 GTK_OBJECT ( label_description ));
+    g_signal_connect ( G_OBJECT ( menu_item ), "activate",
+			 G_CALLBACK ( change_choix_nouvel_etat ),
+			 G_OBJECT ( label_description ));
 
     menu_item = gtk_menu_item_new_with_label ( _("Annual budget"));
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
     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 ),
-			 GTK_OBJECT ( label_description ));
+    g_signal_connect ( G_OBJECT ( menu_item ), "activate",
+			 G_CALLBACK ( change_choix_nouvel_etat ),
+			 G_OBJECT ( label_description ));
 
     menu_item = gtk_menu_item_new_with_label ( _("Cheques deposit"));
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
     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 ),
-			 GTK_OBJECT ( label_description ));
+    g_signal_connect ( G_OBJECT ( menu_item ), "activate",
+			 G_CALLBACK ( change_choix_nouvel_etat ),
+			 G_OBJECT ( label_description ));
 
     menu_item = gtk_menu_item_new_with_label ( _("Monthly outgoings by payee"));
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
     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 ),
-			 GTK_OBJECT ( label_description ));
+    g_signal_connect ( G_OBJECT ( menu_item ), "activate",
+			 G_CALLBACK ( change_choix_nouvel_etat ),
+			 G_OBJECT ( label_description ));
 
     menu_item = gtk_menu_item_new_with_label ( _("Search"));
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
     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 ),
-			 GTK_OBJECT ( label_description ));
+    g_signal_connect ( G_OBJECT ( menu_item ), "activate",
+			 G_CALLBACK ( change_choix_nouvel_etat ),
+			 G_OBJECT ( label_description ));
 
     menu_item = gtk_menu_item_new_with_label ( _("Blank report"));
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
     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 ),
-			 GTK_OBJECT ( label_description ));
+    g_signal_connect ( G_OBJECT ( menu_item ), "activate",
+			 G_CALLBACK ( change_choix_nouvel_etat ),
+			 G_OBJECT ( label_description ));
     gtk_option_menu_set_menu ( GTK_OPTION_MENU ( option_menu ), menu );
 
     gtk_box_set_spacing ( GTK_BOX(GTK_DIALOG(dialog)->vbox), 6 );

Index: etats_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_config.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- etats_config.c	6 Jan 2009 17:01:27 -0000	1.164
+++ etats_config.c	6 Jan 2009 22:16:44 -0000	1.165
@@ -2108,9 +2108,9 @@
 
     /* on met la connection pour rendre sensitif cette frame */
 
-    gtk_signal_connect ( GTK_OBJECT ( radio_button_utilise_dates ),
+    g_signal_connect ( G_OBJECT ( radio_button_utilise_dates ),
 			 "toggled",
-			 GTK_SIGNAL_FUNC ( sens_desensitive_pointeur ),
+			 G_CALLBACK ( sens_desensitive_pointeur ),
 			 vbox_utilisation_date );
 
     scrolled_window = gtk_scrolled_window_new ( FALSE,
[...1318 lines suppressed...]
-				GTK_OBJECT  ( liste_mode_paiement_etat ));
+				G_CALLBACK ( gtk_clist_select_all ),
+				G_OBJECT  ( liste_mode_paiement_etat ));
     gtk_box_pack_start ( GTK_BOX ( vbox ),
 			 bouton,
 			 TRUE,
@@ -7528,10 +7528,10 @@
 	gtk_button_set_alignment ( GTK_BUTTON ( bouton ), 0.1, 0.0 );
     gtk_button_set_relief ( GTK_BUTTON ( bouton ),
 			    GTK_RELIEF_NONE );
-    gtk_signal_connect_object ( GTK_OBJECT  ( bouton ),
+    g_signal_connect_swapped ( G_OBJECT  ( bouton ),
 				"clicked",
-				GTK_SIGNAL_FUNC ( gtk_clist_unselect_all ),
-				GTK_OBJECT  ( liste_mode_paiement_etat ));
+				G_CALLBACK ( gtk_clist_unselect_all ),
+				G_OBJECT  ( liste_mode_paiement_etat ));
     gtk_box_pack_start ( GTK_BOX ( vbox ),
 			 bouton,
 			 TRUE,



More information about the cvs mailing list