diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-31 21:19:52 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-04-01 00:10:54 +0800 |
| commit | 6a5767cbd1fb6390478a888d94677a6ecb1d123f (patch) | |
| tree | d3f558f375765992458aa1537bead013b598be31 /calendar | |
| parent | f8f89b0bfd8ef857dceed2a96df16a008290d53b (diff) | |
| download | gsoc2013-evolution-6a5767cbd1fb6390478a888d94677a6ecb1d123f.tar gsoc2013-evolution-6a5767cbd1fb6390478a888d94677a6ecb1d123f.tar.gz gsoc2013-evolution-6a5767cbd1fb6390478a888d94677a6ecb1d123f.tar.bz2 gsoc2013-evolution-6a5767cbd1fb6390478a888d94677a6ecb1d123f.tar.lz gsoc2013-evolution-6a5767cbd1fb6390478a888d94677a6ecb1d123f.tar.xz gsoc2013-evolution-6a5767cbd1fb6390478a888d94677a6ecb1d123f.tar.zst gsoc2013-evolution-6a5767cbd1fb6390478a888d94677a6ecb1d123f.zip | |
EShell: Remove "meego-mode" property.
The property is always FALSE.
Remove both the property itself and any logic predicated on it.
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 037371d167..16d49fdb52 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -2003,7 +2003,6 @@ comp_editor_init (CompEditor *editor) GtkWindow *window; EShell *shell; gboolean express_mode; - gboolean meego_mode; gint n_targets; GError *error = NULL; @@ -2011,7 +2010,6 @@ comp_editor_init (CompEditor *editor) * that depends on it to a constructed() method. */ shell = e_shell_get_default (); express_mode = e_shell_get_express_mode (shell); - meego_mode = e_shell_get_meego_mode (shell); editor->priv = priv = COMP_EDITOR_GET_PRIVATE (editor); @@ -2166,11 +2164,9 @@ comp_editor_init (CompEditor *editor) container = widget; - if (!express_mode) { - widget = comp_editor_get_managed_widget (editor, "/main-menu"); - gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); - gtk_widget_set_visible (widget, !meego_mode); - } + widget = comp_editor_get_managed_widget (editor, "/main-menu"); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + gtk_widget_set_visible (widget, TRUE); widget = comp_editor_get_managed_widget (editor, "/main-toolbar"); gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); @@ -2197,26 +2193,9 @@ comp_editor_init (CompEditor *editor) container = e_attachment_paned_get_content_area ( E_ATTACHMENT_PANED (priv->attachment_view)); - if (meego_mode) { - widget = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy ( - GTK_SCROLLED_WINDOW (widget), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); - gtk_widget_set_size_request (widget, 300, -1); - gtk_widget_show (widget); - - container = widget; - } - widget = gtk_notebook_new (); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), express_mode); - if (!meego_mode) - gtk_box_pack_start ( - GTK_BOX (container), widget, TRUE, TRUE, 0); - else - gtk_scrolled_window_add_with_viewport ( - GTK_SCROLLED_WINDOW (container), widget); + gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); priv->notebook = GTK_NOTEBOOK (widget); gtk_widget_show (widget); |