Use g_signal_connect() instead of gtk_signal_connect(). Likewise.

* gui/calendar-commands.c: Use g_signal_connect() instead of
gtk_signal_connect().
* calendar-commands.c: Likewise.
* calendar-config.c: Likewise.
* calendar-model.c: Likewise.
* comp-editor-factory.c: Likewise.
* component-factory.c: Likewise.
* control-factory.c: Likewise.
* e-calendar-table.c: Likewise.
* e-comp-editor-registry.c: Likewise.
* e-day-view-time-item.c: Likewise.
* e-day-view.c: Likewise.
* e-itip-control.c: Likewise.
* e-meeting-model.c: Likewise.
* e-meeting-time-sel.c: Likewise.
* e-tasks.c: Likewise.
* e-timezone-entry.c: Likewise.
* e-week-view.c: Likewise.
* gnome-cal.c: Likewise.
* goto.c: Likewise.
* tasks-control.c: Likewise.
* tasks-migrate.c: Likewise.
* weekday-picker.c: Likewise.

svn path=/trunk/; revision=18672

23 files changed, 389 insertions, 484 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e80acbbecd..f9e42b9bf3 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,31 @@
 2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
 
+	* gui/calendar-commands.c: Use g_signal_connect() instead of
+	gtk_signal_connect().
+	* calendar-commands.c: Likewise.
+	* calendar-config.c: Likewise.
+	* calendar-model.c: Likewise.
+	* comp-editor-factory.c: Likewise.
+	* component-factory.c: Likewise.
+	* control-factory.c: Likewise.
+	* e-calendar-table.c: Likewise.
+	* e-comp-editor-registry.c: Likewise.
+	* e-day-view-time-item.c: Likewise.
+	* e-day-view.c: Likewise.
+	* e-itip-control.c: Likewise.
+	* e-meeting-model.c: Likewise.
+	* e-meeting-time-sel.c: Likewise.
+	* e-tasks.c: Likewise.
+	* e-timezone-entry.c: Likewise.
+	* e-week-view.c: Likewise.
+	* gnome-cal.c: Likewise.
+	* goto.c: Likewise.
+	* tasks-control.c: Likewise.
+	* tasks-migrate.c: Likewise.
+	* weekday-picker.c: Likewise.
+
+2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
+
 	* gui/calendar-offline-handler.c
 	(calendar_offline_handler_class_init): GObjectified.
 	(impl_finalize): Finalize impl.
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 0f24a6bf98..90fbb796a2 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -605,13 +605,13 @@ gcal_calendar_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
 	g_assert (focus != NULL);
 
 	if (in) {
-		gtk_signal_connect (GTK_OBJECT (gcal), "calendar_selection_changed",
-				    GTK_SIGNAL_FUNC (gcal_calendar_selection_changed_cb), control);
+		g_signal_connect (gcal, "calendar_selection_changed",
+				  G_CALLBACK (gcal_calendar_selection_changed_cb), control);
 		sensitize_calendar_commands (gcal, control, TRUE);
 		focus->calendar_focused = TRUE;
 	} else if (focus->calendar_focused) {
 		gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),
-					       GTK_SIGNAL_FUNC (gcal_calendar_selection_changed_cb),
+					       G_CALLBACK (gcal_calendar_selection_changed_cb),
 					       control);
 		sensitize_calendar_commands (gcal, control, FALSE);
 		focus->calendar_focused = FALSE;
@@ -631,8 +631,8 @@ gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
 	g_assert (focus != NULL);
 
 	if (in) {
-		gtk_signal_connect (GTK_OBJECT (gcal), "taskpad_selection_changed",
-				    GTK_SIGNAL_FUNC (gcal_taskpad_selection_changed_cb), control);
+		g_signal_connect (gcal, "taskpad_selection_changed",
+				  G_CALLBACK (gcal_taskpad_selection_changed_cb), control);
 		sensitize_taskpad_commands (gcal, control, TRUE);
 		focus->taskpad_focused = TRUE;
 	} else if (focus->taskpad_focused) {
@@ -642,7 +642,7 @@ gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
 		 * the taskpad was in fact focused.
 		 */
 		gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),
-					       GTK_SIGNAL_FUNC (gcal_taskpad_selection_changed_cb),
+					       G_CALLBACK (gcal_taskpad_selection_changed_cb),
 					       control);
 		sensitize_taskpad_commands (gcal, control, FALSE);
 		focus->taskpad_focused = FALSE;
@@ -728,13 +728,13 @@ calendar_control_activate (BonoboControl *control,
 
 	gnome_calendar_setup_view_menus (gcal, uic);
 
-	gtk_signal_connect (GTK_OBJECT (gcal), "dates_shown_changed",
-			    GTK_SIGNAL_FUNC (gcal_calendar_dates_change_cb),
-			    control);
-	gtk_signal_connect (GTK_OBJECT (gcal), "calendar_focus_change",
-			    GTK_SIGNAL_FUNC (gcal_calendar_focus_change_cb), control);
-	gtk_signal_connect (GTK_OBJECT (gcal), "taskpad_focus_change",
-			    GTK_SIGNAL_FUNC (gcal_taskpad_focus_change_cb), control);
+	g_signal_connect (gcal, "dates_shown_changed",
+			  G_CALLBACK (gcal_calendar_dates_change_cb),
+			  control);
+	g_signal_connect (gcal, "calendar_focus_change",
+			  G_CALLBACK (gcal_calendar_focus_change_cb), control);
+	g_signal_connect (gcal, "taskpad_focus_change",
+			  G_CALLBACK (gcal_taskpad_focus_change_cb), control);
 
 	sensitize_calendar_commands (gcal, control, FALSE);
 	sensitize_taskpad_commands (gcal, control, FALSE);
@@ -801,8 +801,8 @@ new_calendar (void)
 		return NULL;
 	}
 
-	gtk_signal_connect (GTK_OBJECT (gcal), "destroy",
-			    GTK_SIGNAL_FUNC (on_calendar_destroyed), NULL);
+	g_signal_connect (gcal, "destroy",
+			  G_CALLBACK (on_calendar_destroyed), NULL);
 
 	all_calendars = g_list_prepend (all_calendars, gcal);
 
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 71656bab2f..27fdbc7ee1 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -528,7 +528,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 
 static void
 owner_unset_cb (EvolutionShellComponent *shell_component,
-	      gpointer user_data)
+		gpointer user_data)
 {
 	shells = g_list_remove (shells, shell_component);
 	
@@ -740,10 +740,8 @@ create_object (void)
 	bonobo_object_add_interface (BONOBO_OBJECT (shell_component), 
 				     BONOBO_OBJECT (offline_handler));
 	
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
+	g_signal_connect (shell_component, "owner_set", G_CALLBACK (owner_set_cb), NULL);
+	g_signal_connect (shell_component, "owner_unset", G_CALLBACK (owner_unset_cb), NULL);
 
 	/* User creatable items */
 
@@ -767,8 +765,8 @@ create_object (void)
 			    _("Create a new all-day appointment"),
 			    FOLDER_CALENDAR, 'd', "new_all_day_event.png");
 
-	gtk_signal_connect (GTK_OBJECT (shell_component), "user_create_new_item",
-			    GTK_SIGNAL_FUNC (sc_user_create_new_item_cb), NULL);
+	g_signal_connect (shell_component, "user_create_new_item",
+			  G_CALLBACK (sc_user_create_new_item_cb), NULL);
 
 	return BONOBO_OBJECT (shell_component);
 }
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 7f92c8f3ca..648959c838 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -660,12 +660,10 @@ calendar_config_check_timezone_set ()
 	elem = g_list_nth (GNOME_DIALOG (dialog)->buttons, 1);
 	gtk_widget_hide (elem->data);
 
-	gtk_signal_connect (GTK_OBJECT (dialog), "clicked",
-			    GTK_SIGNAL_FUNC (on_timezone_set),
-			    timezone_dialog);
-	gtk_signal_connect (GTK_OBJECT (dialog), "delete-event",
-			    GTK_SIGNAL_FUNC (on_timezone_dialog_delete_event),
-			    timezone_dialog);
+	g_signal_connect (dialog, "clicked",
+			  G_CALLBACK (on_timezone_set), timezone_dialog);
+	g_signal_connect (dialog, "delete-event",
+			  G_CALLBACK (on_timezone_dialog_delete_event), timezone_dialog);
 
 	gtk_widget_show (dialog);
 }
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index dd7be86eea..deb23e1cc3 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -876,7 +876,7 @@ calendar_model_value_at (ETableModel *etm, int col, int row)
 			}
 		}
 
-		cleanup:
+	cleanup:
 		cal_component_free_attendee_list (attendees);
 		return GINT_TO_POINTER (retval);		
 		break;
@@ -2001,14 +2001,14 @@ update_query (CalendarModel *model)
 		return;
 	}
 
-	gtk_signal_connect (GTK_OBJECT (priv->query), "obj_updated",
-			    GTK_SIGNAL_FUNC (query_obj_updated_cb), model);
-	gtk_signal_connect (GTK_OBJECT (priv->query), "obj_removed",
-			    GTK_SIGNAL_FUNC (query_obj_removed_cb), model);
-	gtk_signal_connect (GTK_OBJECT (priv->query), "query_done",
-			    GTK_SIGNAL_FUNC (query_query_done_cb), model);
-	gtk_signal_connect (GTK_OBJECT (priv->query), "eval_error",
-			    GTK_SIGNAL_FUNC (query_eval_error_cb), model);
+	g_signal_connect (priv->query, "obj_updated",
+			  G_CALLBACK (query_obj_updated_cb), model);
+	g_signal_connect (priv->query, "obj_removed",
+			  G_CALLBACK (query_obj_removed_cb), model);
+	g_signal_connect (priv->query, "query_done",
+			  G_CALLBACK (query_query_done_cb), model);
+	g_signal_connect (priv->query, "eval_error",
+			  G_CALLBACK (query_eval_error_cb), model);
 }
 
 /* Callback used when a calendar is opened into the server */
@@ -2186,8 +2186,7 @@ calendar_model_set_cal_client (CalendarModel *model, CalClient *client, CalObjTy
 		if (cal_client_get_load_state (priv->client) == CAL_CLIENT_LOAD_LOADED)
 			update_query (model);
 		else
-			gtk_signal_connect (GTK_OBJECT (priv->client), "cal_opened",
-					    GTK_SIGNAL_FUNC (cal_opened_cb), model);
+			g_signal_connect (priv->client, "cal_opened", G_CALLBACK (cal_opened_cb), model);
 	}
 }
 
