[evolution] EShell: Remove "meego-mode" property.

[Matthew Barnes <mbarnes src gnome org>]

commit 6a5767cbd1fb6390478a888d94677a6ecb1d123f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Mar 31 09:19:52 2013 -0400

    EShell: Remove "meego-mode" property.
    
    The property is always FALSE.
    
    Remove both the property itself and any logic predicated on it.

 calendar/gui/dialogs/comp-editor.c             |   29 ++-----------
 doc/reference/libeshell/libeshell-sections.txt |    1 -
 shell/e-shell-window.c                         |    9 ----
 shell/e-shell.c                                |   54 ------------------------
 shell/e-shell.h                                |    1 -
 5 files changed, 4 insertions(+), 90 deletions(-)
---
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 037371d..16d49fd 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);
 
diff --git a/doc/reference/libeshell/libeshell-sections.txt b/doc/reference/libeshell/libeshell-sections.txt
index 6ccaf09..ce1e894 100644
--- a/doc/reference/libeshell/libeshell-sections.txt
+++ b/doc/reference/libeshell/libeshell-sections.txt
@@ -14,7 +14,6 @@ e_shell_create_shell_window
 e_shell_handle_uris
 e_shell_submit_alert
 e_shell_get_active_window
-e_shell_get_meego_mode
 e_shell_get_express_mode
 e_shell_get_module_directory
 e_shell_get_network_available
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index acf31a5..85c76d22 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -452,9 +452,6 @@ shell_window_construct_toolbar (EShellWindow *shell_window)
                gtk_widget_get_style_context (toolbar),
                GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
 
-       if (e_shell_get_meego_mode (shell))
-                gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar");
-
        /* XXX Having this separator in the UI definition doesn't work
         *     because GtkUIManager is unaware of the "New" button, so
         *     it makes the separator invisible.  One possibility is to
@@ -495,16 +492,10 @@ shell_window_construct_toolbar (EShellWindow *shell_window)
        gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
        if (e_shell_get_express_mode (shell))
                gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0);
-       if (e_shell_get_meego_mode (shell))
-               gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar");
 
        toolbar = e_shell_window_get_managed_widget (
                shell_window, "/close-toolbar");
        gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
-       if (e_shell_get_meego_mode (shell))
-               gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0);
-       if (e_shell_get_meego_mode (shell))
-               gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar");
 
        return box;
 }
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 922fb4f..16b8026 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -70,7 +70,6 @@ struct _EShellPrivate {
 
        guint auto_reconnect            : 1;
        guint express_mode              : 1;
-       guint meego_mode                : 1;
        guint modules_loaded            : 1;
        guint network_available         : 1;
        guint network_available_locked  : 1;
@@ -83,7 +82,6 @@ enum {
        PROP_0,
        PROP_CLIENT_CACHE,
        PROP_EXPRESS_MODE,
-       PROP_MEEGO_MODE,
        PROP_GEOMETRY,
        PROP_MODULE_DIRECTORY,
        PROP_NETWORK_AVAILABLE,
@@ -522,13 +520,6 @@ shell_set_express_mode (EShell *shell,
 }
 
 static void
-shell_set_meego_mode (EShell *shell,
-                      gboolean is_meego)
-{
-       shell->priv->meego_mode = is_meego;
-}
-
-static void
 shell_set_geometry (EShell *shell,
                     const gchar *geometry)
 {
@@ -559,12 +550,6 @@ shell_set_property (GObject *object,
                                g_value_get_boolean (value));
                        return;
 
-               case PROP_MEEGO_MODE:
-                       shell_set_meego_mode (
-                               E_SHELL (object),
-                               g_value_get_boolean (value));
-                       return;
-
                case PROP_GEOMETRY:
                        shell_set_geometry (
                                E_SHELL (object),
@@ -612,12 +597,6 @@ shell_get_property (GObject *object,
                                E_SHELL (object)));
                        return;
 
-               case PROP_MEEGO_MODE:
-                       g_value_set_boolean (
-                               value, e_shell_get_meego_mode (
-                               E_SHELL (object)));
-                       return;
-
                case PROP_MODULE_DIRECTORY:
                        g_value_set_string (
                                value, e_shell_get_module_directory (
@@ -899,23 +878,6 @@ e_shell_class_init (EShellClass *class)
                        G_PARAM_CONSTRUCT_ONLY));
 
        /**
-        * EShell:meego
-        *
-        * Are we running under meego - if so, adapt ourselves
-        * to fit in well with their theming.
-        **/
-       g_object_class_install_property (
-               object_class,
-               PROP_MEEGO_MODE,
-               g_param_spec_boolean (
-                       "meego-mode",
-                       "Meego Mode",
-                       "Whether meego mode is enabled",
-                       FALSE,
-                       G_PARAM_READWRITE |
-                       G_PARAM_CONSTRUCT_ONLY));
-
-       /**
         * EShell:geometry
         *
         * User-specified initial window geometry string to apply
@@ -1581,22 +1543,6 @@ e_shell_get_express_mode (EShell *shell)
 }
 
 /**
- * e_shell_get_meego_mode:
- * @shell: an #EShell
- *
- * Returns %TRUE if Evolution is in MeeGo mode.
- *
- * Returns: %TRUE if Evolution is in MeeGo mode
- **/
-gboolean
-e_shell_get_meego_mode (EShell *shell)
-{
-       g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
-
-       return shell->priv->meego_mode;
-}
-
-/**
  * e_shell_get_module_directory:
  * @shell: an #EShell
  *
diff --git a/shell/e-shell.h b/shell/e-shell.h
index 214dd49..f7edf81 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -126,7 +126,6 @@ guint               e_shell_handle_uris             (EShell *shell,
 void           e_shell_submit_alert            (EShell *shell,
                                                 EAlert *alert);
 GtkWindow *     e_shell_get_active_window      (EShell *shell);
-gboolean       e_shell_get_meego_mode          (EShell *shell);
 gboolean       e_shell_get_express_mode        (EShell *shell);
 const gchar *  e_shell_get_module_directory    (EShell *shell);
 gboolean       e_shell_get_network_available   (EShell *shell);