Replaced all gtk_signal_connect() calls with g_signal_connect() ones.

* e-summary-calendar.c: Replaced all gtk_signal_connect() calls
with g_signal_connect() ones.
* e-summary-mail.c: Likewise.
* e-summary-offline-handler.c: Likewise.
* e-summary-preferences.c: Likewise.
* e-summary-shown.c: Likewise.
* e-summary-tasks.c: Likewise.
* e-summary.c: Likewise.

svn path=/trunk/; revision=18754

8 files changed, 61 insertions, 95 deletions

diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 82e7f4b2f9..d098b87b6a 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,14 @@
+2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
+
+	* e-summary-calendar.c: Replaced all gtk_signal_connect() calls
+	with g_signal_connect() ones.
+	* e-summary-mail.c: Likewise.
+	* e-summary-offline-handler.c: Likewise.
+	* e-summary-preferences.c: Likewise.
+	* e-summary-shown.c: Likewise.
+	* e-summary-tasks.c: Likewise.
+	* e-summary.c: Likewise.
+
 2002-11-11  Ettore Perazzoli  <ettore@ximian.com>
 
 	* e-summary-factory.c (control_destroy_cb): gtk_widget_destroy()
diff --git a/my-evolution/e-summary-calendar.c b/my-evolution/e-summary-calendar.c
index 4714cea746..0bb57276e8 100644
--- a/my-evolution/e-summary-calendar.c
+++ b/my-evolution/e-summary-calendar.c
@@ -555,12 +555,9 @@ setup_calendar (ESummary *summary)
 
 	calendar->client = cal_client_new ();
 
-	gtk_signal_connect (GTK_OBJECT (calendar->client), "cal-opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb), summary);
-	gtk_signal_connect (GTK_OBJECT (calendar->client), "obj-updated",
-			    GTK_SIGNAL_FUNC (obj_changed_cb), summary);
-	gtk_signal_connect (GTK_OBJECT (calendar->client), "obj-removed",
-			    GTK_SIGNAL_FUNC (obj_changed_cb), summary);
+	g_signal_connect (calendar->client, "cal-opened", G_CALLBACK (cal_opened_cb), summary);
+	g_signal_connect (calendar->client, "obj-updated", G_CALLBACK (obj_changed_cb), summary);
+	g_signal_connect (calendar->client, "obj-removed", G_CALLBACK (obj_changed_cb), summary);
 
 	if (! cal_client_open_default_calendar (calendar->client, FALSE))
 		g_message ("Open calendar failed");
@@ -592,8 +589,7 @@ setup_config_listener (ESummary *summary)
 
 	calendar->config_listener = e_config_listener_new ();
 
-	gtk_signal_connect (GTK_OBJECT (calendar->config_listener), "key_changed",
-			    GTK_SIGNAL_FUNC (config_listener_key_changed_cb), summary);
+	g_signal_connect (calendar->config_listener, "key_changed", G_CALLBACK (config_listener_key_changed_cb), summary);
 
 	setup_calendar (summary);
 }
diff --git a/my-evolution/e-summary-mail.c b/my-evolution/e-summary-mail.c
index 43235fc320..8be64a05c8 100644
--- a/my-evolution/e-summary-mail.c
+++ b/my-evolution/e-summary-mail.c
@@ -372,12 +372,9 @@ e_summary_folder_register_storage (const char *name,
 
 	folder_store->storage_list = g_slist_prepend (folder_store->storage_list, si);
 	
-	gtk_signal_connect (GTK_OBJECT (si->listener), "new-folder",
-			    GTK_SIGNAL_FUNC (new_folder_cb), si);
-	gtk_signal_connect (GTK_OBJECT (si->listener), "removed-folder",
-			    GTK_SIGNAL_FUNC (remove_folder_cb), si);
-	gtk_signal_connect (GTK_OBJECT (si->listener), "update_folder",
-			    GTK_SIGNAL_FUNC (update_folder_cb), si);
+	g_signal_connect (si->listener, "new-folder", G_CALLBACK (new_folder_cb), si);
+	g_signal_connect (si->listener, "removed-folder", G_CALLBACK (remove_folder_cb), si);
+	g_signal_connect (si->listener, "update_folder", G_CALLBACK (update_folder_cb), si);
 	
 	corba_listener = evolution_storage_listener_corba_objref (si->listener);
 
@@ -482,8 +479,7 @@ e_summary_folder_register_storages (GNOME_Evolution_Shell corba_shell)
 	}
 
 	listener = bonobo_listener_new (NULL, NULL);