@@ -2296,7 +2295,7 @@ calendar_model_mark_task_complete (CalendarModel *model,
  **/
 CalComponent *
 calendar_model_get_component (CalendarModel *model,
-			       gint	      row)
+			      gint	      row)
 {
 	CalendarModelPrivate *priv;
 
diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c
index 31746ae55b..eaccb722c5 100644
--- a/calendar/gui/comp-editor-factory.c
+++ b/calendar/gui/comp-editor-factory.c
@@ -290,8 +290,7 @@ edit_existing (OpenClient *oc, const char *uid)
 	comp_editor_focus (editor);
 
 	oc->editor_count++;
-	gtk_signal_connect (GTK_OBJECT (editor), "destroy",
-			    GTK_SIGNAL_FUNC (editor_destroy_cb), oc);
+	g_signal_connect (editor, "destroy", G_CALLBACK (editor_destroy_cb), oc);
 
 	e_comp_editor_registry_add (comp_editor_registry, editor, TRUE);
 }
@@ -381,8 +380,7 @@ edit_new (OpenClient *oc, const GNOME_Evolution_Calendar_CompEditorFactory_CompE
 	comp_editor_focus (editor);
 
 	oc->editor_count++;
-	gtk_signal_connect (GTK_OBJECT (editor), "destroy",
-			    GTK_SIGNAL_FUNC (editor_destroy_cb), oc);
+	g_signal_connect (editor, "destroy", G_CALLBACK (editor_destroy_cb), oc);
 
 	e_comp_editor_registry_add (comp_editor_registry, editor, TRUE);
 }
@@ -499,8 +497,7 @@ open_client (CompEditorFactory *factory, const char *uristr)
 	oc->pending = NULL;
 	oc->open = FALSE;
 
-	gtk_signal_connect (GTK_OBJECT (oc->client), "cal_opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb), oc);
+	g_signal_connect (oc->client, "cal_opened", G_CALLBACK (cal_opened_cb), oc);
 
 	if (!cal_client_open_calendar (oc->client, uristr, FALSE)) {
 		g_free (oc->uri);
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c
index 71656bab2f..27fdbc7ee1 100644
--- a/calendar/gui/component-factory.c
+++ b/calendar/gui/component-factory.c
@@ -528,7 +528,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 
 static void
 owner_unset_cb (EvolutionShellComponent *shell_component,
-	      gpointer user_data)
+		gpointer user_data)
 {
 	shells = g_list_remove (shells, shell_component);
 	
@@ -740,10 +740,8 @@ create_object (void)
 	bonobo_object_add_interface (BONOBO_OBJECT (shell_component), 
 				     BONOBO_OBJECT (offline_handler));
 	
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
+	g_signal_connect (shell_component, "owner_set", G_CALLBACK (owner_set_cb), NULL);
+	g_signal_connect (shell_component, "owner_unset", G_CALLBACK (owner_unset_cb), NULL);
 
 	/* User creatable items */
 
@@ -767,8 +765,8 @@ create_object (void)
 			    _("Create a new all-day appointment"),
 			    FOLDER_CALENDAR, 'd', "new_all_day_event.png");
 
-	gtk_signal_connect (GTK_OBJECT (shell_component), "user_create_new_item",
-			    GTK_SIGNAL_FUNC (sc_user_create_new_item_cb), NULL);
+	g_signal_connect (shell_component, "user_create_new_item",
+			  G_CALLBACK (sc_user_create_new_item_cb), NULL);
 
 	return BONOBO_OBJECT (shell_component);
 }
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
index 3e723a5bb3..e5eeeefdac 100644
--- a/calendar/gui/control-factory.c
+++ b/calendar/gui/control-factory.c
@@ -264,8 +264,7 @@ control_factory_new_control (void)
 	calendar_persist_init (gcal, control);
 #endif
 					      
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    GTK_SIGNAL_FUNC (control_activate_cb), gcal);
+	g_signal_connect (control, "activate", G_CALLBACK (control_activate_cb), gcal);
 
 	return control;
 }
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 5456c50978..06a876ae1c 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -540,15 +540,9 @@ e_calendar_table_init (ECalendarTable *cal_table)
 
 
 	e_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (table));
-	gtk_signal_connect (GTK_OBJECT (e_table), "double_click",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_double_click),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (e_table), "right_click",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_right_click),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (e_table), "key_press",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_key_press),
-			    cal_table);
+	g_signal_connect (e_table, "double_click", G_CALLBACK (e_calendar_table_on_double_click), cal_table);
+	g_signal_connect (e_table, "right_click", G_CALLBACK (e_calendar_table_on_right_click), cal_table);
+	g_signal_connect (e_table, "key_press", G_CALLBACK (e_calendar_table_on_key_press), cal_table);
 
 	/* Set up the invisible widget for the clipboard selections */
 	cal_table->invisible = gtk_invisible_new ();
@@ -556,22 +550,15 @@ e_calendar_table_init (ECalendarTable *cal_table)
 				  clipboard_atom,
 				  GDK_SELECTION_TYPE_STRING,
 				  0);
-	gtk_signal_connect (GTK_OBJECT (cal_table->invisible),
-			    "selection_get",
-			    GTK_SIGNAL_FUNC (selection_get),
-			    (gpointer) cal_table);
-	gtk_signal_connect (GTK_OBJECT (cal_table->invisible),
-			    "selection_clear_event",
-			    GTK_SIGNAL_FUNC (selection_clear_event),
-			    (gpointer) cal_table);
-	gtk_signal_connect (GTK_OBJECT (cal_table->invisible),
-			    "selection_received",
-			    GTK_SIGNAL_FUNC (selection_received),
-			    (gpointer) cal_table);
-	gtk_signal_connect (GTK_OBJECT (cal_table->invisible),
-			    "destroy",
-			    GTK_SIGNAL_FUNC (invisible_destroyed),
-			    (gpointer) cal_table);
+	g_signal_connect (cal_table->invisible, "selection_get",
+			  G_CALLBACK (selection_get), cal_table);
+	g_signal_connect (cal_table->invisible, "selection_clear_event",
+			  G_CALLBACK (selection_clear_event), cal_table);
+	g_signal_connect (cal_table->invisible, "selection_received",
+			  G_CALLBACK (selection_received), cal_table);
+	g_signal_connect (cal_table->invisible, "destroy",
+			  G_CALLBACK (invisible_destroyed), cal_table);
+
 	cal_table->clipboard_selection = NULL;
 }
 
diff --git a/calendar/gui/e-comp-editor-registry.c b/calendar/gui/e-comp-editor-registry.c
index f619a1d0d1..e03c977735 100644
--- a/calendar/gui/e-comp-editor-registry.c
+++ b/calendar/gui/e-comp-editor-registry.c
@@ -137,7 +137,7 @@ e_comp_editor_registry_add (ECompEditorRegistry *reg, CompEditor *editor, gboole
 	rdata->uid = g_strdup (uid);
 	g_hash_table_insert (priv->editors, rdata->uid, rdata);
 
-	gtk_signal_connect (GTK_OBJECT (editor), "destroy", editor_destroy_cb, reg);
+	g_signal_connect (editor, "destroy", G_CALLBACK (editor_destroy_cb), reg);
 
 }
 
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 5fbe36a834..8d2f943f7e 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -529,9 +529,8 @@ e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
 		gtk_object_set_data (GTK_OBJECT (item), "divisions",
 				     GINT_TO_POINTER (divisions[i]));
 
-		gtk_signal_connect (GTK_OBJECT (item), "toggled",
-				    e_day_view_time_item_on_set_divisions,
-				    dvtmitem);
+		g_signal_connect (item, "toggled",
+				  G_CALLBACK (e_day_view_time_item_on_set_divisions), dvtmitem);
 	}
 
 	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 3bbd1590c3..c0c7e730c7 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -646,39 +646,25 @@ e_day_view_init (EDayView *day_view)
 	gtk_table_attach (GTK_TABLE (day_view), day_view->top_canvas,
 			  1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 	gtk_widget_show (day_view->top_canvas);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas), "button_press_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_button_press),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas), "button_release_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_button_release),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas), "motion_notify_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas),
-				  "drag_motion",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas),
-				  "drag_leave",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_leave),
-				  day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_begin",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_begin),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_end",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_end),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_data_get",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_data_get),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_data_received",
-			    GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_data_received),
-			    day_view);
+	g_signal_connect_after (day_view->top_canvas, "button_press_event",
+				G_CALLBACK (e_day_view_on_top_canvas_button_press), day_view);
+	g_signal_connect_after (day_view->top_canvas, "button_release_event",
+				G_CALLBACK (e_day_view_on_top_canvas_button_release), day_view);
+	g_signal_connect_after (day_view->top_canvas, "motion_notify_event",
+				G_CALLBACK (e_day_view_on_top_canvas_motion), day_view);
+	g_signal_connect_after (day_view->top_canvas, "drag_motion",
+				G_CALLBACK (e_day_view_on_top_canvas_drag_motion), day_view);
+	g_signal_connect_after (day_view->top_canvas, "drag_leave",
+				G_CALLBACK (e_day_view_on_top_canvas_drag_leave), day_view);
+
+	g_signal_connect (day_view->top_canvas, "drag_begin",
+			  G_CALLBACK (e_day_view_on_drag_begin), day_view);
+	g_signal_connect (day_view->top_canvas, "drag_end",
+			  G_CALLBACK (e_day_view_on_drag_end), day_view);
+	g_signal_connect (day_view->top_canvas, "drag_data_get",
+			  G_CALLBACK (e_day_view_on_drag_data_get), day_view);
+	g_signal_connect (day_view->top_canvas, "drag_data_received",
+			  G_CALLBACK (e_day_view_on_top_canvas_drag_data_received), day_view);
 
 	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->top_canvas)->root);
 
@@ -722,45 +708,38 @@ e_day_view_init (EDayView *day_view)
 			  1, 2, 1, 2,
 			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 	gtk_widget_show (day_view->main_canvas);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas), "realize",
