diff options
Diffstat (limited to 'calendar/gui/dialogs/task-editor.c')
| -rw-r--r-- | calendar/gui/dialogs/task-editor.c | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 240d1a5010..08d76a14be 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -228,6 +228,7 @@ TaskEditor * task_editor_construct (TaskEditor *tedit) { TaskEditorPrivate *priv; + GtkWidget *bonobo_win; g_return_val_if_fail (tedit != NULL, NULL); g_return_val_if_fail (IS_TASK_EDITOR (tedit), NULL); @@ -257,7 +258,26 @@ task_editor_construct (TaskEditor *tedit) goto error; } - bonobo_ui_handler_set_app (priv->uih, GNOME_APP (priv->app)); + bonobo_win = bonobo_win_new ("event-editor-dialog", "Event Editor"); + + /* FIXME: The sucking bit */ + { + GtkWidget *contents; + + contents = gnome_dock_get_client_area ( + GNOME_DOCK (GNOME_APP (priv->app)->dock)); + if (!contents) { + g_message ("event_editor_construct(): Could not get contents"); + goto error; + } + gtk_widget_ref (contents); + gtk_container_remove (GTK_CONTAINER (contents->parent), contents); + bonobo_win_set_contents (BONOBO_WIN (bonobo_win), contents); + gtk_widget_destroy (priv->app); + priv->app = GTK_WIDGET (bonobo_win); + } + + bonobo_ui_handler_set_app (priv->uih, BONOBO_WIN (priv->app)); create_menu (tedit); create_toolbar (tedit); @@ -655,9 +675,11 @@ create_toolbar (TaskEditor *tedit) bonobo_ui_handler_create_toolbar (priv->uih, "Toolbar"); +#warning This should be converted to xml. +#if 0 /* Fetch the toolbar. What a pain in the ass. */ - dock_item = gnome_app_get_dock_item_by_name (GNOME_APP (priv->app), GNOME_APP_TOOLBAR_NAME); + dock_item = bonobo_win_get_dock_item_by_name (BONOBO_WIN (priv->app), BONOBO_WIN_TOOLBAR_NAME); g_assert (dock_item != NULL); toolbar_child = gnome_dock_item_get_child (dock_item); @@ -665,7 +687,7 @@ create_toolbar (TaskEditor *tedit) /* Turn off labels as GtkToolbar sucks */ gtk_toolbar_set_style (GTK_TOOLBAR (toolbar_child), GTK_TOOLBAR_ICONS); - +#endif list = bonobo_ui_handler_toolbar_parse_uiinfo_list_with_data (toolbar, tedit); bonobo_ui_handler_toolbar_add_list (priv->uih, "/Toolbar", list); |