-	gtk_signal_connect (GTK_OBJECT (listener), "event-notify",
-			    GTK_SIGNAL_FUNC (storage_notify), NULL);
+	g_signal_connect (listener, "event-notify", G_CALLBACK (storage_notify), NULL);
 	corba_listener = bonobo_object_corba_objref (BONOBO_OBJECT (listener));
 
 	/* Storages will be added whenever the listener gets an event. */
@@ -798,12 +794,9 @@ e_summary_mail_free (ESummary *summary)
 	g_free (mail->html);
 
 #if 0
-	gtk_signal_disconnect_by_func (GTK_OBJECT (mail->storage_listener),
-				       GTK_SIGNAL_FUNC (new_folder_cb), summary);
-	gtk_signal_disconnect_by_func (GTK_OBJECT (mail->storage_listener),
-				       GTK_SIGNAL_FUNC (remove_folder_cb), summary);
-	gtk_signal_disconnect_by_func (GTK_OBJECT (mail->storage_listener),
-				       GTK_SIGNAL_FUNC (update_folder_cb), summary);
+	g_signal_handlers_disconnect_by_func (mail->storage_listener, G_CALLBACK (new_folder_cb), summary);
+	g_signal_handlers_disconnect_by_func (mail->storage_listener, G_CALLBACK (remove_folder_cb), summary);
+	g_signal_handlers_disconnect_by_func (mail->storage_listener, G_CALLBACK (update_folder_cb), summary);
 #endif
 	
 	g_free (mail);
@@ -863,8 +856,7 @@ lazy_register_storages (void)
 
 	/* Connect a listener to it */
 	listener = bonobo_listener_new (NULL, NULL);
-	gtk_signal_connect (GTK_OBJECT (listener), "event-notify",
-			    GTK_SIGNAL_FUNC (folder_info_pb_changed), NULL);
+	g_signal_connect (listener, "event-notify", G_CALLBACK (folder_info_pb_changed), NULL);
 	
 	corba_listener = bonobo_object_corba_objref (BONOBO_OBJECT (listener));
 	Bonobo_EventSource_addListener (event, corba_listener, &ev);
@@ -902,8 +894,7 @@ e_summary_folder_init_folder_store (GNOME_Evolution_Shell shell)
 	CORBA_exception_free (&ev);
 
 	listener = bonobo_listener_new (NULL, NULL);
-	gtk_signal_connect (GTK_OBJECT (listener), "event-notify",
-			    GTK_SIGNAL_FUNC (mail_change_notify), NULL);
+	g_signal_connect (listener, "event-notify", G_CALLBACK (mail_change_notify), NULL);
 	folder_store->corba_listener = bonobo_object_corba_objref (BONOBO_OBJECT (listener));
 	
 	/* Create a hash table for the folders */
diff --git a/my-evolution/e-summary-offline-handler.c b/my-evolution/e-summary-offline-handler.c
index 270f4e90ee..c42593522c 100644
--- a/my-evolution/e-summary-offline-handler.c
+++ b/my-evolution/e-summary-offline-handler.c
@@ -280,8 +280,7 @@ e_summary_offline_handler_add_summary (ESummaryOfflineHandler *handler,
 	handler->priv->summaries = g_slist_prepend (handler->priv->summaries,
 						    summary);
 
-	gtk_signal_connect (GTK_OBJECT (summary), "destroy",
-			    GTK_SIGNAL_FUNC (summary_destroy_callback), handler);
+	g_signal_connect (summary, "destroy", G_CALLBACK (summary_destroy_callback), handler);
 }
 
 BONOBO_X_TYPE_FUNC_FULL (ESummaryOfflineHandler, GNOME_Evolution_Offline, PARENT_TYPE, e_summary_offline_handler);
diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c
index edbda8f135..11d49e7874 100644
--- a/my-evolution/e-summary-preferences.c
+++ b/my-evolution/e-summary-preferences.c
@@ -790,10 +790,8 @@ rdf_new_url_clicked_cb (GtkButton *button,
 	add_dialog = gnome_dialog_new (_("Add a news feed"),
 				       GNOME_STOCK_BUTTON_OK,
 				       GNOME_STOCK_BUTTON_CANCEL, NULL);
-	gtk_signal_connect (GTK_OBJECT (add_dialog), "clicked",
-			    GTK_SIGNAL_FUNC (add_dialog_clicked_cb), pd);
-	gtk_signal_connect (GTK_OBJECT (add_dialog), "destroy",
-			    GTK_SIGNAL_FUNC (gtk_widget_destroyed), &add_dialog);
+	g_signal_connect (add_dialog, "clicked", G_CALLBACK (add_dialog_clicked_cb), pd);
+	g_signal_connect (add_dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &add_dialog);
 
 	label = gtk_label_new (_("Enter the URL of the news feed you wish to add"));
 	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (add_dialog)->vbox), label,
@@ -1039,50 +1037,44 @@ make_property_dialog (PropertyData *pd)
 	g_return_val_if_fail (mail->storage_set_view != NULL, FALSE);
 
 	listener = g_object_get_data (G_OBJECT (mail->storage_set_view), "listener");
-	gtk_signal_connect (GTK_OBJECT (listener), "folder-toggled",
-			    GTK_SIGNAL_FUNC (storage_set_changed), pd);
+	g_signal_connect (listener, "folder-toggled", G_CALLBACK (storage_set_changed), pd);
 
 	mail->fullpath = glade_xml_get_widget (pd->xml, "checkbutton1");
 	g_return_val_if_fail (mail->fullpath != NULL, FALSE);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mail->fullpath),
 				      global_preferences->show_full_path);
-	gtk_signal_connect (GTK_OBJECT (mail->fullpath), "toggled",
-			    GTK_SIGNAL_FUNC (mail_show_full_path_toggled_cb), pd);
+	g_signal_connect (mail->fullpath, "toggled", G_CALLBACK (mail_show_full_path_toggled_cb), pd);
 	
 	/* RDF */
 	rdf = pd->rdf = g_new0 (struct _RDFPage, 1);
 	rdf->etable = glade_xml_get_widget (pd->xml, "rdf-custom");
 	g_return_val_if_fail (rdf->etable != NULL, FALSE);
 
-	gtk_signal_connect (GTK_OBJECT (rdf->etable), "item-changed",
-			    GTK_SIGNAL_FUNC (rdf_etable_item_changed_cb), pd);
-	gtk_signal_connect (GTK_OBJECT (rdf->etable), "selection-changed",
-			    GTK_SIGNAL_FUNC (rdf_etable_selection_cb), pd);
+	g_signal_connect (rdf->etable, "item-changed", G_CALLBACK (rdf_etable_item_changed_cb), pd);
+	g_signal_connect (rdf->etable, "selection-changed", G_CALLBACK (rdf_etable_selection_cb), pd);
 	
 	fill_rdf_etable (rdf->etable, pd);
 	rdf->refresh = glade_xml_get_widget (pd->xml, "spinbutton1");
 	g_return_val_if_fail (rdf->refresh != NULL, FALSE);
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (rdf->refresh),
 				   (float) global_preferences->rdf_refresh_time);
-	gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (rdf->refresh)->adjustment), "value_changed",
-			    GTK_SIGNAL_FUNC (rdf_refresh_value_changed_cb), pd);
+	g_signal_connect (GTK_SPIN_BUTTON (rdf->refresh)->adjustment, "value_changed",
+			  G_CALLBACK (rdf_refresh_value_changed_cb), pd);
 
 	rdf->limit = glade_xml_get_widget (pd->xml, "spinbutton4");
 	g_return_val_if_fail (rdf->limit != NULL, FALSE);
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (rdf->limit), 
 				   (float) global_preferences->limit);
-	gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (rdf->limit)->adjustment), "value_changed",
-			    GTK_SIGNAL_FUNC (rdf_limit_value_changed_cb), pd);
+	g_signal_connect (GTK_SPIN_BUTTON (rdf->limit)->adjustment, "value_changed",
+			  G_CALLBACK (rdf_limit_value_changed_cb), pd);
 
 	rdf->new_button = glade_xml_get_widget (pd->xml, "button11");
 	g_return_val_if_fail (rdf->limit != NULL, FALSE);
-	gtk_signal_connect (GTK_OBJECT (rdf->new_button), "clicked",
-			    GTK_SIGNAL_FUNC (rdf_new_url_clicked_cb), pd);
+	g_signal_connect (rdf->new_button, "clicked", G_CALLBACK (rdf_new_url_clicked_cb), pd);
 
 	rdf->delete_url = glade_xml_get_widget (pd->xml, "delete-button");
 	g_return_val_if_fail (rdf->delete_url != NULL, FALSE);