-			    GTK_SIGNAL_FUNC (e_day_view_on_canvas_realized),
-			    day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
+	g_signal_connect (day_view->main_canvas, "realize",
+			  G_CALLBACK (e_day_view_on_canvas_realized), day_view);
+
+	g_signal_connect_after (day_view->main_canvas,
 				  "button_press_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_button_press),
+				  G_CALLBACK (e_day_view_on_main_canvas_button_press),
 				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
+	g_signal_connect_after (day_view->main_canvas,
 				  "button_release_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_button_release),
+				  G_CALLBACK (e_day_view_on_main_canvas_button_release),
 				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
+	g_signal_connect_after (day_view->main_canvas,
 				  "motion_notify_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_motion),
+				  G_CALLBACK (e_day_view_on_main_canvas_motion),
 				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
+	g_signal_connect_after (day_view->main_canvas,
 				  "drag_motion",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_motion),
+				  G_CALLBACK (e_day_view_on_main_canvas_drag_motion),
 				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
+	g_signal_connect_after (day_view->main_canvas,
 				  "drag_leave",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_leave),
+				  G_CALLBACK (e_day_view_on_main_canvas_drag_leave),
 				  day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_begin",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_begin),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_end",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_end),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_data_get",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_data_get),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_data_received",
-			    GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_data_received),
-			    day_view);
+
+	g_signal_connect (day_view->main_canvas, "drag_begin",
+			  G_CALLBACK (e_day_view_on_drag_begin), day_view);
+	g_signal_connect (day_view->main_canvas, "drag_end",
+			  G_CALLBACK (e_day_view_on_drag_end), day_view);
+	g_signal_connect (day_view->main_canvas, "drag_data_get",
+			  G_CALLBACK (e_day_view_on_drag_data_get), day_view);
+	g_signal_connect (day_view->main_canvas, "drag_data_received",
+			  G_CALLBACK (e_day_view_on_main_canvas_drag_data_received), day_view);
 
 	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->main_canvas)->root);
 
@@ -834,10 +813,8 @@ e_day_view_init (EDayView *day_view)
 			  0, 1, 1, 2,
 			  GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 	gtk_widget_show (day_view->time_canvas);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->time_canvas),
-				  "button_press_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_time_canvas_button_press),
-				  day_view);
+	g_signal_connect_after (day_view->time_canvas, "button_press_event",
+				G_CALLBACK (e_day_view_on_time_canvas_button_press), day_view);
 
 	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->time_canvas)->root);
 
@@ -881,22 +858,15 @@ e_day_view_init (EDayView *day_view)
 				  clipboard_atom,
 				  GDK_SELECTION_TYPE_STRING,
 				  0);
-	gtk_signal_connect (GTK_OBJECT (day_view->invisible),
-			    "selection_get",
-			    GTK_SIGNAL_FUNC (selection_get),
-			    (gpointer) day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->invisible),
-			    "selection_clear_event",
-			    GTK_SIGNAL_FUNC (selection_clear_event),
-			    (gpointer) day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->invisible),
-			    "selection_received",
-			    GTK_SIGNAL_FUNC (selection_received),
-			    (gpointer) day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->invisible),
-			    "destroy",
-			    GTK_SIGNAL_FUNC (invisible_destroyed),
-			    (gpointer) day_view);
+	g_signal_connect (day_view->invisible, "selection_get",
+			  G_CALLBACK (selection_get), (gpointer) day_view);
+	g_signal_connect (day_view->invisible, "selection_clear_event",
+			  G_CALLBACK (selection_clear_event), (gpointer) day_view);
+	g_signal_connect (day_view->invisible, "selection_received",
+			  G_CALLBACK (selection_received), (gpointer) day_view);
+	g_signal_connect (day_view->invisible, "destroy",
+			  G_CALLBACK (invisible_destroyed), (gpointer) day_view);
+
 	day_view->clipboard_selection = NULL;
 
 	day_view->activity = NULL;
@@ -1720,14 +1690,14 @@ update_query (EDayView *day_view)
 		return;
 	}
 
-	gtk_signal_connect (GTK_OBJECT (day_view->query), "obj_updated",
-			    GTK_SIGNAL_FUNC (query_obj_updated_cb), day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->query), "obj_removed",
-			    GTK_SIGNAL_FUNC (query_obj_removed_cb), day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->query), "query_done",
-			    GTK_SIGNAL_FUNC (query_query_done_cb), day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->query), "eval_error",
-			    GTK_SIGNAL_FUNC (query_eval_error_cb), day_view);
+	g_signal_connect (day_view->query, "obj_updated",
+			  G_CALLBACK (query_obj_updated_cb), day_view);
+	g_signal_connect (day_view->query, "obj_removed",
+			  G_CALLBACK (query_obj_removed_cb), day_view);
+	g_signal_connect (day_view->query, "query_done",
+			  G_CALLBACK (query_query_done_cb), day_view);
+	g_signal_connect (day_view->query, "eval_error",
+			  G_CALLBACK (query_eval_error_cb), day_view);
 }
 
 /* Callback used when the calendar client finishes opening */
@@ -1778,8 +1748,8 @@ e_day_view_set_cal_client	(EDayView	*day_view,
 		if (cal_client_get_load_state (day_view->client) == CAL_CLIENT_LOAD_LOADED)
 			update_query (day_view);
 		else
-			gtk_signal_connect (GTK_OBJECT (day_view->client), "cal_opened",
-					    GTK_SIGNAL_FUNC (cal_opened_cb), day_view);
+			g_signal_connect (day_view->client, "cal_opened",
+					  G_CALLBACK (cal_opened_cb), day_view);
 	}
 }
 
