[grisbi-cvs] grisbi/src accueil.c, 1.189, 1.190 affichage.c, 1.148, 1.149 balance_estimate_tab.c, 1.18, 1.19 barre_outils.c, 1.120, 1.121 gsb_account.c, 1.39, 1.40 gsb_autofunc.c, 1.14, 1.15 gsb_bank.c, 1.15, 1.16 gsb_calendar.c, 1.2, 1.3 gsb_calendar_entry.c, 1.20, 1.21 gsb_currency.c, 1.31, 1.32 gsb_currency_config.c, 1.41, 1.42 gsb_form_scheduler.c, 1.29, 1.30 gsb_form_widget.c, 1.25, 1.26 gsb_fyear_config.c, 1.21, 1.22 gsb_reconcile_sort_config.c, 1.8, 1.9 gsb_transactions_list.c, 1.146, 1.147 import_csv.c, 1.51, 1.52

Martin Stromberger fabiolla at users.sourceforge.net
Wed Jan 7 22:18:57 CET 2009 

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

Modified Files:
	accueil.c affichage.c balance_estimate_tab.c barre_outils.c 
	gsb_account.c gsb_autofunc.c gsb_bank.c gsb_calendar.c 
	gsb_calendar_entry.c gsb_currency.c gsb_currency_config.c 
	gsb_form_scheduler.c gsb_form_widget.c gsb_fyear_config.c 
	gsb_reconcile_sort_config.c gsb_transactions_list.c 
	import_csv.c 
Log Message:
replacement of deprecated symbols

Index: gsb_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- gsb_account.c	6 Jan 2009 17:01:27 -0000	1.39
+++ gsb_account.c	7 Jan 2009 21:18:55 -0000	1.40
@@ -497,7 +497,7 @@
 				  "account_number",
 				  GINT_TO_POINTER (i));
 	    if ( func )
-		gtk_signal_connect ( GTK_OBJECT ( item ), "activate", GTK_SIGNAL_FUNC(func), NULL );
+		g_signal_connect ( G_OBJECT ( item ), "activate", G_CALLBACK(func), NULL );
 	    gtk_menu_append ( GTK_MENU ( menu ), item );
 
 	    if ( !activate_currrent && 

Index: gsb_form_widget.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_widget.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- gsb_form_widget.c	16 Nov 2008 20:34:25 -0000	1.25
+++ gsb_form_widget.c	7 Jan 2009 21:18:55 -0000	1.26
@@ -260,7 +260,7 @@
 				    GTK_RELIEF_NONE );
 	    gtk_widget_set_tooltip_text ( GTK_WIDGET (widget),
 					  SPACIFY(_("Define the change for that transaction")));