-	gtk_signal_connect (GTK_OBJECT (rdf->delete_url), "clicked",
-			    GTK_SIGNAL_FUNC (rdf_delete_url_cb), pd);
+	g_signal_connect (rdf->delete_url, "clicked", G_CALLBACK (rdf_delete_url_cb), pd);
 	
 	/* Weather */
 	weather = pd->weather = g_new (struct _WeatherPage, 1);
@@ -1091,9 +1083,7 @@ make_property_dialog (PropertyData *pd)
 	weather->etable = glade_xml_get_widget (pd->xml, "weather-custom");
 	g_return_val_if_fail (weather->etable != NULL, FALSE);
 
-	gtk_signal_connect (GTK_OBJECT (weather->etable), "item-changed",
-			    GTK_SIGNAL_FUNC (weather_etable_item_changed_cb),
-			    pd);
+	g_signal_connect (weather->etable, "item-changed", G_CALLBACK (weather_etable_item_changed_cb), pd);
 
 	fill_weather_etable (E_SUMMARY_SHOWN (weather->etable), pd);
 
@@ -1101,24 +1091,20 @@ make_property_dialog (PropertyData *pd)
 	g_return_val_if_fail (weather->refresh != NULL, FALSE);
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (weather->refresh),
 				   (float) global_preferences->weather_refresh_time);
-	gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (weather->refresh)->adjustment),
-					"value-changed",
-					GTK_SIGNAL_FUNC (weather_refresh_value_changed_cb),
-					pd);
+	g_signal_connect (GTK_SPIN_BUTTON (weather->refresh)->adjustment, "value-changed",
+			  G_CALLBACK (weather_refresh_value_changed_cb), pd);
 
 	weather->metric = glade_xml_get_widget (pd->xml, "radiobutton7");
 	g_return_val_if_fail (weather->metric != NULL, FALSE);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (weather->metric),
 				      (global_preferences->units == UNITS_METRIC));
-	gtk_signal_connect (GTK_OBJECT (weather->metric), "toggled",
-			    GTK_SIGNAL_FUNC (weather_metric_toggled_cb), pd);
+	g_signal_connect (weather->metric, "toggled", G_CALLBACK (weather_metric_toggled_cb), pd);
 
 	weather->imperial = glade_xml_get_widget (pd->xml, "radiobutton8");
 	g_return_val_if_fail (weather->imperial != NULL, FALSE);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (weather->imperial),
 				      (global_preferences->units == UNITS_IMPERIAL));
-	gtk_signal_connect (GTK_OBJECT (weather->imperial), "toggled",
-			    GTK_SIGNAL_FUNC (weather_imperial_toggled_cb), pd);
+	g_signal_connect (weather->imperial, "toggled", G_CALLBACK (weather_imperial_toggled_cb), pd);
 
 	/* Calendar */
 	calendar = pd->calendar = g_new (struct _CalendarPage, 1);
@@ -1126,43 +1112,37 @@ make_property_dialog (PropertyData *pd)
 	g_return_val_if_fail (calendar->one != NULL, FALSE);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (calendar->one),
 				      (global_preferences->days == E_SUMMARY_CALENDAR_ONE_DAY));
-	gtk_signal_connect (GTK_OBJECT (calendar->one), "toggled",
-			    GTK_SIGNAL_FUNC (calendar_one_toggled_cb), pd);
+	g_signal_connect (calendar->one, "toggled", G_CALLBACK (calendar_one_toggled_cb), pd);
 
 	calendar->five = glade_xml_get_widget (pd->xml, "radiobutton4");
 	g_return_val_if_fail (calendar->five != NULL, FALSE);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (calendar->five),
 				      (global_preferences->days == E_SUMMARY_CALENDAR_FIVE_DAYS));
-	gtk_signal_connect (GTK_OBJECT (calendar->five), "toggled",
-			    GTK_SIGNAL_FUNC (calendar_five_toggled_cb), pd);
+	g_signal_connect (calendar->five, "toggled", G_CALLBACK (calendar_five_toggled_cb), pd);
 
 	calendar->week = glade_xml_get_widget (pd->xml, "radiobutton5");
 	g_return_val_if_fail (calendar->week != NULL, FALSE);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (calendar->week),
 				      (global_preferences->days == E_SUMMARY_CALENDAR_ONE_WEEK));