@@ -3311,8 +3281,8 @@ e_day_view_on_long_event_button_press (EDayView		*day_view,
 
 		e = &g_array_index (day_view->long_events, EDayViewEvent, event_num);
 		destroyed = FALSE;
-		id = gtk_signal_connect (GTK_OBJECT (e->comp), "destroy",
-					 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
+		id = g_signal_connect (e->comp, "destroy",
+				       G_CALLBACK (comp_destroy_cb), &destroyed);
 
 		if (!GTK_WIDGET_HAS_FOCUS (day_view))
 			gtk_widget_grab_focus (GTK_WIDGET (day_view));
@@ -3363,8 +3333,8 @@ e_day_view_on_event_button_press (EDayView	  *day_view,
 		e = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
 
 		destroyed = FALSE;
-		id = gtk_signal_connect (GTK_OBJECT (e->comp), "destroy",
-					 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
+		id = g_signal_connect (e->comp, "destroy",
+				       G_CALLBACK (comp_destroy_cb), &destroyed);
 
 		if (!GTK_WIDGET_HAS_FOCUS (day_view))
 			gtk_widget_grab_focus (GTK_WIDGET (day_view));
@@ -3417,8 +3387,8 @@ e_day_view_on_long_event_click (EDayView *day_view,
 			return;
 
 		destroyed = FALSE;
-		id = gtk_signal_connect (GTK_OBJECT (event->comp), "destroy",
-					 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
+		id = g_signal_connect (event->comp, "destroy",
+				       G_CALLBACK (comp_destroy_cb), &destroyed);
 
 		/* Grab the keyboard focus, so the event being edited is saved
 		   and we can use the Escape key to abort the resize. */
@@ -3497,8 +3467,8 @@ e_day_view_on_event_click (EDayView *day_view,
 		guint id;
 
 		destroyed = FALSE;
-		id = gtk_signal_connect (GTK_OBJECT (event->comp), "destroy",
-					 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
+		id = g_signal_connect (event->comp, "destroy",
+				       G_CALLBACK (comp_destroy_cb), &destroyed);
 
 		/* Grab the keyboard focus, so the event being edited is saved
 		   and we can use the Escape key to abort the resize. */
@@ -3654,8 +3624,8 @@ e_day_view_on_event_double_click (EDayView *day_view,
 					event_num);
 
 	destroyed = FALSE;
-	id = gtk_signal_connect (GTK_OBJECT (event->comp), "destroy",
-				 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
+	id = g_signal_connect (event->comp, "destroy",
+			       G_CALLBACK (comp_destroy_cb), &destroyed);
 
 	e_day_view_stop_editing_event (day_view);
 
@@ -3850,8 +3820,7 @@ e_day_view_on_event_right_click (EDayView *day_view,
 	day_view->popup_event_num = event_num;
 	
 	popup = e_popup_menu_create (context_menu, disable_mask, hide_mask, day_view);
-	gtk_signal_connect (GTK_OBJECT (popup), "selection-done",
-			    GTK_SIGNAL_FUNC (free_view_popup), day_view);
+	g_signal_connect (popup, "selection-done", G_CALLBACK (free_view_popup), day_view);
 	e_popup_menu (popup, (GdkEvent *) bevent);
 }
 
@@ -4186,8 +4155,7 @@ e_day_view_on_delete_appointment (GtkWidget *widget, gpointer data)
 		return;
 
 	destroyed = FALSE;
-	id = gtk_signal_connect (GTK_OBJECT (event->comp), "destroy",
-				 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
+	id = g_signal_connect (event->comp, "destroy", G_CALLBACK (comp_destroy_cb), &destroyed);
 
 	if (day_view->editing_event_day >= 0)
 		e_day_view_stop_editing_event (day_view);
@@ -5283,9 +5251,8 @@ e_day_view_reshape_long_event (EDayView *day_view,
 					       "draw_background", FALSE,
 					       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
 					       NULL);
-		gtk_signal_connect (GTK_OBJECT (event->canvas_item), "event",
-				    GTK_SIGNAL_FUNC (e_day_view_on_text_item_event),
-				    day_view);
+		g_signal_connect (event->canvas_item, "event",
+				  G_CALLBACK (e_day_view_on_text_item_event), day_view);
 		e_day_view_update_long_event_label (day_view, event_num);
 	}
 
@@ -5444,12 +5411,9 @@ e_day_view_reshape_day_event (EDayView *day_view,
 						       "draw_background", FALSE,
 						       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
 						       NULL);
-			gtk_signal_connect (GTK_OBJECT (event->canvas_item),
-					    "event",
-					    GTK_SIGNAL_FUNC (e_day_view_on_text_item_event),
-					    day_view);
-			e_day_view_update_event_label (day_view, day,
-						       event_num);
+			g_signal_connect (event->canvas_item, "event",
+					  G_CALLBACK (e_day_view_on_text_item_event), day_view);
+			e_day_view_update_event_label (day_view, day, event_num);
 		}
 
 		item_w = MAX (item_w, 0);
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 43a3b01e4f..455d9212f6 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -168,8 +168,7 @@ start_calendar_server (char *uri)
 
 	client = cal_client_new ();
 
-	gtk_signal_connect (GTK_OBJECT (client), "cal_opened",
-			    start_calendar_server_cb, &success);
+	g_signal_connect (client, "cal_opened", G_CALLBACK (start_calendar_server_cb), &success);
 
 	cal_client_open_calendar (client, uri, TRUE);
 	
@@ -193,8 +192,7 @@ start_default_server (gboolean tasks)
 
 	client = cal_client_new ();
 
-	gtk_signal_connect (GTK_OBJECT (client), "cal_opened",
-			    start_calendar_server_cb, &success);
+	g_signal_connect (client, "cal_opened", start_calendar_server_cb, &success);
 
 	if (tasks) {
 		if (!cal_client_open_default_tasks (client, FALSE))
@@ -341,14 +339,9 @@ init (EItipControl *itip)
 	gtk_widget_set_usize (scrolled_window, 600, 400);
 	gtk_box_pack_start (GTK_BOX (itip), scrolled_window, FALSE, FALSE, 4);
 
-	gtk_signal_connect (GTK_OBJECT (priv->html), "url_requested",
-			    url_requested_cb, itip);
-	gtk_signal_connect (GTK_OBJECT (priv->html), "object_requested",
-			    GTK_SIGNAL_FUNC (object_requested_cb),
-			    itip);
-	gtk_signal_connect (GTK_OBJECT (priv->html), "submit",
-			    ok_clicked_cb, itip);
-
+	g_signal_connect (priv->html, "url_requested", G_CALLBACK (url_requested_cb), itip);
+	g_signal_connect (priv->html, "object_requested", G_CALLBACK (object_requested_cb), itip);
+	g_signal_connect (priv->html, "submit", G_CALLBACK (ok_clicked_cb), itip);
 }
 
 static void
@@ -1973,8 +1966,7 @@ object_requested_cb (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
 		button = NULL;
 	}
 
-	gtk_signal_connect (GTK_OBJECT (button), "selected", 
-			    button_selected_cb, itip);
+	g_signal_connect (button, "selected", G_CALLBACK (button_selected_cb), itip);
 	
 	gtk_container_add (GTK_CONTAINER (eb), button);
 	gtk_widget_show (button);
diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c
index 53b0926427..649a17049a 100644
--- a/calendar/gui/e-meeting-model.c
+++ b/calendar/gui/e-meeting-model.c
@@ -884,12 +884,10 @@ build_etable (ETableModel *model, const gchar *spec_file, const gchar *state_fil
 	e_table_load_state (real_table, state_file);
 
 #if 0
-	gtk_signal_connect (GTK_OBJECT (real_table),
-			    "right_click", GTK_SIGNAL_FUNC (right_click_cb), mpage);
+	g_signal_connect (real_table, "right_click", G_CALLBACK (right_click_cb), mpage);
 #endif
 
-	gtk_signal_connect (GTK_OBJECT (etable), "destroy", 
-			    GTK_SIGNAL_FUNC (table_destroy_state_cb), g_strdup (state_file));
+	g_signal_connect (etable, "destroy", G_CALLBACK (table_destroy_state_cb), g_strdup (state_file));
 
 	gtk_object_unref (GTK_OBJECT (extras));
 	
@@ -908,8 +906,7 @@ e_meeting_model_add_attendee (EMeetingModel *im, EMeetingAttendee *ia)
 	gtk_object_ref (GTK_OBJECT (ia));
 	g_ptr_array_add (priv->attendees, ia);
 	
-	gtk_signal_connect (GTK_OBJECT (ia), "changed",
-			    GTK_SIGNAL_FUNC (attendee_changed_cb), im);
+	g_signal_connect (ia, "changed", G_CALLBACK (attendee_changed_cb), im);
 
 	e_table_model_row_inserted (E_TABLE_MODEL (im), row_count (E_TABLE_MODEL (im)) - 1);
 }
@@ -1610,8 +1607,7 @@ e_meeting_model_etable_from_model (EMeetingModel *im, const gchar *spec_file, co
 
 	priv->tables = g_list_prepend (priv->tables, ets);
 
-	gtk_signal_connect (GTK_OBJECT (ets), "destroy", 
-			    GTK_SIGNAL_FUNC (table_destroy_list_cb), im);
+	g_signal_connect (ets, "destroy", G_CALLBACK (table_destroy_list_cb), im);
 	
 	return ets;
 }
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index a420b5a08e..1242da6b71 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -226,16 +226,16 @@ e_meeting_time_selector_get_type (void)
 
 	if (!e_meeting_time_selector_type) {
 		GtkTypeInfo e_meeting_time_selector_info =
-		{
-			"EMeetingTimeSelector",
-			sizeof (EMeetingTimeSelector),
-			sizeof (EMeetingTimeSelectorClass),
-			(GtkClassInitFunc) e_meeting_time_selector_class_init,
-			(GtkObjectInitFunc) e_meeting_time_selector_init,
+			{
+				"EMeetingTimeSelector",
+				sizeof (EMeetingTimeSelector),
+				sizeof (EMeetingTimeSelectorClass),
+				(GtkClassInitFunc) e_meeting_time_selector_class_init,
+				(GtkObjectInitFunc) e_meeting_time_selector_init,
 				/* reserved_1 */ NULL,
 				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
+				(GtkClassInitFunc) NULL,
+			};
 
 		e_meeting_time_selector_type = gtk_type_unique (GTK_TYPE_TABLE,
 								&e_meeting_time_selector_info);
@@ -351,22 +351,18 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 	if (mts->model)
 		gtk_object_ref (GTK_OBJECT (mts->model));
 
-	gtk_signal_connect (GTK_OBJECT (mts->model), "model_rows_inserted",
-			    GTK_SIGNAL_FUNC (rows_inserted_cb), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->model), "model_cell_changed",
-			    GTK_SIGNAL_FUNC (cell_changed_cb), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->model), "model_rows_deleted",
-			    GTK_SIGNAL_FUNC (rows_deleted_cb), mts);
+	g_signal_connect (mts->model, "model_rows_inserted", G_CALLBACK (rows_inserted_cb), mts);
+	g_signal_connect (mts->model, "model_cell_changed", G_CALLBACK (cell_changed_cb), mts);
+	g_signal_connect (mts->model, "model_rows_deleted", G_CALLBACK (rows_deleted_cb), mts);
 
 	mts->etable = GTK_WIDGET (e_meeting_model_etable_from_model (mts->model,
-								EVOLUTION_ETSPECDIR "/e-meeting-time-sel.etspec",
-								filename));
+								     EVOLUTION_ETSPECDIR "/e-meeting-time-sel.etspec",
+								     filename));
 	e_scroll_frame_set_policy (E_SCROLL_FRAME (mts->etable), GTK_POLICY_NEVER, GTK_POLICY_NEVER);
 	e_scroll_frame_set_scrollbar_spacing (E_SCROLL_FRAME (mts->etable), 0);
 
 	real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts->etable));
-	gtk_signal_connect (GTK_OBJECT (real_table->sort_info), "sort_info_changed",
-			    GTK_SIGNAL_FUNC (sort_info_changed_cb), mts);
+	g_signal_connect (real_table->sort_info, "sort_info_changed", G_CALLBACK (sort_info_changed_cb), mts);
 
 	gtk_box_pack_start (GTK_BOX (mts->attendees_vbox), mts->etable, TRUE, TRUE, 2);
 	gtk_widget_show (mts->etable);
@@ -383,8 +379,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 	gtk_table_attach (GTK_TABLE (mts), mts->display_top,
 			  1, 4, 0, 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 	gtk_widget_show (mts->display_top);
-	gtk_signal_connect (GTK_OBJECT (mts->display_top), "realize",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_realized), mts);
+	g_signal_connect (mts->display_top, "realize",
+			  G_CALLBACK (e_meeting_time_selector_on_canvas_realized), mts);
 
 	mts->display_main = gnome_canvas_new ();
 	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
@@ -393,10 +389,10 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 			  1, 4, 1, 2,
 			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 	gtk_widget_show (mts->display_main);
-	gtk_signal_connect (GTK_OBJECT (mts->display_main), "realize",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_realized), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->display_main), "size_allocate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_size_allocate), mts);
+	g_signal_connect (mts->display_main, "realize",
+			  G_CALLBACK (e_meeting_time_selector_on_canvas_realized), mts);
+	g_signal_connect (mts->display_main, "size_allocate",
+			  G_CALLBACK (e_meeting_time_selector_on_canvas_size_allocate), mts);
 
 	mts->hscrollbar = gtk_hscrollbar_new (GTK_LAYOUT (mts->display_main)->hadjustment);
 	GTK_LAYOUT (mts->display_main)->hadjustment->step_increment = mts->col_width;
@@ -452,17 +448,17 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 	gtk_widget_show (button);
 	gtk_widget_add_accelerator (button, "clicked", mts->accel_group,
 				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_invite_others_button_clicked), mts);
-	gtk_signal_connect (GTK_OBJECT (button), "draw",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_invite_others_button_draw), mts);
+	g_signal_connect (button, "clicked",
+			  G_CALLBACK (e_meeting_time_selector_on_invite_others_button_clicked), mts);
+	g_signal_connect (button, "draw",
+			  G_CALLBACK (e_meeting_time_selector_on_invite_others_button_draw), mts);
 
 	mts->options_button = gtk_button_new ();
 	gtk_box_pack_start (GTK_BOX (hbox), mts->options_button, TRUE, TRUE, 0);
 	gtk_widget_show (mts->options_button);
 
-	gtk_signal_connect (GTK_OBJECT (mts->options_button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_options_button_clicked), mts);
+	g_signal_connect (mts->options_button, "clicked",
+			  G_CALLBACK (e_meeting_time_selector_on_options_button_clicked), mts);
 
 	child_hbox = gtk_hbox_new (FALSE, 2);
 	gtk_container_add (GTK_CONTAINER (mts->options_button), child_hbox);
@@ -496,8 +492,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 				    accel_key, 0, 0);
 	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
 				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_working_hours_toggled), mts);
+	g_signal_connect (menuitem, "toggled",
+			  G_CALLBACK (e_meeting_time_selector_on_working_hours_toggled), mts);
 	gtk_widget_show (menuitem);
 
 	menuitem = gtk_check_menu_item_new_with_label ("");
