gnome-panel r11436 - trunk/applets/clock

[vuntz svn gnome org]

Author: vuntz
Date: Thu Jan  8 14:55:30 2009
New Revision: 11436
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11436&view=rev

Log:
2009-01-08  Vincent Untz  <vuntz gnome org>

	* clock-utils.[ch]: (clock_locale_supports_am_pm): new
	(clock_locale_format): use clock_locale_supports_am_pm
	* clock.c: (ensure_prefs_window_is_created): hide the options to use 12
	or 24 hour format if there's no AM/PM string.
	* clock.glade: name a widget


Modified:
   trunk/applets/clock/ChangeLog
   trunk/applets/clock/clock-utils.c
   trunk/applets/clock/clock-utils.h
   trunk/applets/clock/clock.c
   trunk/applets/clock/clock.glade

Modified: trunk/applets/clock/clock-utils.c
==============================================================================
--- trunk/applets/clock/clock-utils.c	(original)
+++ trunk/applets/clock/clock-utils.c	Thu Jan  8 14:55:30 2009
@@ -38,19 +38,26 @@
 
 #include "clock-utils.h"
 
-ClockFormat
-clock_locale_format (void)
+gboolean
+clock_locale_supports_am_pm (void)
 {
 #ifdef HAVE_NL_LANGINFO
         const char *am;
 
         am = nl_langinfo (AM_STR);
-        return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12;
+        return (am[0] != '\0');
 #else
-	return CLOCK_FORMAT_24;
+	return TRUE;
 #endif
 }
 
+ClockFormat
+clock_locale_format (void)
+{
+	return clock_locale_supports_am_pm () ?
+		CLOCK_FORMAT_12 : CLOCK_FORMAT_24;
+}
+
 void
 clock_utils_display_help (GtkWidget  *widget,
 			  const char *doc_id,

Modified: trunk/applets/clock/clock-utils.h
==============================================================================
--- trunk/applets/clock/clock-utils.h	(original)
+++ trunk/applets/clock/clock-utils.h	Thu Jan  8 14:55:30 2009
@@ -41,6 +41,7 @@
 	CLOCK_FORMAT_CUSTOM
 } ClockFormat;
 
+gboolean clock_locale_supports_am_pm (void);
 ClockFormat clock_locale_format (void);
 
 void clock_utils_display_help (GtkWidget  *widget,

Modified: trunk/applets/clock/clock.c
==============================================================================
--- trunk/applets/clock/clock.c	(original)
+++ trunk/applets/clock/clock.c	Thu Jan  8 14:55:30 2009
@@ -3531,6 +3531,7 @@
         GtkWidget *edit_window;
 	GtkWidget *prefs_close_button;
 	GtkWidget *prefs_help_button;
+	GtkWidget *clock_options;
         GtkWidget *edit_cancel_button;
         GtkWidget *edit_ok_button;
         GtkWidget *location_box;
@@ -3547,8 +3548,12 @@
 
         prefs_close_button = glade_xml_get_widget (cd->glade_xml, "prefs-close-button");
         prefs_help_button = glade_xml_get_widget (cd->glade_xml, "prefs-help-button");
+        clock_options = glade_xml_get_widget (cd->glade_xml, "clock-options");
         cd->prefs_locations = GTK_TREE_VIEW (glade_xml_get_widget (cd->glade_xml, "cities_list"));
 
+	if (!clock_locale_supports_am_pm ())
+		gtk_widget_hide (clock_options);
+
         selection = gtk_tree_view_get_selection (cd->prefs_locations);
         g_signal_connect (G_OBJECT (selection), "changed",
                           G_CALLBACK (prefs_locations_changed), cd);

Modified: trunk/applets/clock/clock.glade
==============================================================================
--- trunk/applets/clock/clock.glade	(original)
+++ trunk/applets/clock/clock.glade	Thu Jan  8 14:55:30 2009
@@ -99,7 +99,7 @@
 	      <property name="spacing">18</property>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox18">
+		<widget class="GtkVBox" id="clock-options">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">6</property>