From 6a5767cbd1fb6390478a888d94677a6ecb1d123f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 31 Mar 2013 09:19:52 -0400 Subject: EShell: Remove "meego-mode" property. The property is always FALSE. Remove both the property itself and any logic predicated on it. --- shell/e-shell-window.c | 9 --------- shell/e-shell.c | 54 -------------------------------------------------- shell/e-shell.h | 1 - 3 files changed, 64 deletions(-) (limited to 'shell') diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index acf31a5eca..85c76d222a 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 922fb4f213..16b8026e53 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, @@ -521,13 +519,6 @@ shell_set_express_mode (EShell *shell, shell->priv->express_mode = express_mode; } -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 ( @@ -898,23 +877,6 @@ e_shell_class_init (EShellClass *class) G_PARAM_READWRITE | 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 * @@ -1580,22 +1542,6 @@ e_shell_get_express_mode (EShell *shell) return shell->priv->express_mode; } -/** - * 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 214dd49988..f7edf8140d 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); -- cgit v1.2.3