@@ -509,8 +505,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 				    accel_key, 0, 0);
 	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
 				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_zoomed_out_toggled), mts);
+	g_signal_connect (menuitem, "toggled",
+			  G_CALLBACK (e_meeting_time_selector_on_zoomed_out_toggled), mts);
 	gtk_widget_show (menuitem);
 
 	menuitem = gtk_menu_item_new ();
@@ -525,8 +521,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 				    accel_key, 0, 0);
 	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
 				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_update_free_busy), mts);
+	g_signal_connect (menuitem, "activate",
+			  G_CALLBACK (e_meeting_time_selector_on_update_free_busy), mts);
 	gtk_widget_show (menuitem);
 
 	/* Create the 3 AutoPick buttons on the left. */
@@ -542,8 +538,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
 	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
 	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_prev_button_clicked), mts);
+	g_signal_connect (button, "clicked",
+			  G_CALLBACK (e_meeting_time_selector_on_prev_button_clicked), mts);
 
 	mts->autopick_button = gtk_button_new ();
 	gtk_box_pack_start (GTK_BOX (hbox), mts->autopick_button, TRUE, TRUE, 0);
@@ -559,8 +555,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 	gtk_widget_show (label);
 	gtk_widget_add_accelerator (mts->autopick_button, "clicked", mts->accel_group,
 				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (mts->autopick_button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_button_clicked), mts);
+	g_signal_connect (mts->autopick_button, "clicked",
+			  G_CALLBACK (e_meeting_time_selector_on_autopick_button_clicked), mts);
 
 	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
 	gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 2);
@@ -573,8 +569,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
 	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
 	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_next_button_clicked), mts);
+	g_signal_connect (button, "clicked",
+			  G_CALLBACK (e_meeting_time_selector_on_next_button_clicked), mts);
 
 	/* Create the Autopick menu. */
 	mts->autopick_menu = gtk_menu_new ();
@@ -593,8 +589,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 				    accel_key, 0, 0);
 	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
 				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);
+	g_signal_connect (menuitem, "toggled",
+			  G_CALLBACK (e_meeting_time_selector_on_autopick_option_toggled), mts);
 	gtk_widget_show (menuitem);
 
 	menuitem = gtk_radio_menu_item_new_with_label (group, "");
@@ -606,8 +602,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 				    accel_key, 0, 0);
 	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
 				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);
+	g_signal_connect (menuitem, "toggled",
+			  G_CALLBACK (e_meeting_time_selector_on_autopick_option_toggled), mts);
 	gtk_widget_show (menuitem);
 
 	menuitem = gtk_radio_menu_item_new_with_label (group, "");
@@ -619,8 +615,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 				    accel_key, 0, 0);
 	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
 				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);
+	g_signal_connect (menuitem, "activate",
+			  G_CALLBACK (e_meeting_time_selector_on_autopick_option_toggled), mts);
 	gtk_widget_show (menuitem);
 
 	menuitem = gtk_radio_menu_item_new_with_label (group, "");
@@ -632,8 +628,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 				    accel_key, 0, 0);
 	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
 				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);
+	g_signal_connect (menuitem, "activate",
+			  G_CALLBACK (e_meeting_time_selector_on_autopick_option_toggled), mts);
 	gtk_widget_show (menuitem);
 
 	/* Create the date entry fields on the right. */
@@ -663,8 +659,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 	gtk_table_attach (GTK_TABLE (table), mts->start_date_edit,
 			  1, 2, 0, 1, GTK_FILL, 0, 0, 0);
 	gtk_widget_show (mts->start_date_edit);
-	gtk_signal_connect (GTK_OBJECT (mts->start_date_edit), "changed",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_start_time_changed), mts);
+	g_signal_connect (mts->start_date_edit, "changed",
+			  G_CALLBACK (e_meeting_time_selector_on_start_time_changed), mts);
 
 	label = gtk_label_new ("");
 	accel_key = gtk_label_parse_uline (GTK_LABEL (label),
@@ -682,8 +678,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 	gtk_table_attach (GTK_TABLE (table), mts->end_date_edit,
 			  1, 2, 1, 2, GTK_FILL, 0, 0, 0);
 	gtk_widget_show (mts->end_date_edit);
-	gtk_signal_connect (GTK_OBJECT (mts->end_date_edit), "changed",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_end_time_changed), mts);
+	g_signal_connect (mts->end_date_edit, "changed",
+			  G_CALLBACK (e_meeting_time_selector_on_end_time_changed), mts);
 
 	gtk_table_set_col_spacing (GTK_TABLE (mts), 0, 4);
 	gtk_table_set_row_spacing (GTK_TABLE (mts), 4, 12);
@@ -709,12 +705,17 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
 						    8, 8);
 
 	/* Connect handlers to the adjustments  scroll the other items. */
-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts->display_main)->hadjustment), "value_changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_hadjustment_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts->display_main)->vadjustment), "value_changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_vadjustment_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts->display_main)->vadjustment), "changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_vadjustment_changed), mts);
-
-	gtk_signal_connect (GTK_OBJECT (e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (mts->etable))), "value_changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_table_vadjustment_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (mts->etable))), "changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_table_vadjustment_changed), mts);
+	g_signal_connect (GTK_LAYOUT (mts->display_main)->hadjustment, "value_changed",
+			  G_CALLBACK (e_meeting_time_selector_hadjustment_changed), mts);
+	g_signal_connect (GTK_LAYOUT (mts->display_main)->vadjustment, "value_changed",
+			  G_CALLBACK (e_meeting_time_selector_vadjustment_changed), mts);
+	g_signal_connect (GTK_LAYOUT (mts->display_main)->vadjustment, "changed",
+			  G_CALLBACK (e_meeting_time_selector_vadjustment_changed), mts);
+
+	g_signal_connect (e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (mts->etable)), "value_changed",
+			  G_CALLBACK (e_meeting_time_selector_table_vadjustment_changed), mts);
+	g_signal_connect (e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (mts->etable)), "changed",
+			  G_CALLBACK (e_meeting_time_selector_table_vadjustment_changed), mts);
 
 	e_meeting_time_selector_recalc_grid (mts);
 	e_meeting_time_selector_ensure_meeting_time_shown (mts);
@@ -750,9 +751,9 @@ e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts,
 	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);
 	gtk_widget_show (label);
 
-	gtk_signal_connect (GTK_OBJECT (darea), "expose_event",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_expose_key_color),
-			    color);
+	g_signal_connect (darea, "expose_event",
+			  G_CALLBACK (e_meeting_time_selector_expose_key_color),
+			  color);
 }
 
 static gint
@@ -810,15 +811,15 @@ static void
 e_meeting_time_selector_options_menu_detacher (GtkWidget *widget,
 					       GtkMenu   *menu)
 {
-  EMeetingTimeSelector *mts;
+	EMeetingTimeSelector *mts;
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (widget));
+	g_return_if_fail (widget != NULL);
+	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (widget));
 
-  mts = E_MEETING_TIME_SELECTOR (widget);
-  g_return_if_fail (mts->options_menu == (GtkWidget*) menu);
+	mts = E_MEETING_TIME_SELECTOR (widget);
+	g_return_if_fail (mts->options_menu == (GtkWidget*) menu);
 
-  mts->options_menu = NULL;
+	mts->options_menu = NULL;
 }
 
 
@@ -826,15 +827,15 @@ static void
 e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget,
 						GtkMenu   *menu)
 {
-  EMeetingTimeSelector *mts;
+	EMeetingTimeSelector *mts;
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (widget));
+	g_return_if_fail (widget != NULL);
+	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (widget));
 
-  mts = E_MEETING_TIME_SELECTOR (widget);
-  g_return_if_fail (mts->autopick_menu == (GtkWidget*) menu);
+	mts = E_MEETING_TIME_SELECTOR (widget);
+	g_return_if_fail (mts->autopick_menu == (GtkWidget*) menu);
 
-  mts->autopick_menu = NULL;
+	mts->autopick_menu = NULL;
 }
 
 
@@ -1613,7 +1614,7 @@ e_meeting_time_selector_autopick (EMeetingTimeSelector *mts,
 			} else {
 				start_time = *resource_free;
 				e_meeting_time_selector_adjust_time (&start_time, -duration_days, -duration_hours, -duration_minutes);
-				}
+			}
 			meeting_time_ok = FALSE;
 		}
 
@@ -1987,7 +1988,7 @@ e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,
 	gint scroll_x, scroll_y, new_scroll_x;
 
 	new_scroll_x = e_meeting_time_selector_calculate_time_position (mts,
-								      mtstime);
+									mtstime);
 	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
 					 &scroll_x, &scroll_y);
 	gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_main),
