From 0b07840e26f7c793939ec8226695ffca19aa1bfb Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Mon, 26 Apr 2010 18:13:24 -0500
Subject: Don't use gconf to store the names of widgets to hide

That was just for development.  Now we hardcode the lists of widgets.

Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
 calendar/gui/apps_evolution_calendar.schemas.in | 20 --------------------
 calendar/gui/dialogs/cal-prefs-dialog.c         | 11 ++++++++++-
 2 files changed, 10 insertions(+), 21 deletions(-)

(limited to 'calendar')

diff --git a/calendar/gui/apps_evolution_calendar.schemas.in b/calendar/gui/apps_evolution_calendar.schemas.in
index 66c2467a76..70590ee0ca 100644
--- a/calendar/gui/apps_evolution_calendar.schemas.in
+++ b/calendar/gui/apps_evolution_calendar.schemas.in
@@ -802,25 +802,5 @@
          </long>
       </locale>
     </schema>
-
-    <!-- Widgets to hide in Express mode -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/express_preferences_hidden</key>
-      <applyto>/apps/evolution/calendar/express_preferences_hidden</applyto>
-      <owner>evolution-calendar</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[label_second_zone,hbox_second_zone,timezone,timezone_label,hbox_use_system_timezone,hbox_time_divisions,show_end_times,month_scroll_by_week]</default>
-      <locale name="C">
-         <short>List of controls to hide when in Express mode</short>
-         <long>
-	   List of names for the controls in the user interface,
-	   which should be hidden when Evolution is running in Express
-	   mode.
-	   This pertains to the calendar preferences in cal-prefs-dialog.ui.
-         </long>
-      </locale>
-    </schema>
   </schemalist>
 </gconfschemafile>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index e778b6cbcd..21675b4a0d 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -778,7 +778,16 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
 	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, "/apps/evolution/calendar/express_preferences_hidden");
+	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
-- 
cgit v1.2.3