diff options
Diffstat (limited to 'calendar/gui/e-tasks.c')
| -rw-r--r-- | calendar/gui/e-tasks.c | 37 |
1 files changed, 16 insertions, 21 deletions
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); } |