@@ -2402,15 +2403,15 @@ e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,
 	    && e_meeting_time_compare_times (&mts->meeting_end_time, &drag_time) == 0)
 		return;
 	else if (mts->all_day
-		&& mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
-		&& e_meeting_time_compare_times (&mts->meeting_start_time, &drag_time) == 0)
+		 && mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
+		 && e_meeting_time_compare_times (&mts->meeting_start_time, &drag_time) == 0)
 		return;
 	
 	*time_to_set = drag_time;
 
 	/* Check if the start time and end time need to be switched. */
 	if (e_meeting_time_compare_times (&mts->meeting_start_time,
-						   &mts->meeting_end_time) > 0) {
+					  &mts->meeting_end_time) > 0) {
 		drag_time = mts->meeting_start_time;
 		mts->meeting_start_time = mts->meeting_end_time;
 		mts->meeting_end_time = drag_time;
@@ -2497,8 +2498,8 @@ e_meeting_time_selector_timeout_handler (gpointer data)
 	   we will now set the dragged time to. */
 	if (scroll_offset > 0) {
 		e_meeting_time_selector_calculate_time (mts,
-						      scroll_x + canvas_width - 1,
-						      &drag_time);
+							scroll_x + canvas_width - 1,
+							&drag_time);
 		if (!mts->all_day) {
 			if (mts->zoomed_out) {
 				drag_time.minute = 0;
@@ -2548,8 +2549,8 @@ e_meeting_time_selector_timeout_handler (gpointer data)
 	    && e_meeting_time_compare_times (&mts->meeting_end_time, &drag_time) == 0)
 		goto scroll;
 	else if (mts->all_day
-		&& mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
-		&& e_meeting_time_compare_times (&mts->meeting_start_time, &drag_time) == 0)
+		 && mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
+		 && e_meeting_time_compare_times (&mts->meeting_start_time, &drag_time) == 0)
 		goto scroll;
 
 	*time_to_set = drag_time;
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 5ebcd3d580..94bd638a80 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -85,7 +85,7 @@ E_MAKE_TYPE (e_tasks, "ETasks", ETasks,
 
 
 /* Class initialization function for the gnome calendar */
-static void
+	static void
 e_tasks_class_init (ETasksClass *class)
 {
 	GtkObjectClass *object_class;
@@ -189,10 +189,10 @@ setup_widgets (ETasks *tasks)
 	priv = tasks->priv;
 
 	priv->search_bar = cal_search_bar_new ();
-	gtk_signal_connect (GTK_OBJECT (priv->search_bar), "sexp_changed",
-			    GTK_SIGNAL_FUNC (search_bar_sexp_changed_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->search_bar), "category_changed",
-			    GTK_SIGNAL_FUNC (search_bar_category_changed_cb), tasks);
+	g_signal_connect (priv->search_bar, "sexp_changed",
+			  G_CALLBACK (search_bar_sexp_changed_cb), tasks);
+	g_signal_connect (priv->search_bar, "category_changed",
+			  G_CALLBACK (search_bar_category_changed_cb), tasks);
 
 	gtk_table_attach (GTK_TABLE (tasks), priv->search_bar, 0, 1, 0, 1,
 			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0, 0, 0);
@@ -211,8 +211,7 @@ setup_widgets (ETasks *tasks)
 
 	calendar_config_configure_e_calendar_table (E_CALENDAR_TABLE (priv->tasks_view));
 
-	gtk_signal_connect (GTK_OBJECT (etable), "selection_change",
-			    GTK_SIGNAL_FUNC (table_selection_change_cb), tasks);
+	g_signal_connect (etable, "selection_change", G_CALLBACK (table_selection_change_cb), tasks);
 }
 
 /* Callback used when the set of categories changes in the calendar client */
@@ -245,12 +244,12 @@ e_tasks_construct (ETasks *tasks)
 	if (!priv->client)
 		return NULL;
 
-	gtk_signal_connect (GTK_OBJECT (priv->client), "cal_opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "backend_error",
-			    GTK_SIGNAL_FUNC (backend_error_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "categories_changed",
-			    GTK_SIGNAL_FUNC (client_categories_changed_cb), tasks);
+	g_signal_connect (priv->client, "cal_opened",
+			  G_CALLBACK (cal_opened_cb), tasks);
+	g_signal_connect (priv->client, "backend_error",
+			  G_CALLBACK (backend_error_cb), tasks);
+	g_signal_connect (priv->client, "categories_changed",
+			  G_CALLBACK (client_categories_changed_cb), tasks);
 
 	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
 	g_assert (model != NULL);
@@ -661,12 +660,9 @@ e_tasks_delete_completed (ETasks *tasks)
 		return;
 	}
 
-	gtk_signal_connect (GTK_OBJECT (priv->query), "obj_updated",
-			    GTK_SIGNAL_FUNC (query_obj_updated_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->query), "query_done",
-			    GTK_SIGNAL_FUNC (query_query_done_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->query), "eval_error",
-			    GTK_SIGNAL_FUNC (query_eval_error_cb), tasks);
+	g_signal_connect (priv->query, "obj_updated", G_CALLBACK (query_obj_updated_cb), tasks);
+	g_signal_connect (priv->query, "query_done", G_CALLBACK (query_query_done_cb), tasks);
+	g_signal_connect (priv->query, "eval_error", G_CALLBACK (query_eval_error_cb), tasks);
 }
 
 /* Callback used from the view collection when we need to display a new view */
@@ -745,8 +741,7 @@ e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic)
 
 	priv->view_menus = gal_view_menus_new (priv->view_instance);
 	gal_view_menus_apply (priv->view_menus, uic, NULL);
-	gtk_signal_connect (GTK_OBJECT (priv->view_instance), "display_view",
-			    GTK_SIGNAL_FUNC (display_view_cb), tasks);
+	g_signal_connect (priv->view_instance, "display_view", G_CALLBACK (display_view_cb), tasks);
 	display_view_cb (priv->view_instance, gal_view_instance_get_current_view (priv->view_instance), tasks);
 }
 
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 957ba587dd..294fb18dde 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -161,12 +161,10 @@ e_timezone_entry_init		(ETimezoneEntry	*tentry)
 	/*gtk_widget_set_usize (priv->date_entry, 90, 0);*/
 	gtk_box_pack_start (GTK_BOX (tentry), priv->entry, TRUE, TRUE, 0);
 	gtk_widget_show (priv->entry);
-	gtk_signal_connect (GTK_OBJECT (priv->entry), "changed",
-			    GTK_SIGNAL_FUNC (on_entry_changed), tentry);
+	g_signal_connect (priv->entry, "changed", G_CALLBACK (on_entry_changed), tentry);
 	
 	priv->button = gtk_button_new ();
-	gtk_signal_connect (GTK_OBJECT (priv->button), "clicked",
-			    GTK_SIGNAL_FUNC (on_button_clicked), tentry);
+	g_signal_connect (priv->button, "clicked", G_CALLBACK (on_button_clicked), tentry);
 	gtk_box_pack_start (GTK_BOX (tentry), priv->button, FALSE, FALSE, 0);
 	gtk_widget_show (priv->button);
 
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 1010144b7f..80d29ec8d4 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -406,18 +406,12 @@ e_week_view_init (EWeekView *week_view)
 				       "EWeekViewMainItem::week_view", week_view,
 				       NULL);
 
-	gtk_signal_connect_after (GTK_OBJECT (week_view->main_canvas),
-				  "button_press_event",
-				  GTK_SIGNAL_FUNC (e_week_view_on_button_press),
-				  week_view);
-	gtk_signal_connect_after (GTK_OBJECT (week_view->main_canvas),
-				  "button_release_event",
-				  GTK_SIGNAL_FUNC (e_week_view_on_button_release),
-				  week_view);
-	gtk_signal_connect_after (GTK_OBJECT (week_view->main_canvas),
-				  "motion_notify_event",
-				  GTK_SIGNAL_FUNC (e_week_view_on_motion),
-				  week_view);
+	g_signal_connect_after (week_view->main_canvas, "button_press_event",
+				G_CALLBACK (e_week_view_on_button_press), week_view);
+	g_signal_connect_after (week_view->main_canvas, "button_release_event",
+				G_CALLBACK (e_week_view_on_button_release), week_view);
+	g_signal_connect_after (week_view->main_canvas, "motion_notify_event",
+				G_CALLBACK (e_week_view_on_motion), week_view);
 
 	/* Create the buttons to jump to each days. */
 	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**) jump_xpm);
@@ -429,10 +423,8 @@ e_week_view_init (EWeekView *week_view)
 			 "GnomeCanvasPixbuf::pixbuf", pixbuf,
 			 NULL);
 
-		gtk_signal_connect (GTK_OBJECT (week_view->jump_buttons[i]),
-				    "event",
-				    GTK_SIGNAL_FUNC (e_week_view_on_jump_button_event),
-				    week_view);
+		g_signal_connect (week_view->jump_buttons[i], "event",
+				  G_CALLBACK (e_week_view_on_jump_button_event), week_view);
 	}
 	gdk_pixbuf_unref (pixbuf);
 
@@ -441,7 +433,7 @@ e_week_view_init (EWeekView *week_view)
 	 */
 	adjustment = gtk_adjustment_new (0, -52, 52, 1, 1, 1);
 	gtk_signal_connect (adjustment, "value_changed",
-			    GTK_SIGNAL_FUNC (e_week_view_on_adjustment_changed),
+			    G_CALLBACK (e_week_view_on_adjustment_changed),
 			    week_view);
 
 	week_view->vscrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (adjustment));
@@ -461,22 +453,16 @@ e_week_view_init (EWeekView *week_view)
 				  clipboard_atom,
 				  GDK_SELECTION_TYPE_STRING,
 				  0);
-	gtk_signal_connect (GTK_OBJECT (week_view->invisible),
-			    "selection_get",
-			    GTK_SIGNAL_FUNC (selection_get),
-			    (gpointer) week_view);
-	gtk_signal_connect (GTK_OBJECT (week_view->invisible),
-			    "selection_clear_event",
-			    GTK_SIGNAL_FUNC (selection_clear_event),
-			    (gpointer) week_view);
-	gtk_signal_connect (GTK_OBJECT (week_view->invisible),
-			    "selection_received",
-			    GTK_SIGNAL_FUNC (selection_received),
-			    (gpointer) week_view);
-	gtk_signal_connect (GTK_OBJECT (week_view->invisible),
-			    "destroy",
-			    GTK_SIGNAL_FUNC (invisible_destroyed),
-			    (gpointer) week_view);
+
+	g_signal_connect (week_view->invisible, "selection_get",
+			  G_CALLBACK (selection_get), (gpointer) week_view);
+	g_signal_connect (week_view->invisible, "selection_clear_event",
+			  G_CALLBACK (selection_clear_event), (gpointer) week_view);
+	g_signal_connect (week_view->invisible, "selection_received",
+			  G_CALLBACK (selection_received), (gpointer) week_view);
+	g_signal_connect (week_view->invisible, "destroy",
+			  G_CALLBACK (invisible_destroyed), (gpointer) week_view);
+
 	week_view->clipboard_selection = NULL;
 
 	week_view->activity = NULL;
@@ -1227,14 +1213,14 @@ update_query (EWeekView *week_view)
 		return;
 	}
 