-	gtk_signal_connect (GTK_OBJECT (calendar->week), "toggled",
-			    GTK_SIGNAL_FUNC (calendar_week_toggled_cb), pd);
+	g_signal_connect (calendar->week, "toggled", G_CALLBACK (calendar_week_toggled_cb), pd);
 
 	calendar->month = glade_xml_get_widget (pd->xml, "radiobutton6");
 	g_return_val_if_fail (calendar->month != NULL, FALSE);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (calendar->month),
 				      (global_preferences->days == E_SUMMARY_CALENDAR_ONE_MONTH));
-	gtk_signal_connect (GTK_OBJECT (calendar->month), "toggled",
-			    GTK_SIGNAL_FUNC (calendar_month_toggled_cb), pd);
+	g_signal_connect (calendar->month, "toggled", G_CALLBACK (calendar_month_toggled_cb), pd);
 
 	calendar->all = glade_xml_get_widget (pd->xml, "radiobutton1");
 	g_return_val_if_fail (calendar->all != NULL, FALSE);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (calendar->all),
 				      (global_preferences->show_tasks == E_SUMMARY_CALENDAR_ALL_TASKS));
-	gtk_signal_connect (GTK_OBJECT (calendar->all), "toggled",
-			    GTK_SIGNAL_FUNC (calendar_all_toggled_cb), pd);
+	g_signal_connect (calendar->all, "toggled", G_CALLBACK (calendar_all_toggled_cb), pd);
 
 	calendar->today = glade_xml_get_widget (pd->xml, "radiobutton2");
 	g_return_val_if_fail (calendar->today != NULL, FALSE);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (calendar->today),
 				      (global_preferences->show_tasks == E_SUMMARY_CALENDAR_TODAYS_TASKS));
-	gtk_signal_connect (GTK_OBJECT(calendar->today), "toggled",
-			    GTK_SIGNAL_FUNC (calendar_today_toggled_cb), pd);
+	g_signal_connect (calendar->today, "toggled", G_CALLBACK (calendar_today_toggled_cb), pd);
 
 	return TRUE;
 }
@@ -1456,10 +1436,8 @@ factory_fn (BonoboGenericFactory *generic_factory,
 
 	gtk_widget_unref (widget);
 
-	gtk_signal_connect (GTK_OBJECT (pd->config_control), "apply",
-			    GTK_SIGNAL_FUNC (config_control_apply_cb), pd);
-	gtk_signal_connect (GTK_OBJECT (pd->config_control), "destroy",
-			    GTK_SIGNAL_FUNC (config_control_destroy_cb), pd);
+	g_signal_connect (pd->config_control, "apply", G_CALLBACK (config_control_apply_cb), pd);
+	g_signal_connect (pd->config_control, "destroy", G_CALLBACK (config_control_destroy_cb), pd);
 
 	return BONOBO_OBJECT (pd->config_control);
 }
diff --git a/my-evolution/e-summary-shown.c b/my-evolution/e-summary-shown.c
index d13b5242ad..049f49fc6e 100644
--- a/my-evolution/e-summary-shown.c
+++ b/my-evolution/e-summary-shown.c
@@ -475,8 +475,7 @@ make_table (GHashTable *data_model,
 
 	tree = e_tree_scrolled_get_tree (E_TREE_SCROLLED (td->etable));
 	e_tree_root_node_set_visible (tree, FALSE);
-	gtk_signal_connect (GTK_OBJECT (tree), "selection-change",
-			    callback, closure);
+	g_signal_connect (tree, "selection-change", callback, closure);
 
 	td->contents = NULL;
 	return td;
@@ -519,7 +518,7 @@ e_summary_shown_init (ESummaryShown *shown)
 	priv = g_new (ESummaryShownPrivate, 1);
 	shown->priv = priv;
 
-	priv->all = make_table (shown->all_model, _("All"), GTK_SIGNAL_FUNC (all_selection_changed), shown);
+	priv->all = make_table (shown->all_model, _("All"), G_CALLBACK (all_selection_changed), shown);
 	
 	gtk_box_pack_start (GTK_BOX (shown), priv->all->etable, TRUE, TRUE, 2);
 	gtk_widget_show (priv->all->etable);
@@ -534,19 +533,17 @@ e_summary_shown_init (ESummaryShown *shown)
 	priv->add = construct_pixmap_button (_("Add"), GNOME_STOCK_BUTTON_NEXT);
 	gtk_widget_set_sensitive (priv->add, FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox), priv->add, TRUE, FALSE, 0);