-	    g_signal_connect ( GTK_OBJECT (  widget ),
+	    g_signal_connect ( G_OBJECT (  widget ),
 			       "clicked",
 			       G_CALLBACK (gsb_form_transaction_change_clicked),
 			       NULL );
@@ -292,19 +292,19 @@
 	/* set the signals */
 	if ( GTK_IS_ENTRY ( widget ))
 	{
-	    g_signal_connect ( GTK_OBJECT ( widget ),
+	    g_signal_connect ( G_OBJECT ( widget ),
 			       "focus-in-event",
 			       G_CALLBACK ( gsb_form_entry_get_focus ),
 			       GINT_TO_POINTER ( element_number ));
-	    g_signal_connect ( GTK_OBJECT ( widget ),
+	    g_signal_connect ( G_OBJECT ( widget ),
 			       "focus-out-event",
 			       G_CALLBACK ( gsb_form_entry_lose_focus ),
 			       GINT_TO_POINTER ( element_number ));
-	    g_signal_connect ( GTK_OBJECT ( widget ),
+	    g_signal_connect ( G_OBJECT ( widget ),
 			       "button-press-event",
 			       G_CALLBACK ( gsb_form_button_press_event ),
 			       GINT_TO_POINTER ( element_number ));
-	    g_signal_connect ( GTK_OBJECT ( widget ),
+	    g_signal_connect ( G_OBJECT ( widget ),
 			       "key-press-event",
 			       G_CALLBACK ( gsb_form_key_press_event ),
 			       GINT_TO_POINTER ( element_number ));
@@ -313,26 +313,26 @@
 	{
 	    if ( GTK_IS_COMBOFIX ( widget ))
 	    {
-		g_signal_connect ( GTK_OBJECT ( GTK_COMBOFIX ( widget ) -> entry ),
+		g_signal_connect ( G_OBJECT ( GTK_COMBOFIX ( widget ) -> entry ),
 				   "focus-in-event",
 				   G_CALLBACK ( gsb_form_entry_get_focus ),
 				   GINT_TO_POINTER ( element_number ));
-		g_signal_connect ( GTK_OBJECT ( GTK_COMBOFIX (widget ) -> entry ),
+		g_signal_connect ( G_OBJECT ( GTK_COMBOFIX (widget ) -> entry ),
 				   "focus-out-event",
 				   G_CALLBACK ( gsb_form_entry_lose_focus ),
 				   GINT_TO_POINTER ( element_number ));
-		g_signal_connect ( GTK_OBJECT ( GTK_COMBOFIX (widget ) -> entry ),
+		g_signal_connect ( G_OBJECT ( GTK_COMBOFIX (widget ) -> entry ),
 				   "button-press-event",
 				   G_CALLBACK ( gsb_form_button_press_event ),
 				   GINT_TO_POINTER ( element_number ));
-		g_signal_connect ( GTK_OBJECT ( GTK_COMBOFIX (widget ) -> entry ),
+		g_signal_connect ( G_OBJECT ( GTK_COMBOFIX (widget ) -> entry ),
 				   "key-press-event",
 				   G_CALLBACK ( gsb_form_key_press_event ),
 				   GINT_TO_POINTER ( element_number ));
 	    }
 	    else
 		/* neither an entry, neither a combofix */
-		g_signal_connect ( GTK_OBJECT ( widget ),
+		g_signal_connect ( G_OBJECT ( widget ),
 				   "key-press-event",
 				   G_CALLBACK ( gsb_form_key_press_event ),
 				   GINT_TO_POINTER ( element_number ));

Index: gsb_reconcile_sort_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_reconcile_sort_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gsb_reconcile_sort_config.c	25 Dec 2008 23:14:58 -0000	1.8
+++ gsb_reconcile_sort_config.c	7 Jan 2009 21:18:55 -0000	1.9
@@ -179,7 +179,7 @@
 
     button_move_up = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
     gtk_button_set_relief ( GTK_BUTTON ( button_move_up ), GTK_RELIEF_NONE );
-    g_signal_connect ( GTK_OBJECT ( button_move_up ), "clicked",
+    g_signal_connect ( G_OBJECT ( button_move_up ), "clicked",
 		       G_CALLBACK (gsb_reconcile_sort_config_move_up), reconcile_treeview );
     gtk_box_pack_start ( GTK_BOX (vbox_fleches_tri),
 			 button_move_up,
@@ -188,7 +188,7 @@
 
     button_move_down = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
     gtk_button_set_relief ( GTK_BUTTON ( button_move_down ), GTK_RELIEF_NONE );
-    g_signal_connect ( GTK_OBJECT ( button_move_down ), "clicked",
+    g_signal_connect ( G_OBJECT ( button_move_down ), "clicked",
 		       G_CALLBACK (gsb_reconcile_sort_config_move_down), reconcile_treeview);
     gtk_box_pack_start ( GTK_BOX (vbox_fleches_tri),
 			 button_move_down,

Index: gsb_transactions_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- gsb_transactions_list.c	6 Jan 2009 17:01:27 -0000	1.146
+++ gsb_transactions_list.c	7 Jan 2009 21:18:55 -0000	1.147
@@ -2166,7 +2166,7 @@
 
     /* Add accounts submenu */
     gtk_menu_item_set_submenu ( GTK_MENU_ITEM(menu_item),
-				GTK_WIDGET(gsb_account_create_menu_list (GTK_SIGNAL_FUNC(move_selected_operation_to_account), FALSE, FALSE)) );
+				GTK_WIDGET(gsb_account_create_menu_list (G_CALLBACK(move_selected_operation_to_account), FALSE, FALSE)) );
 
 
     /* Separator */

Index: barre_outils.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/barre_outils.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- barre_outils.c	3 Dec 2008 15:15:12 -0000	1.120
+++ barre_outils.c	7 Jan 2009 21:18:55 -0000	1.121
@@ -403,8 +403,8 @@
     for ( i = 0 ; names[i] ; i++ )
     {
 	item = gtk_menu_item_new_with_label ( names[i] );
-	gtk_signal_connect_object ( GTK_OBJECT ( item ), "activate",
-				    GTK_SIGNAL_FUNC ( gsb_scheduler_list_change_scheduler_view ),
+	g_signal_connect_swapped ( G_OBJECT ( item ), "activate",
+				    G_CALLBACK ( gsb_scheduler_list_change_scheduler_view ),
 				    GINT_TO_POINTER(i) );
 	gtk_menu_append ( GTK_MENU ( menu ), item );
     }

Index: accueil.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/accueil.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- accueil.c	7 Dec 2008 21:40:06 -0000	1.189
+++ accueil.c	7 Jan 2009 21:18:55 -0000	1.190
@@ -503,17 +503,17 @@
 
 		/* Création d'une boite à évènement qui sera rattachée au nom du compte */
 		pEventBox = gtk_event_box_new ();
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "enter-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_prelight ),
+				     G_CALLBACK ( met_en_prelight ),
 				     NULL );
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "leave-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_normal ),
+				     G_CALLBACK ( met_en_normal ),
 				     NULL );
-		gtk_signal_connect_object ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect_swapped ( G_OBJECT ( pEventBox ),
 					    "button-press-event",
-					    GTK_SIGNAL_FUNC ( gsb_main_page_click_on_account ),
+					    G_CALLBACK ( gsb_main_page_click_on_account ),
 					    GINT_TO_POINTER (account_number) );
 		gtk_table_attach_defaults ( GTK_TABLE ( pTable ), pEventBox,
 					    0, 1, i, i+1 );
@@ -555,17 +555,17 @@
 
 		/* Création d'une boite à évènement qui sera rattachée au solde courant du compte */
 		pEventBox = gtk_event_box_new ();
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "enter-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_prelight ),
+				     G_CALLBACK ( met_en_prelight ),
 				     NULL );
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "leave-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_normal ),
+				     G_CALLBACK ( met_en_normal ),
 				     NULL );
-		gtk_signal_connect_object ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect_swapped ( G_OBJECT ( pEventBox ),
 					    "button-press-event",
-					    GTK_SIGNAL_FUNC ( gsb_main_page_click_on_account ),
+					    G_CALLBACK ( gsb_main_page_click_on_account ),
 					    GINT_TO_POINTER (account_number) );
 		gtk_table_attach_defaults ( GTK_TABLE ( pTable ), pEventBox,
 					    1, 2, i, i+1 );
@@ -607,17 +607,17 @@
 
 		/* Création d'une boite à évènement qui sera rattachée au solde pointé du compte */
 		pEventBox = gtk_event_box_new ();
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "enter-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_prelight ),
+				     G_CALLBACK ( met_en_prelight ),
 				     NULL );
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "leave-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_normal ),
+				     G_CALLBACK ( met_en_normal ),
 				     NULL );
-		gtk_signal_connect_object ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect_swapped ( G_OBJECT ( pEventBox ),
 					    "button-press-event",
-					    GTK_SIGNAL_FUNC (gsb_main_page_click_on_account),
+					    G_CALLBACK (gsb_main_page_click_on_account),
 					    GINT_TO_POINTER (account_number) );
 		gtk_table_attach_defaults ( GTK_TABLE ( pTable ), pEventBox,
 					    2, 4, i, i+1 );
@@ -752,17 +752,17 @@
 
 		/* Création d'une boite à évènement qui sera rattachée au nom du compte */
 		pEventBox = gtk_event_box_new ();
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "enter-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_prelight ),
+				     G_CALLBACK ( met_en_prelight ),
 				     NULL );
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "leave-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_normal ),
+				     G_CALLBACK ( met_en_normal ),
 				     NULL );
-		gtk_signal_connect_object ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect_swapped ( G_OBJECT ( pEventBox ),
 					    "button-press-event",
-					    GTK_SIGNAL_FUNC ( gsb_main_page_click_on_account ),
+					    G_CALLBACK ( gsb_main_page_click_on_account ),
 					    GINT_TO_POINTER ( GINT_TO_POINTER (account_number) ) );
 		gtk_table_attach ( GTK_TABLE ( pTable ), pEventBox,
 				   0, 1, i, i+1,
@@ -806,17 +806,17 @@
 
 		/* Création d'une boite à évènement qui sera rattachée au solde courant du compte */
 		pEventBox = gtk_event_box_new ();
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "enter-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_prelight ),
+				     G_CALLBACK ( met_en_prelight ),
 				     NULL );
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "leave-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_normal ),
+				     G_CALLBACK ( met_en_normal ),
 				     NULL );
-		gtk_signal_connect_object ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect_swapped ( G_OBJECT ( pEventBox ),
 					    "button-press-event",
-					    GTK_SIGNAL_FUNC ( gsb_main_page_click_on_account ),
+					    G_CALLBACK ( gsb_main_page_click_on_account ),
 					    GINT_TO_POINTER ( GINT_TO_POINTER (account_number) ));
 		gtk_table_attach_defaults ( GTK_TABLE ( pTable ), pEventBox,
 					    1, 2, i, i+1 );
@@ -858,17 +858,17 @@
 
 		/* Création d'une boite à évènement qui sera rattachée au solde courant du compte */
 		pEventBox = gtk_event_box_new ();
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "enter-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_prelight ),
+				     G_CALLBACK ( met_en_prelight ),
 				     NULL );
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "leave-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_normal ),
+				     G_CALLBACK ( met_en_normal ),
 				     NULL );
-		gtk_signal_connect_object ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect_swapped ( G_OBJECT ( pEventBox ),
 					    "button-press-event",
-					    GTK_SIGNAL_FUNC ( gsb_main_page_click_on_account ),
+					    G_CALLBACK ( gsb_main_page_click_on_account ),
 					    GINT_TO_POINTER ( GINT_TO_POINTER (account_number) ));
 		gtk_table_attach ( GTK_TABLE ( pTable ), pEventBox,
 				   2, 4, i, i+1,
@@ -1014,17 +1014,17 @@
 
 		/* Création d'une boite à évènement qui sera rattachée au nom du compte */
 		pEventBox = gtk_event_box_new ();
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "enter-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_prelight ),
+				     G_CALLBACK ( met_en_prelight ),
 				     NULL );
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "leave-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_normal ),
+				     G_CALLBACK ( met_en_normal ),
 				     NULL );
-		gtk_signal_connect_object ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect_swapped ( G_OBJECT ( pEventBox ),
 					    "button-press-event",
-					    GTK_SIGNAL_FUNC ( gsb_main_page_click_on_account ),
+					    G_CALLBACK ( gsb_main_page_click_on_account ),
 					    GINT_TO_POINTER ( GINT_TO_POINTER (account_number) ) );
 		gtk_table_attach_defaults ( GTK_TABLE ( pTable ), pEventBox,
 					    0, 1, i, i+1 );
@@ -1066,17 +1066,17 @@
 
 		/* Création d'une boite à évènement qui sera rattachée au solde courant du compte */
 		pEventBox = gtk_event_box_new ();
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "enter-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_prelight ),
+				     G_CALLBACK ( met_en_prelight ),
 				     NULL );
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "leave-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_normal ),
+				     G_CALLBACK ( met_en_normal ),
 				     NULL );
-		gtk_signal_connect_object ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect_swapped ( G_OBJECT ( pEventBox ),
 					    "button-press-event",
-					    GTK_SIGNAL_FUNC ( gsb_main_page_click_on_account ),
+					    G_CALLBACK ( gsb_main_page_click_on_account ),
 					    GINT_TO_POINTER ( GINT_TO_POINTER (account_number) ));
 		gtk_table_attach_defaults ( GTK_TABLE ( pTable ), pEventBox,
 					    1, 2, i, i+1 );
@@ -1118,17 +1118,17 @@
 
 		/* Création d'une boite à évènement qui sera rattachée au solde pointé du compte */
 		pEventBox = gtk_event_box_new ();
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "enter-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_prelight ),
+				     G_CALLBACK ( met_en_prelight ),
 				     NULL );
-		gtk_signal_connect ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect ( G_OBJECT ( pEventBox ),
 				     "leave-notify-event",
-				     GTK_SIGNAL_FUNC ( met_en_normal ),
+				     G_CALLBACK ( met_en_normal ),
 				     NULL );
-		gtk_signal_connect_object ( GTK_OBJECT ( pEventBox ),
+		g_signal_connect_swapped ( G_OBJECT ( pEventBox ),
 					    "button-press-event",
-					    GTK_SIGNAL_FUNC ( gsb_main_page_click_on_account ),
+					    G_CALLBACK ( gsb_main_page_click_on_account ),
 					    GINT_TO_POINTER ( account_number ));
 		gtk_table_attach_defaults ( GTK_TABLE ( pTable ), pEventBox,
 					    2, 4, i, i+1 );
@@ -1277,15 +1277,15 @@
 	    /* bouton à gauche */
 
 	    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 ( GTK_OBJECT ( event_box ),
+	    g_signal_connect ( G_OBJECT ( event_box ),
 				 "button-press-event",
 				 (GtkSignalFunc) saisie_echeance_accueil,
 				 GINT_TO_POINTER (scheduled_number));
@@ -1397,13 +1397,13 @@
 	    gtk_widget_show (  hbox );
 
 	    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 );
 	    g_signal_connect_swapped ( G_OBJECT ( event_box ),
 				       "button-press-event",

Index: affichage.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/affichage.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- affichage.c	1 Jan 2009 20:43:49 -0000	1.148
+++ affichage.c	7 Jan 2009 21:18:55 -0000	1.149
@@ -177,7 +177,7 @@
 
     gtk_container_add (GTK_CONTAINER(logo_button), preview);
     g_signal_connect_swapped ( G_OBJECT ( logo_button ), "clicked",
-			       GTK_SIGNAL_FUNC ( modification_logo_accueil ), NULL );
+			       G_CALLBACK ( modification_logo_accueil ), NULL );
     gtk_box_pack_start ( GTK_BOX ( hbox ), logo_button, FALSE, FALSE, 0 );
 
     label = gtk_label_new ( _("Click on preview to change logo") );

Index: gsb_calendar_entry.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_calendar_entry.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gsb_calendar_entry.c	6 Jan 2009 15:21:01 -0000	1.20
+++ gsb_calendar_entry.c	7 Jan 2009 21:18:55 -0000	1.21
@@ -450,9 +450,9 @@
     /* make the popup */
     popup = gtk_window_new ( GTK_WINDOW_POPUP );
     gtk_window_set_modal ( GTK_WINDOW ( popup ), TRUE );
-    gtk_signal_connect_object ( GTK_OBJECT ( popup ),
+    g_signal_connect_swapped ( G_OBJECT ( popup ),
 				"destroy",
-				GTK_SIGNAL_FUNC ( gdk_pointer_ungrab ),
+				G_CALLBACK ( gdk_pointer_ungrab ),
 				GDK_CURRENT_TIME );
 
     /* set the decoration */

Index: gsb_fyear_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_fyear_config.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gsb_fyear_config.c	6 Jan 2009 15:21:01 -0000	1.21
+++ gsb_fyear_config.c	7 Jan 2009 21:18:55 -0000	1.22
@@ -160,9 +160,9 @@
 			 FALSE, FALSE, 0);
 
     button = gtk_button_new_with_label ( _("Associate operations without financial years") );
-    gtk_signal_connect ( GTK_OBJECT ( button ),
+    g_signal_connect ( G_OBJECT ( button ),
 			 "clicked",
-			 GTK_SIGNAL_FUNC ( gsb_fyear_config_associate_transactions ),
+			 G_CALLBACK ( gsb_fyear_config_associate_transactions ),
 			 NULL );
     gtk_box_pack_start ( GTK_BOX (hbox), button,
 			 FALSE, FALSE, 5 );

Index: balance_estimate_tab.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_tab.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- balance_estimate_tab.c	1 Jan 2009 20:43:49 -0000	1.18
+++ balance_estimate_tab.c	7 Jan 2009 21:18:55 -0000	1.19
@@ -230,7 +230,7 @@
 	}
 	gtk_widget_show(GTK_WIDGET(widget));
 	gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(widget), FALSE, FALSE, 5);
-	g_signal_connect(GTK_OBJECT(widget),
+	g_signal_connect(G_OBJECT(widget),
 			 "toggled",
 			 G_CALLBACK(bet_duration_button_clicked),
 			 GINT_TO_POINTER(bet_months_array[iduration]));

Index: gsb_calendar.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_calendar.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gsb_calendar.c	6 Jan 2009 15:21:01 -0000	1.2
+++ gsb_calendar.c	7 Jan 2009 21:18:55 -0000	1.3
@@ -74,13 +74,13 @@
 				localtime ( &temps ) -> tm_mon,
 				localtime ( &temps ) -> tm_year + 1900 );
 
-    gtk_signal_connect ( GTK_OBJECT ( scheduled_calendar ),
+    g_signal_connect ( G_OBJECT ( scheduled_calendar ),
 			 "month-changed",
-			 GTK_SIGNAL_FUNC (gsb_calendar_update),
+			 G_CALLBACK (gsb_calendar_update),
 			 NULL );
-    gtk_signal_connect_after ( GTK_OBJECT ( scheduled_calendar ),
+    g_signal_connect_after ( G_OBJECT ( scheduled_calendar ),
 			       "day-selected",
-			       GTK_SIGNAL_FUNC ( click_sur_jour_calendrier_echeance ),
+			       G_CALLBACK ( click_sur_jour_calendrier_echeance ),
 			       NULL );
 
     gtk_widget_show ( scheduled_calendar );
@@ -154,8 +154,8 @@
 
     time ( &temps );
 
-    gtk_signal_handler_block_by_func ( GTK_OBJECT ( calendrier ),
-				       GTK_SIGNAL_FUNC ( click_sur_jour_calendrier_echeance ),
+    g_signal_handlers_block_by_func ( G_OBJECT ( calendrier ),
+				       G_CALLBACK ( click_sur_jour_calendrier_echeance ),
 				       NULL );
 
     if ( ( localtime ( &temps ) -> tm_mon == GTK_CALENDAR ( scheduled_calendar ) -> month )
@@ -167,8 +167,8 @@
 	gtk_calendar_select_day ( GTK_CALENDAR ( scheduled_calendar ),
 				  FALSE );
 
-    gtk_signal_handler_unblock_by_func ( GTK_OBJECT ( calendrier ),
-					 GTK_SIGNAL_FUNC ( click_sur_jour_calendrier_echeance ),
+    g_signal_handlers_unblock_by_func ( G_OBJECT ( calendrier ),
+					 G_CALLBACK ( click_sur_jour_calendrier_echeance ),
 					 NULL );
 
 }

Index: import_csv.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import_csv.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- import_csv.c	13 Nov 2008 19:32:44 -0000	1.51
+++ import_csv.c	7 Jan 2009 21:18:55 -0000	1.52
@@ -951,8 +951,8 @@
 	g_object_set_data ( G_OBJECT ( item ), "column", col );
 	g_object_set_data ( G_OBJECT ( item ), "field", GINT_TO_POINTER( field - 1 ) );
 	g_object_set_data ( G_OBJECT ( item ), "assistant", assistant );
-	gtk_signal_connect ( GTK_OBJECT ( item ), "activate",
-			     GTK_SIGNAL_FUNC ( csv_import_change_field ), GINT_TO_POINTER(  i ) );
+	g_signal_connect ( G_OBJECT ( item ), "activate",
+			     G_CALLBACK ( csv_import_change_field ), GINT_TO_POINTER(  i ) );
 	gtk_menu_append ( GTK_MENU ( menu ), item );
     }
 

Index: gsb_bank.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_bank.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gsb_bank.c	6 Jan 2009 15:21:01 -0000	1.15
+++ gsb_bank.c	7 Jan 2009 21:18:55 -0000	1.16
@@ -169,7 +169,7 @@
     /* add the hook if exists */
     if ( hook )
 	g_object_set_data ( G_OBJECT (combo_box), "changed-hook",
-			    (gpointer) g_signal_connect_after (GTK_OBJECT(combo_box), "changed",
+			    (gpointer) g_signal_connect_after (G_OBJECT(combo_box), "changed",
 							       ((GCallback) hook), data ));
 
     /* set the index */
@@ -229,11 +229,11 @@
 
     /* Block hook and default_func */
     if ( g_object_get_data (G_OBJECT (combobox), "changed") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(combobox),
+	g_signal_handler_block ( G_OBJECT(combobox),
 				 (gulong) g_object_get_data (G_OBJECT (combobox),
 							     "changed"));
     if ( g_object_get_data (G_OBJECT (combobox), "changed-hook") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(combobox),
+	g_signal_handler_block ( G_OBJECT(combobox),
 				 (gulong) g_object_get_data (G_OBJECT (combobox),
 							     "changed-hook"));
 
@@ -261,11 +261,11 @@
 
     /* Unblock everything */
     if ( g_object_get_data (G_OBJECT (combobox), "changed") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(combobox),
+	g_signal_handler_unblock ( G_OBJECT(combobox),
 				   (gulong) g_object_get_data (G_OBJECT (combobox),
 							       "changed"));
     if ( g_object_get_data (G_OBJECT (combobox), "changed-hook") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(combobox),
+	g_signal_handler_unblock ( G_OBJECT(combobox),
 				   (gulong) g_object_get_data (G_OBJECT (combobox),
 							       "changed-hook"));
     return FALSE;

Index: gsb_currency_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_currency_config.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- gsb_currency_config.c	26 Dec 2008 15:34:04 -0000	1.41
+++ gsb_currency_config.c	7 Jan 2009 21:18:55 -0000	1.42
@@ -852,8 +852,8 @@
 	gsb_currency_set_combobox_history ( combo_box,
 					    *value );
 
-    g_signal_connect ( GTK_OBJECT (combo_box), "changed", (GCallback) gsb_currency_config_set_int_from_combobox, value );
-    g_signal_connect ( GTK_OBJECT (combo_box), "changed", (GCallback) hook, value );
+    g_signal_connect ( G_OBJECT (combo_box), "changed", (GCallback) gsb_currency_config_set_int_from_combobox, value );
+    g_signal_connect ( G_OBJECT (combo_box), "changed", (GCallback) hook, value );
     g_object_set_data ( G_OBJECT ( combo_box ), "pointer", value);
 
     return combo_box;

Index: gsb_currency.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_currency.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- gsb_currency.c	7 Dec 2008 22:57:51 -0000	1.31
+++ gsb_currency.c	7 Jan 2009 21:18:55 -0000	1.32
@@ -462,11 +462,11 @@
     /* set the connections */
     g_signal_connect ( G_OBJECT (combobox_1),
 		       "changed",
-		       GTK_SIGNAL_FUNC ( gsb_currency_select_change_currency ),
+		       G_CALLBACK ( gsb_currency_select_change_currency ),
 		       combobox_2 );
     g_signal_connect ( G_OBJECT (combobox_2),
 		       "changed",
-		       GTK_SIGNAL_FUNC ( gsb_currency_select_change_currency ),
+		       G_CALLBACK ( gsb_currency_select_change_currency ),
 		       combobox_1);
 
     /* exchange fees line label */

Index: gsb_form_scheduler.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_scheduler.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- gsb_form_scheduler.c	16 Nov 2008 20:34:25 -0000	1.29
+++ gsb_form_scheduler.c	7 Jan 2009 21:18:55 -0000	1.30
@@ -198,7 +198,7 @@
 				       "focus-in-event",
 				       G_CALLBACK (gsb_form_entry_get_focus),
 				       GINT_TO_POINTER (element_number));
-		    g_signal_connect_after ( GTK_OBJECT (widget),
+		    g_signal_connect_after ( G_OBJECT (widget),
 					     "focus-out-event",
 					     G_CALLBACK (gsb_form_scheduler_entry_lose_focus),
 					     GINT_TO_POINTER (element_number));
@@ -232,7 +232,7 @@
 						      element );
 
 	    /* set the key signal */
-	    g_signal_connect ( GTK_OBJECT (widget),
+	    g_signal_connect ( G_OBJECT (widget),
 			       "key-press-event",
 			       G_CALLBACK (gsb_form_key_press_event),
 			       GINT_TO_POINTER (SCHEDULED_FORM_ACCOUNT));

Index: gsb_autofunc.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_autofunc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gsb_autofunc.c	28 Aug 2008 21:49:36 -0000	1.14
+++ gsb_autofunc.c	7 Jan 2009 21:18:55 -0000	1.15
@@ -149,11 +149,11 @@
 {
     /* Block everything */
     if ( g_object_get_data (G_OBJECT (entry), "changed") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(entry),
+	g_signal_handler_block ( G_OBJECT(entry),
 				 (gulong) g_object_get_data (G_OBJECT (entry), 
 							     "changed"));
     if ( g_object_get_data (G_OBJECT (entry), "changed-hook") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(entry),
+	g_signal_handler_block ( G_OBJECT(entry),
 				 (gulong) g_object_get_data (G_OBJECT (entry), 
 							     "changed-hook"));
 
@@ -168,11 +168,11 @@
 
     /* Unblock everything */
     if ( g_object_get_data (G_OBJECT (entry), "changed") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(entry),
+	g_signal_handler_unblock ( G_OBJECT(entry),
 				   (gulong) g_object_get_data (G_OBJECT (entry), 
 							       "changed"));
     if ( g_object_get_data (G_OBJECT (entry), "changed-hook") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(entry),
+	g_signal_handler_unblock ( G_OBJECT(entry),
 				   (gulong) g_object_get_data (G_OBJECT (entry), 
 							       "changed-hook"));
 }
@@ -388,11 +388,11 @@
 			"number_for_func", GINT_TO_POINTER (number_for_func));
     if (default_func)
 	g_object_set_data ( G_OBJECT ( entry ), "changed", 
-			    (gpointer) g_signal_connect_after (GTK_OBJECT(entry), "changed",
+			    (gpointer) g_signal_connect_after (G_OBJECT(entry), "changed",
 							       ((GCallback) gsb_autofunc_int_changed), default_func ));
     if ( hook )
 	g_object_set_data ( G_OBJECT ( entry ), "changed-hook", 
-			    (gpointer) g_signal_connect_after (GTK_OBJECT(entry), "changed",
+			    (gpointer) g_signal_connect_after (G_OBJECT(entry), "changed",
 							       ((GCallback) hook), data ));
     return entry;
 }
@@ -416,11 +416,11 @@
 {
     /* Block everything */
     if ( g_object_get_data (G_OBJECT (entry), "changed") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(entry),
+	g_signal_handler_block ( G_OBJECT(entry),
 				 (gulong) g_object_get_data (G_OBJECT (entry), 
 							     "changed"));
     if ( g_object_get_data (G_OBJECT (entry), "changed-hook") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(entry),
+	g_signal_handler_block ( G_OBJECT(entry),
 				 (gulong) g_object_get_data (G_OBJECT (entry), 
 							     "changed-hook"));
 
@@ -434,11 +434,11 @@
 
     /* Unblock everything */
     if ( g_object_get_data (G_OBJECT (entry), "changed") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(entry),
+	g_signal_handler_unblock ( G_OBJECT(entry),
 				   (gulong) g_object_get_data (G_OBJECT (entry), 
 							       "changed"));
     if ( g_object_get_data (G_OBJECT (entry), "changed-hook") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(entry),
+	g_signal_handler_unblock ( G_OBJECT(entry),
 				   (gulong) g_object_get_data (G_OBJECT (entry), 
 							       "changed-hook"));
 }
@@ -458,11 +458,11 @@
 {
     /* Block everything */
     if ( g_object_get_data (G_OBJECT (entry), "changed") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(entry),
+	g_signal_handler_block ( G_OBJECT(entry),
 				 (gulong) g_object_get_data (G_OBJECT (entry), 
 							     "changed"));
     if ( g_object_get_data (G_OBJECT (entry), "changed-hook") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(entry),
+	g_signal_handler_block ( G_OBJECT(entry),
 				 (gulong) g_object_get_data (G_OBJECT (entry), 
 							     "changed-hook"));
 
@@ -475,11 +475,11 @@
 
     /* Unblock everything */
     if ( g_object_get_data (G_OBJECT (entry), "changed") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(entry),
+	g_signal_handler_unblock ( G_OBJECT(entry),
 				   (gulong) g_object_get_data (G_OBJECT (entry), 
 							       "changed"));
     if ( g_object_get_data (G_OBJECT (entry), "changed-hook") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(entry),
+	g_signal_handler_unblock ( G_OBJECT(entry),
 				   (gulong) g_object_get_data (G_OBJECT (entry), 
 							       "changed-hook"));
 }
@@ -565,7 +565,7 @@
 							       G_CALLBACK (gsb_autofunc_spin_changed), default_func ));
     if ( hook )
 	g_object_set_data ( G_OBJECT (spin_button), "changed-hook", 
-			    (gpointer) g_signal_connect_after (GTK_OBJECT(spin_button), "value-changed",
+			    (gpointer) g_signal_connect_after (G_OBJECT(spin_button), "value-changed",
 							       G_CALLBACK ( hook), data ));
     return spin_button;
 }
@@ -589,11 +589,11 @@
 {
     /* Block everything */
     if ( g_object_get_data (G_OBJECT (spin_button), "changed") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(spin_button),
+	g_signal_handler_block ( G_OBJECT(spin_button),
 				 (gulong) g_object_get_data (G_OBJECT (spin_button), 
 							     "changed"));
     if ( g_object_get_data (G_OBJECT (spin_button), "changed-hook") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(spin_button),
+	g_signal_handler_block ( G_OBJECT(spin_button),
 				 (gulong) g_object_get_data (G_OBJECT (spin_button), 
 							     "changed-hook"));
 
@@ -606,11 +606,11 @@
 
     /* Unblock everything */
     if ( g_object_get_data (G_OBJECT (spin_button), "changed") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(spin_button),
+	g_signal_handler_unblock ( G_OBJECT(spin_button),
 				   (gulong) g_object_get_data (G_OBJECT (spin_button), 
 							       "changed"));
     if ( g_object_get_data (G_OBJECT (spin_button), "changed-hook") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(spin_button),
+	g_signal_handler_unblock ( G_OBJECT(spin_button),
 				   (gulong) g_object_get_data (G_OBJECT (spin_button), 
 							       "changed-hook"));
 }
@@ -689,11 +689,11 @@
 			"number_for_func", GINT_TO_POINTER (number_for_func));
     if (default_func)
 	g_object_set_data ( G_OBJECT (button), "changed", 
-			    (gpointer) g_signal_connect_after (GTK_OBJECT(button), "toggled",
+			    (gpointer) g_signal_connect_after (G_OBJECT(button), "toggled",
 							       ((GCallback) gsb_autofunc_checkbutton_changed), default_func ));
     if ( hook )
 	g_object_set_data ( G_OBJECT (button), "changed-hook", 
-			    (gpointer) g_signal_connect_after (GTK_OBJECT(button), "toggled",
+			    (gpointer) g_signal_connect_after (G_OBJECT(button), "toggled",
 							       ((GCallback) hook), data ));
     return button;
 }
@@ -717,11 +717,11 @@
 {
     /* Block everything */
     if ( g_object_get_data (G_OBJECT (button), "changed") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(button),
+	g_signal_handler_block ( G_OBJECT(button),
 				 (gulong) g_object_get_data (G_OBJECT (button), 
 							     "changed"));
     if ( g_object_get_data (G_OBJECT (button), "changed-hook") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(button),
+	g_signal_handler_block ( G_OBJECT(button),
 				 (gulong) g_object_get_data (G_OBJECT (button), 
 							     "changed-hook"));
 
@@ -733,11 +733,11 @@
 
     /* Unblock everything */
     if ( g_object_get_data (G_OBJECT (button), "changed") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(button),
+	g_signal_handler_unblock ( G_OBJECT(button),
 				   (gulong) g_object_get_data (G_OBJECT (button), 
 							       "changed"));
     if ( g_object_get_data (G_OBJECT (button), "changed-hook") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(button),
+	g_signal_handler_unblock ( G_OBJECT(button),
 				   (gulong) g_object_get_data (G_OBJECT (button), 
 							       "changed-hook"));
 }
@@ -861,11 +861,11 @@
 
     // Block everything, the signals were on button2
     if ( g_object_get_data (G_OBJECT (button2), "changed") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(button2),
+	g_signal_handler_block ( G_OBJECT(button2),
 				 (gulong) g_object_get_data (G_OBJECT (button2), 
 							     "changed"));
     if ( g_object_get_data (G_OBJECT (button2), "changed-hook") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(button2),
+	g_signal_handler_block ( G_OBJECT(button2),
 				 (gulong) g_object_get_data (G_OBJECT (button2), 
 							     "changed-hook"));
 
@@ -880,11 +880,11 @@
 
     // Unblock everything
     if ( g_object_get_data (G_OBJECT (button2), "changed") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(button2),
+	g_signal_handler_unblock ( G_OBJECT(button2),
 				   (gulong) g_object_get_data (G_OBJECT (button2), 
 							       "changed"));
     if ( g_object_get_data (G_OBJECT (button2), "changed-hook") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(button2),
+	g_signal_handler_unblock ( G_OBJECT(button2),
 				   (gulong) g_object_get_data (G_OBJECT (button2), 
 							       "changed-hook"));
 }*/
@@ -982,11 +982,11 @@
 
     /* Unblock everything */
     if ( g_object_get_data (G_OBJECT (entry), "changed") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(entry),
+	g_signal_handler_unblock ( G_OBJECT(entry),
 				   (gulong) g_object_get_data (G_OBJECT (entry), 
 							       "changed"));
     if ( g_object_get_data (G_OBJECT (entry), "changed-hook") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(entry),
+	g_signal_handler_unblock ( G_OBJECT(entry),
 				   (gulong) g_object_get_data (G_OBJECT (entry), 
 							       "changed-hook"));
 }
@@ -1122,11 +1122,11 @@
 
     /* Unblock everything */
     if ( g_object_get_data (G_OBJECT (entry), "changed") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(entry),
+	g_signal_handler_unblock ( G_OBJECT(entry),
 				   (gulong) g_object_get_data (G_OBJECT (entry), 
 							       "changed"));
     if ( g_object_get_data (G_OBJECT (entry), "changed-hook") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(entry),
+	g_signal_handler_unblock ( G_OBJECT(entry),
 				   (gulong) g_object_get_data (G_OBJECT (entry), 
 							       "changed-hook"));
 }
@@ -1238,11 +1238,11 @@
 {
     /* Block everything */
     if ( g_object_get_data (G_OBJECT (combobox), "changed") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(combobox),
+	g_signal_handler_block ( G_OBJECT(combobox),
 				 (gulong) g_object_get_data (G_OBJECT (combobox), 
 							     "changed"));
     if ( g_object_get_data (G_OBJECT (combobox), "changed-hook") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(combobox),
+	g_signal_handler_block ( G_OBJECT(combobox),
 				 (gulong) g_object_get_data (G_OBJECT (combobox), 
 							     "changed-hook"));
 
@@ -1254,11 +1254,11 @@
 
     /* Unblock everything */
     if ( g_object_get_data (G_OBJECT (combobox), "changed") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(combobox),
+	g_signal_handler_unblock ( G_OBJECT(combobox),
 				   (gulong) g_object_get_data (G_OBJECT (combobox), 
 							       "changed"));
     if ( g_object_get_data (G_OBJECT (combobox), "changed-hook") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(combobox),
+	g_signal_handler_unblock ( G_OBJECT(combobox),
 				   (gulong) g_object_get_data (G_OBJECT (combobox), 
 							       "changed-hook"));
 }
@@ -1371,11 +1371,11 @@
 {
     /* Block everything */
     if ( g_object_get_data (G_OBJECT (combobox), "changed") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(combobox),
+	g_signal_handler_block ( G_OBJECT(combobox),
 				 (gulong) g_object_get_data (G_OBJECT (combobox), 
 							     "changed"));
     if ( g_object_get_data (G_OBJECT (combobox), "changed-hook") > 0 )
-	g_signal_handler_block ( GTK_OBJECT(combobox),
+	g_signal_handler_block ( G_OBJECT(combobox),
 				 (gulong) g_object_get_data (G_OBJECT (combobox), 
 							     "changed-hook"));
 
@@ -1387,11 +1387,11 @@
 
     /* Unblock everything */
     if ( g_object_get_data (G_OBJECT (combobox), "changed") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(combobox),
+	g_signal_handler_unblock ( G_OBJECT(combobox),
 				   (gulong) g_object_get_data (G_OBJECT (combobox), 
 							       "changed"));
     if ( g_object_get_data (G_OBJECT (combobox), "changed-hook") > 0 )
-	g_signal_handler_unblock ( GTK_OBJECT(combobox),
+	g_signal_handler_unblock ( G_OBJECT(combobox),
 				   (gulong) g_object_get_data (G_OBJECT (combobox), 
 							       "changed-hook"));
 }

More information about the cvs mailing list