-	gtk_signal_connect (GTK_OBJECT (week_view->query), "obj_updated",
-			    GTK_SIGNAL_FUNC (query_obj_updated_cb), week_view);
-	gtk_signal_connect (GTK_OBJECT (week_view->query), "obj_removed",
-			    GTK_SIGNAL_FUNC (query_obj_removed_cb), week_view);
-	gtk_signal_connect (GTK_OBJECT (week_view->query), "query_done",
-			    GTK_SIGNAL_FUNC (query_query_done_cb), week_view);
-	gtk_signal_connect (GTK_OBJECT (week_view->query), "eval_error",
-			    GTK_SIGNAL_FUNC (query_eval_error_cb), week_view);
+	g_signal_connect (week_view->query, "obj_updated",
+			  G_CALLBACK (query_obj_updated_cb), week_view);
+	g_signal_connect (week_view->query, "obj_removed",
+			  G_CALLBACK (query_obj_removed_cb), week_view);
+	g_signal_connect (week_view->query, "query_done",
+			  G_CALLBACK (query_query_done_cb), week_view);
+	g_signal_connect (week_view->query, "eval_error",
+			  G_CALLBACK (query_eval_error_cb), week_view);
 }
 
 /* Callback used when the calendar client finishes opening */
@@ -1285,8 +1271,8 @@ e_week_view_set_cal_client	(EWeekView	*week_view,
 		if (cal_client_get_load_state (week_view->client) == CAL_CLIENT_LOAD_LOADED)
 			update_query (week_view);
 		else
-			gtk_signal_connect (GTK_OBJECT (week_view->client), "cal_opened",
-					    GTK_SIGNAL_FUNC (cal_opened_cb), week_view);
+			g_signal_connect (week_view->client, "cal_opened",
+					  G_CALLBACK (cal_opened_cb), week_view);
 	}
 }
 
@@ -2730,9 +2716,9 @@ e_week_view_reshape_event_span (EWeekView *week_view,
 					       "use_ellipsis", TRUE,
 					       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
 					       NULL);
-		gtk_signal_connect (GTK_OBJECT (span->text_item), "event",
-				    GTK_SIGNAL_FUNC (e_week_view_on_text_item_event),
-				    week_view);
+		g_signal_connect (span->text_item, "event",
+				  G_CALLBACK (e_week_view_on_text_item_event),
+				  week_view);
 	}
 
 	/* Calculate the position of the text item.
@@ -3086,8 +3072,8 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 			e = &g_array_index (week_view->events, EWeekViewEvent, event_num);
 
 			destroyed = FALSE;
-			id = gtk_signal_connect (GTK_OBJECT (e->comp), "destroy",
-						 GTK_SIGNAL_FUNC (comp_destroy_cb), &destroyed);
+			id = g_signal_connect (e->comp, "destroy",
+					       G_CALLBACK (comp_destroy_cb), &destroyed);
 
 			if (!GTK_WIDGET_HAS_FOCUS (week_view))
 				gtk_widget_grab_focus (GTK_WIDGET (week_view));
@@ -3613,8 +3599,7 @@ e_week_view_show_popup_menu (EWeekView	     *week_view,
 	week_view->popup_event_num = event_num;
 
 	popup = e_popup_menu_create (context_menu, disable_mask, hide_mask, week_view);
-	gtk_signal_connect (GTK_OBJECT (popup), "selection-done",
-			    GTK_SIGNAL_FUNC (free_view_popup), week_view);
+	g_signal_connect (popup, "selection-done", G_CALLBACK (free_view_popup), week_view);
 	e_popup_menu (popup, (GdkEvent *) bevent);
 }
 
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 80f1b7cf4e..64304c64bc 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -550,14 +550,14 @@ update_query (GnomeCalendar *gcal)
 		return;
 	}
 
-	gtk_signal_connect (GTK_OBJECT (priv->dn_query), "obj_updated",
-			    GTK_SIGNAL_FUNC (dn_query_obj_updated_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->dn_query), "obj_removed",
-			    GTK_SIGNAL_FUNC (dn_query_obj_removed_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->dn_query), "query_done",
-			    GTK_SIGNAL_FUNC (dn_query_query_done_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->dn_query), "eval_error",
-			    GTK_SIGNAL_FUNC (dn_query_eval_error_cb), gcal);
+	g_signal_connect (priv->dn_query, "obj_updated",
+			  G_CALLBACK (dn_query_obj_updated_cb), gcal);
+	g_signal_connect (priv->dn_query, "obj_removed",
+			  G_CALLBACK (dn_query_obj_removed_cb), gcal);
+	g_signal_connect (priv->dn_query, "query_done",
+			  G_CALLBACK (dn_query_query_done_cb), gcal);
+	g_signal_connect (priv->dn_query, "eval_error",
+			  G_CALLBACK (dn_query_eval_error_cb), gcal);
 }
 
 /**
@@ -709,25 +709,25 @@ calendar_focus_change_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data
 static void
 connect_day_view_focus (GnomeCalendar *gcal, EDayView *dv)
 {
-	gtk_signal_connect (GTK_OBJECT (dv->top_canvas), "focus_in_event",
-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (dv->top_canvas), "focus_out_event",
-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);
+	g_signal_connect (dv->top_canvas, "focus_in_event",
+			  G_CALLBACK (calendar_focus_change_cb), gcal);
+	g_signal_connect (dv->top_canvas, "focus_out_event",
+			  G_CALLBACK (calendar_focus_change_cb), gcal);
 
-	gtk_signal_connect (GTK_OBJECT (dv->main_canvas), "focus_in_event",
-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (dv->main_canvas), "focus_out_event",
-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);
+	g_signal_connect (dv->main_canvas, "focus_in_event",
+			  G_CALLBACK (calendar_focus_change_cb), gcal);
+	g_signal_connect (dv->main_canvas, "focus_out_event",
+			  G_CALLBACK (calendar_focus_change_cb), gcal);
 }
 
 /* Connects to the focus change signals of a week view widget */
 static void
 connect_week_view_focus (GnomeCalendar *gcal, EWeekView *wv)
 {
-	gtk_signal_connect (GTK_OBJECT (wv->main_canvas), "focus_in_event",
-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (wv->main_canvas), "focus_out_event",
-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);
+	g_signal_connect (wv->main_canvas, "focus_in_event",
+			  G_CALLBACK (calendar_focus_change_cb), gcal);
+	g_signal_connect (wv->main_canvas, "focus_out_event",
+			  G_CALLBACK (calendar_focus_change_cb), gcal);
 }
 
 /* Callback used when the selection in the taskpad table changes.  We just proxy
@@ -757,10 +757,10 @@ setup_widgets (GnomeCalendar *gcal)
 	priv = gcal->priv;
 
 	priv->search_bar = cal_search_bar_new ();
-	gtk_signal_connect (GTK_OBJECT (priv->search_bar), "sexp_changed",
-			    GTK_SIGNAL_FUNC (search_bar_sexp_changed_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->search_bar), "category_changed",
-			    GTK_SIGNAL_FUNC (search_bar_category_changed_cb), gcal);
+	g_signal_connect (priv->search_bar, "sexp_changed",
+			  G_CALLBACK (search_bar_sexp_changed_cb), gcal);
+	g_signal_connect (priv->search_bar, "category_changed",
+			  G_CALLBACK (search_bar_category_changed_cb), gcal);
 
 	gtk_widget_show (priv->search_bar);
 	gtk_box_pack_start (GTK_BOX (gcal), priv->search_bar, FALSE, FALSE, 0);
@@ -794,22 +794,14 @@ setup_widgets (GnomeCalendar *gcal)
 					       gcal, NULL);
 
 	e_paned_pack1 (E_PANED (priv->vpane), w, FALSE, TRUE);
-	gtk_signal_connect (GTK_OBJECT (priv->date_navigator),
-			    "style_set",
-			    GTK_SIGNAL_FUNC (gnome_calendar_on_date_navigator_style_set),
-			    gcal);
-	gtk_signal_connect_after (GTK_OBJECT (priv->date_navigator),
-				  "size_allocate",
-				  (GtkSignalFunc) gnome_calendar_on_date_navigator_size_allocate,
-				  gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->date_navigator->calitem),
-			    "selection_changed",
-			    (GtkSignalFunc) gnome_calendar_on_date_navigator_selection_changed,
-			    gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->date_navigator->calitem),
-			    "date_range_changed",
-			    GTK_SIGNAL_FUNC (gnome_calendar_on_date_navigator_date_range_changed),
-			    gcal);
+	g_signal_connect (priv->date_navigator, "style_set",
+			  G_CALLBACK (gnome_calendar_on_date_navigator_style_set), gcal);
+	g_signal_connect_after (priv->date_navigator, "size_allocate",
+				G_CALLBACK (gnome_calendar_on_date_navigator_size_allocate), gcal);
+	g_signal_connect (priv->date_navigator->calitem, "selection_changed",
+			  G_CALLBACK (gnome_calendar_on_date_navigator_selection_changed), gcal);
+	g_signal_connect (priv->date_navigator->calitem, "date_range_changed",
+			  G_CALLBACK (gnome_calendar_on_date_navigator_date_range_changed), gcal);
 
 	/* The ToDo list. */
 	priv->todo = e_calendar_table_new ();
@@ -824,13 +816,13 @@ setup_widgets (GnomeCalendar *gcal)
 	g_free (filename);
 
 	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (priv->todo));
-	gtk_signal_connect (GTK_OBJECT (etable->table_canvas), "focus_in_event",
-			    GTK_SIGNAL_FUNC (table_canvas_focus_change_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (etable->table_canvas), "focus_out_event",
-			    GTK_SIGNAL_FUNC (table_canvas_focus_change_cb), gcal);
+	g_signal_connect (etable->table_canvas, "focus_in_event",
+			  G_CALLBACK (table_canvas_focus_change_cb), gcal);
+	g_signal_connect (etable->table_canvas, "focus_out_event",
+			  G_CALLBACK (table_canvas_focus_change_cb), gcal);
 
-	gtk_signal_connect (GTK_OBJECT (etable), "selection_change",
-			    GTK_SIGNAL_FUNC (table_selection_change_cb), gcal);
+	g_signal_connect (etable, "selection_change",
+			  G_CALLBACK (table_selection_change_cb), gcal);
 
 	/* The Day View. */
 	priv->day_view = e_day_view_new ();
@@ -838,8 +830,8 @@ setup_widgets (GnomeCalendar *gcal)
 	gtk_widget_show (priv->day_view);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
 				  priv->day_view, gtk_label_new (""));
-	gtk_signal_connect (GTK_OBJECT (priv->day_view), "selection_changed",
-			    GTK_SIGNAL_FUNC (view_selection_changed_cb), gcal);
+	g_signal_connect (priv->day_view, "selection_changed",
+			  G_CALLBACK (view_selection_changed_cb), gcal);
 
 	connect_day_view_focus (gcal, E_DAY_VIEW (priv->day_view));
 