-	gtk_signal_connect (GTK_OBJECT (priv->add), "clicked",
-			    GTK_SIGNAL_FUNC (add_clicked), shown);
+	g_signal_connect (priv->add, "clicked", G_CALLBACK (add_clicked), shown);
 
 	/* Fixme: Ditto */
 	priv->remove = construct_pixmap_button (_("Remove"), GNOME_STOCK_BUTTON_PREV);
 	gtk_widget_set_sensitive (priv->remove, FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox), priv->remove, TRUE, FALSE, 0);
-	gtk_signal_connect (GTK_OBJECT (priv->remove), "clicked",
-			    GTK_SIGNAL_FUNC (remove_clicked), shown);
+	g_signal_connect (priv->remove, "clicked", G_CALLBACK (remove_clicked), shown);
 
 	gtk_widget_show_all (align);
 
-	priv->shown = make_table (shown->shown_model, _("Shown"), GTK_SIGNAL_FUNC (shown_selection_changed), shown);
+	priv->shown = make_table (shown->shown_model, _("Shown"), G_CALLBACK (shown_selection_changed), shown);
 
 	gtk_box_pack_start (GTK_BOX (shown), priv->shown->etable, TRUE, TRUE, 2);
 	gtk_widget_show (priv->shown->etable);
diff --git a/my-evolution/e-summary-tasks.c b/my-evolution/e-summary-tasks.c
index 35235d2fe1..7763f248ad 100644
--- a/my-evolution/e-summary-tasks.c
+++ b/my-evolution/e-summary-tasks.c
@@ -509,12 +509,9 @@ setup_task_folder (ESummary *summary)
 		return;
 	}
 
-	gtk_signal_connect (GTK_OBJECT (tasks->client), "cal-opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb), summary);
-	gtk_signal_connect (GTK_OBJECT (tasks->client), "obj-updated",
-			    GTK_SIGNAL_FUNC (obj_changed_cb), summary);
-	gtk_signal_connect (GTK_OBJECT (tasks->client), "obj-removed",
-			    GTK_SIGNAL_FUNC (obj_changed_cb), summary);
+	g_signal_connect (tasks->client, "cal-opened", G_CALLBACK (cal_opened_cb), summary);
+	g_signal_connect (tasks->client, "obj-updated", G_CALLBACK (obj_changed_cb), summary);
+	g_signal_connect (tasks->client, "obj-removed", G_CALLBACK (obj_changed_cb), summary);
 
 	if (! cal_client_open_default_tasks (tasks->client, FALSE))
 		g_message ("Open tasks failed");
@@ -540,8 +537,7 @@ setup_config_listener (ESummary *summary)
 
 	tasks->config_listener = e_config_listener_new ();
 
-	gtk_signal_connect (GTK_OBJECT (tasks->config_listener), "key_changed",
-			    GTK_SIGNAL_FUNC (config_listener_key_changed_cb), summary);
+	g_signal_connect (tasks->config_listener, "key_changed", G_CALLBACK (config_listener_key_changed_cb), summary);
 }
 
 void
diff --git a/my-evolution/e-summary.c b/my-evolution/e-summary.c
index bf3a358c87..005c20b6ac 100644
--- a/my-evolution/e-summary.c
+++ b/my-evolution/e-summary.c
@@ -517,10 +517,8 @@ e_summary_init (ESummary *summary)
 	g_free (def);
 	g_free (default_utf);
 
-	gtk_signal_connect (GTK_OBJECT (priv->html), "url-requested",
-			    GTK_SIGNAL_FUNC (e_summary_url_requested), summary);
-	gtk_signal_connect (GTK_OBJECT (priv->html), "link-clicked",
-			    GTK_SIGNAL_FUNC (e_summary_url_clicked), summary);
+	g_signal_connect (priv->html, "url-requested", G_CALLBACK (e_summary_url_requested), summary);
+	g_signal_connect (priv->html, "link-clicked", G_CALLBACK (e_summary_url_clicked), summary);
 
 	gtk_container_add (GTK_CONTAINER (priv->html_scroller), priv->html);
 	gtk_widget_show_all (priv->html_scroller);