aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/tasks-control.c7
2 files changed, 8 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 538aba61e9..268377b4ff 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-20 JP Rosevear <jpr@ximian.com>
+
+ * gui/tasks-control.c (tasks_control_activate): don't set the
+ tasks ui component until the container is set, remove unused
+ pixmaps
+
2002-08-19 JP Rosevear <jpr@ximian.com>
* gui/e-meeting-model.c (destroy): disconnect destroy signal
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 53e3eb239f..1c7bc82b69 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -274,15 +274,12 @@ static BonoboUIVerb verbs [] = {
};
static EPixmap pixmaps [] = {
- E_PIXMAP ("/menu/File/New/NewFirstItem/NewTask", "new_task-16.png"),
E_PIXMAP ("/menu/File/Print/Print", "print.xpm"),
E_PIXMAP ("/menu/File/Print/PrintPreview", "print-preview.xpm"),
E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksCut", "16_cut.png"),
E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksCopy", "16_copy.png"),
E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksPaste", "16_paste.png"),
E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksDelete", "evolution-trash-mini.png"),
- E_PIXMAP ("/menu/Tools/ComponentPlaceholder/TasksSettings", "configure_16_calendar.xpm"),
- E_PIXMAP ("/Toolbar/New", "buttons/new_task.png"),
E_PIXMAP ("/Toolbar/Cut", "buttons/cut.png"),
E_PIXMAP ("/Toolbar/Copy", "buttons/copy.png"),
E_PIXMAP ("/Toolbar/Paste", "buttons/paste.png"),
@@ -303,12 +300,12 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks)
uic = bonobo_control_get_ui_component (control);
g_assert (uic != NULL);
- e_tasks_set_ui_component (tasks, uic);
-
remote_uih = bonobo_control_get_remote_ui_container (control);
bonobo_ui_component_set_container (uic, remote_uih);
bonobo_object_release_unref (remote_uih, NULL);
+ e_tasks_set_ui_component (tasks, uic);
+
bonobo_ui_component_add_verb_list_with_data (uic, verbs, tasks);
bonobo_ui_component_freeze (uic, NULL);