@@ -852,8 +844,8 @@ setup_widgets (GnomeCalendar *gcal)
 	gtk_widget_show (priv->work_week_view);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
 				  priv->work_week_view, gtk_label_new (""));
-	gtk_signal_connect (GTK_OBJECT (priv->work_week_view), "selection_changed",
-			    GTK_SIGNAL_FUNC (view_selection_changed_cb), gcal);
+	g_signal_connect (priv->work_week_view, "selection_changed",
+			  G_CALLBACK (view_selection_changed_cb), gcal);
 
 	connect_day_view_focus (gcal, E_DAY_VIEW (priv->work_week_view));
 
@@ -863,8 +855,8 @@ setup_widgets (GnomeCalendar *gcal)
 	gtk_widget_show (priv->week_view);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
 				  priv->week_view, gtk_label_new (""));
-	gtk_signal_connect (GTK_OBJECT (priv->week_view), "selection_changed",
-			    GTK_SIGNAL_FUNC (view_selection_changed_cb), gcal);
+	g_signal_connect (priv->week_view, "selection_changed",
+			  G_CALLBACK (view_selection_changed_cb), gcal);
 
 	connect_week_view_focus (gcal, E_WEEK_VIEW (priv->week_view));
 
@@ -875,8 +867,8 @@ setup_widgets (GnomeCalendar *gcal)
 	gtk_widget_show (priv->month_view);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
 				  priv->month_view, gtk_label_new (""));
-	gtk_signal_connect (GTK_OBJECT (priv->month_view), "selection_changed",
-			    GTK_SIGNAL_FUNC (view_selection_changed_cb), gcal);
+	g_signal_connect (priv->month_view, "selection_changed",
+			  G_CALLBACK (view_selection_changed_cb), gcal);
 
 	connect_week_view_focus (gcal, E_WEEK_VIEW (priv->month_view));
 
@@ -1400,8 +1392,8 @@ gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)
 	gal_view_menus_apply (priv->view_menus, uic, NULL);
 	gnome_calendar_set_view (gcal, priv->current_view_type, TRUE, FALSE);
 
-	gtk_signal_connect (GTK_OBJECT (priv->view_instance), "display_view",
-			    GTK_SIGNAL_FUNC (display_view_cb), gcal);
+	g_signal_connect (priv->view_instance, "display_view",
+			  G_CALLBACK (display_view_cb), gcal);
 	display_view_cb (priv->view_instance, gal_view_instance_get_current_view (priv->view_instance), gcal);
 }
 
@@ -1799,14 +1791,14 @@ gnome_calendar_construct (GnomeCalendar *gcal)
 	if (!priv->client)
 		return NULL;
 
-	gtk_signal_connect (GTK_OBJECT (priv->client), "cal_opened",
-			    GTK_SIGNAL_FUNC (client_cal_opened_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "backend_error",
-			    GTK_SIGNAL_FUNC (backend_error_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "categories_changed",
-			    GTK_SIGNAL_FUNC (client_categories_changed_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "backend_died",
-			    GTK_SIGNAL_FUNC (backend_died_cb), gcal);
+	g_signal_connect (priv->client, "cal_opened",
+			  G_CALLBACK (client_cal_opened_cb), gcal);
+	g_signal_connect (priv->client, "backend_error",
+			  G_CALLBACK (backend_error_cb), gcal);
+	g_signal_connect (priv->client, "categories_changed",
+			  G_CALLBACK (client_categories_changed_cb), gcal);
+	g_signal_connect (priv->client, "backend_died",
+			  G_CALLBACK (backend_died_cb), gcal);
 
 	e_day_view_set_cal_client (E_DAY_VIEW (priv->day_view),
 				   priv->client);
@@ -1824,14 +1816,14 @@ gnome_calendar_construct (GnomeCalendar *gcal)
 	if (!priv->task_pad_client)
 		return NULL;
 
-	gtk_signal_connect (GTK_OBJECT (priv->task_pad_client), "cal_opened",
-			    GTK_SIGNAL_FUNC (client_cal_opened_cb), gcal);	
-	gtk_signal_connect (GTK_OBJECT (priv->task_pad_client), "backend_error",
-			    GTK_SIGNAL_FUNC (backend_error_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->task_pad_client), "categories_changed",
-			    GTK_SIGNAL_FUNC (client_categories_changed_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->task_pad_client), "backend_died",
-			    GTK_SIGNAL_FUNC (backend_died_cb), gcal);
+	g_signal_connect (priv->task_pad_client, "cal_opened",
+			  G_CALLBACK (client_cal_opened_cb), gcal);	
+	g_signal_connect (priv->task_pad_client, "backend_error",
+			  G_CALLBACK (backend_error_cb), gcal);
+	g_signal_connect (priv->task_pad_client, "categories_changed",
+			  G_CALLBACK (client_categories_changed_cb), gcal);
+	g_signal_connect (priv->task_pad_client, "backend_died",
+			  G_CALLBACK (backend_died_cb), gcal);
 
 	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo));
 	g_assert (model != NULL);
@@ -2084,9 +2076,9 @@ gnome_calendar_update_config_settings (GnomeCalendar *gcal,
 	week_start_day = (week_start_day + 6) % 7;
 
 	e_day_view_set_week_start_day (E_DAY_VIEW (priv->day_view),
-					week_start_day);
+				       week_start_day);
 	e_day_view_set_week_start_day (E_DAY_VIEW (priv->work_week_view),
-					week_start_day);
+				       week_start_day);
 	e_week_view_set_week_start_day (E_WEEK_VIEW (priv->week_view),
 					week_start_day);
 	e_week_view_set_week_start_day (E_WEEK_VIEW (priv->month_view),
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index c51061703f..9a8fcb260d 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -183,21 +183,13 @@ goto_dialog_init_widgets (GoToDialog *dlg)
 	
 	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dlg->month));
 	for (l = GTK_MENU_SHELL (menu)->children; l != NULL; l = l->next)
-		gtk_signal_connect (GTK_OBJECT (menu), "selection_done",
-				    GTK_SIGNAL_FUNC (month_changed), dlg);
+		g_signal_connect (menu, "selection_done", G_CALLBACK (month_changed), dlg);
 
 	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (dlg->year));
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
-			    (GtkSignalFunc) year_changed, dlg);
-
-	gtk_signal_connect (GTK_OBJECT (dlg->ecal->calitem),
-			    "date_range_changed",
-			    GTK_SIGNAL_FUNC (ecal_date_range_changed),
-			    dlg);
-	gtk_signal_connect (GTK_OBJECT (dlg->ecal->calitem),
-			    "selection_changed",
-			    (GtkSignalFunc) ecal_event,
-			    dlg);
+	g_signal_connect (adj, "value_changed", G_CALLBACK (year_changed), dlg);
+
+	g_signal_connect (dlg->ecal->calitem, "date_range_changed", G_CALLBACK (ecal_date_range_changed), dlg);
+	g_signal_connect (dlg->ecal->calitem, "selection_changed", G_CALLBACK (ecal_event), dlg);
 }
 
 /* Creates a "goto date" dialog and runs it */
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 66b4dbc4a2..13f2f98925 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -123,9 +123,7 @@ tasks_control_new (void)
 
 	tasks_control_properties_init (control, E_TASKS (tasks));
 
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    GTK_SIGNAL_FUNC (tasks_control_activate_cb),
-			    tasks);
+	g_signal_connect (control, "activate", G_CALLBACK (tasks_control_activate_cb), tasks);
 
 	return control;
 }
@@ -333,8 +331,7 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks)
 
 	/* Signals from the tasks widget; also sensitize the menu items as appropriate */
 
-	gtk_signal_connect (GTK_OBJECT (tasks), "selection_changed",
-			    GTK_SIGNAL_FUNC (selection_changed_cb), control);
+	g_signal_connect (tasks, "selection_changed", G_CALLBACK (selection_changed_cb), control);
 
 	cal_table = e_tasks_get_calendar_table (tasks);
 	etable = e_calendar_table_get_table (cal_table);
diff --git a/calendar/gui/tasks-migrate.c b/calendar/gui/tasks-migrate.c
index 37ddcd7958..53ffa9bad4 100644
--- a/calendar/gui/tasks-migrate.c
+++ b/calendar/gui/tasks-migrate.c
@@ -191,9 +191,7 @@ load_tasks_client (void)
 	if (!tasks_client)
 		goto error;
 
-	gtk_signal_connect (GTK_OBJECT (tasks_client), "cal_opened",
-			    GTK_SIGNAL_FUNC (tasks_opened_cb),
-			    NULL);
+	g_signal_connect (tasks_client, "cal_opened", G_CALLBACK (tasks_opened_cb), NULL);
 
 	uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir);
 	success = cal_client_open_calendar (tasks_client, uri, FALSE);
@@ -265,9 +263,7 @@ load_calendar_client (void)
 	if (!calendar_client)
 		goto error;
 
-	gtk_signal_connect (GTK_OBJECT (calendar_client), "cal_opened",
-			    GTK_SIGNAL_FUNC (calendar_opened_cb),
-			    NULL);
+	g_signal_connect (calendar_client, "cal_opened", G_CALLBACK (calendar_opened_cb), NULL);
 
 	uri = g_strdup_printf ("%s/local/Calendar/calendar.ics", evolution_dir);
 	success = cal_client_open_calendar (calendar_client, uri, TRUE);
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 04201e6b41..fd1e14cb54 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -198,16 +198,12 @@ create_items (WeekdayPicker *wp)
 		priv->boxes[i] = gnome_canvas_item_new (parent,
 							GNOME_TYPE_CANVAS_RECT,
 							NULL);
-		gtk_signal_connect (GTK_OBJECT (priv->boxes[i]), "event",
-				    GTK_SIGNAL_FUNC (day_event_cb),
-				    wp);
+		g_signal_connect (priv->boxes[i], "event", G_CALLBACK (day_event_cb), wp);
 
 		priv->labels[i] = gnome_canvas_item_new (parent,
 							 GNOME_TYPE_CANVAS_TEXT,
 							 NULL);
-		gtk_signal_connect (GTK_OBJECT (priv->labels[i]), "event",
-				    GTK_SIGNAL_FUNC (day_event_cb),
-				    wp);
+		g_signal_connect (priv->labels[i], "event", G_CALLBACK (day_event_cb), wp);
 	}
 }