[evolution] Remove e_shell_hide_widgets_for_express_mode().



commit 85fac8778261ce1fc80d8857158eb18a399da9ee
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Mar 31 10:21:44 2013 -0400

    Remove e_shell_hide_widgets_for_express_mode().
    
    No longer needed.

 doc/reference/libeshell/libeshell-sections.txt |    1 -
 modules/calendar/e-calendar-preferences.c      |   25 -----------
 modules/mail/em-composer-prefs.c               |    7 ---
 shell/e-shell-utils.c                          |   54 ------------------------
 shell/e-shell-utils.h                          |    6 ---
 5 files changed, 0 insertions(+), 93 deletions(-)
---
diff --git a/doc/reference/libeshell/libeshell-sections.txt b/doc/reference/libeshell/libeshell-sections.txt
index ecf19d4..e1cbbaf 100644
--- a/doc/reference/libeshell/libeshell-sections.txt
+++ b/doc/reference/libeshell/libeshell-sections.txt
@@ -223,7 +223,6 @@ EShellTaskbarPrivate
 e_shell_run_open_dialog
 e_shell_run_save_dialog
 e_shell_utils_import_uris
-e_shell_hide_widgets_for_express_mode
 </SECTION>
 
 <SECTION>
diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c
index 48c50e3..7e1f458 100644
--- a/modules/calendar/e-calendar-preferences.c
+++ b/modules/calendar/e-calendar-preferences.c
@@ -925,31 +925,6 @@ calendar_preferences_construct (ECalendarPreferences *prefs,
        e_datetime_format_add_setup_widget (table, 0, "calendar", "table",  DTFormatKindDateTime, _("Ti_me 
and date:"));
        e_datetime_format_add_setup_widget (table, 1, "calendar", "table",  DTFormatKindDate, _("_Date 
only:"));
 
-       /* Hide senseless preferences when running in Express mode */
-       e_shell_hide_widgets_for_express_mode (shell, prefs->builder,
-                                              "label_second_zone",
-                                              "hbox_second_zone",
-                                              "timezone",
-                                              "timezone_label",
-                                              "hbox_use_system_timezone",
-                                              "hbox_time_divisions",
-                                              "show_end_times",
-                                              "month_scroll_by_week",
-                                              NULL);
-
-       /* HACK: GTK+ 2.18 and 2.20 has a GtkTable which includes
-        *       row/column spacing even for empty rows/columns.
-        *       When Evo runs in Express mode, we hide all the rows in
-        *       the Time section of the calendar's General preferences
-        *       page.  However, due to that behavior in GTK+, we get a
-        *       lot of extra spacing in that section.  Since we know that
-        *       in Express mode we only leave a single row visible, we'll
-        *       make the table's row spacing equal to 0 in that case. */
-       if (e_shell_get_express_mode (shell)) {
-               widget = e_builder_get_widget (prefs->builder, "time");
-               gtk_table_set_row_spacings (GTK_TABLE (widget), 0);
-       }
-
        /* Hook up and add the toplevel widget */
 
        target = e_cal_config_target_new_prefs (ec);
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 7d80bbc..a2e1628 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -503,13 +503,6 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
                        widget, "prefer-html",
                        G_SETTINGS_BIND_GET);
 
-       /* Sanitize the dialog for Express mode */
-       e_shell_hide_widgets_for_express_mode (
-               shell, prefs->builder,
-               "chkOutlookFilenames",
-               "chkTopSignature",
-               NULL);
-
        /* get our toplevel widget */
        target = em_config_target_new_prefs (ec);
        e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index f289b36..655f785 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -259,57 +259,3 @@ e_shell_utils_import_uris (EShell *shell,
        return g_strv_length ((gchar **) uris);
 }
 
-/**
- * e_shell_hide_widgets_for_express_mode:
- * @shell: an #EShell
- * @builder: a #GtkBuilder
- * @widget_name: first widget name to hide
- * @...: %NULL-terminated list of additional widget names to hide
- *
- * If Evolution is running in Express mode (i.e. if the specified @shell is
- * in Express mode), then this function will hide a list of widgets, based
- * on their specified names.  The list of names must be %NULL-terminated,
- * and each element of that list must be the name of a widget present in
- * @builder.  Those widgets will then get hidden.
- *
- * This can be used to simplify preference dialogs and such in an easy
- * fashion, for use in Express mode.
- *
- * If Evolution is not running in Express mode, this function does nothing.
- */
-void
-e_shell_hide_widgets_for_express_mode (EShell *shell,
-                                       GtkBuilder *builder,
-                                       const gchar *widget_name,
-                                       ...)
-{
-       va_list args;
-
-       g_return_if_fail (E_IS_SHELL (shell));
-       g_return_if_fail (GTK_IS_BUILDER (builder));
-       g_return_if_fail (widget_name != NULL);
-
-       if (!e_shell_get_express_mode (shell))
-               return;
-
-       va_start (args, widget_name);
-
-       while (widget_name != NULL) {
-               GObject *object;
-
-               object = gtk_builder_get_object (builder, widget_name);
-               if (!GTK_IS_WIDGET (object)) {
-                       g_error (
-                               "Object '%s' was not found in the builder "
-                               "file, or it is not a GtkWidget", widget_name);
-                       g_assert_not_reached ();
-               }
-
-               gtk_widget_hide (GTK_WIDGET (object));
-
-               widget_name = va_arg (args, const gchar *);
-       }
-
-       va_end (args);
-}
-
diff --git a/shell/e-shell-utils.h b/shell/e-shell-utils.h
index be0f4b4..6b62b89 100644
--- a/shell/e-shell-utils.h
+++ b/shell/e-shell-utils.h
@@ -41,12 +41,6 @@ GFile *              e_shell_run_save_dialog         (EShell *shell,
 guint          e_shell_utils_import_uris       (EShell *shell,
                                                 const gchar * const *uris);
 
-void           e_shell_hide_widgets_for_express_mode
-                                               (EShell *shell,
-                                                GtkBuilder *builder,
-                                                const gchar *widget_name,
-                                                ...) G_GNUC_NULL_TERMINATED;
-
 G_END_DECLS
 
 #endif /* E_SHELL_UTILS_H */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]