From fa40c443641bc748bbf8edc4d9f9c5208095dc1c Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Wed, 21 Apr 2004 17:58:09 +0000 Subject: Fixes #56504 2004-04-21 JP Rosevear Fixes #56504 * gui/gnome-cal.c (gnome_calendar_destroy): no need to destroy the creatable item handler (gnome_calendar_set_ui_component): don't do the creatable item stuff here * gui/e-tasks.c (e_tasks_set_ui_component): don't do the creatable item stuff here (e_tasks_destroy): no need to destroy creatable item handler * gui/e-calendar-table.c (e_calendar_table_set_status_message): comment out temporarily * gui/e-calendar-view.c (e_calendar_view_set_status_message): ditto * gui/calendar-component.c: switch to using per component view information; don't listen for config changes to the primary selection and selection so that different windows can have different calendar selections; use a local creatable items handler so that the new button is associated with the right window when setting the default times * gui/tasks-component.c: ditto svn path=/trunk/; revision=25566 --- calendar/gui/gnome-cal.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'calendar/gui/gnome-cal.c') diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 6722442cee..4872c7e274 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -155,9 +155,6 @@ struct _GnomeCalendarPrivate { 'dates-shown-changed' signal.*/ time_t visible_start; time_t visible_end; - - /* Our associated creatable items handler */ - EUserCreatableItemsHandler *creatable_items_handler; }; /* Signal IDs */ @@ -169,6 +166,7 @@ enum { CALENDAR_FOCUS_CHANGE, TASKPAD_FOCUS_CHANGE, GOTO_DATE, + ACTIVITY, LAST_SIGNAL }; @@ -1197,11 +1195,6 @@ gnome_calendar_destroy (GtkObject *object) priv->view_menus = NULL; } - if (priv->creatable_items_handler) { - g_object_unref (priv->creatable_items_handler); - priv->creatable_items_handler = NULL; - } - g_free (priv); gcal->priv = NULL; } @@ -2011,14 +2004,6 @@ gnome_calendar_set_ui_component (GnomeCalendar *gcal, g_return_if_fail (ui_component == NULL || BONOBO_IS_UI_COMPONENT (ui_component)); e_search_bar_set_ui_component (E_SEARCH_BAR (gcal->priv->search_bar), ui_component); - - if (ui_component) { - if (!gcal->priv->creatable_items_handler) { - gcal->priv->creatable_items_handler = - e_user_creatable_items_handler_new ("calendar", NULL, NULL); - } - e_user_creatable_items_handler_activate (gcal->priv->creatable_items_handler, ui_component); - } } /** -- cgit v1.2.3