gnome-panel r11011 - trunk/applets/clock

[vuntz svn gnome org]

Author: vuntz
Date: Tue Apr  8 15:30:19 2008
New Revision: 11011
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11011&view=rev

Log:
2008-04-08  Vincent Untz  <vuntz gnome org>

	Use the right directory for timezone data on Solaris.
	Based on patch by Brian Cameron <brian cameron sun com>
	Fix bug #515085.
	Also use the right evolution text domain for timezone translations.

	* Makefile.am: remove definition of SYSTEM_ZONEINFODIR, and update the
	evolution text domain
	* clock-zoneinfo.h: define SYSTEM_ZONEINFODIR
	* clock-zonetable.[ch]: (clock_zonetable_new): do not take an argument,
	and directly use the defined value for the directory
	* clock.c: (fill_clock_applet): updated


Modified:
   trunk/applets/clock/ChangeLog
   trunk/applets/clock/Makefile.am
   trunk/applets/clock/clock-zoneinfo.h
   trunk/applets/clock/clock-zonetable.c
   trunk/applets/clock/clock-zonetable.h
   trunk/applets/clock/clock.c

Modified: trunk/applets/clock/Makefile.am
==============================================================================
--- trunk/applets/clock/Makefile.am	(original)
+++ trunk/applets/clock/Makefile.am	Tue Apr  8 15:30:19 2008
@@ -18,8 +18,7 @@
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
 	-DCLOCK_EDS_ICONDIR="\"$(CLOCK_EDS_ICONDIR)\""		\
 	-DCLOCK_TIME_UTILITY="\"$(CLOCK_TIME_UTILITY)\""	\
-	-DEVOLUTION_TEXTDOMAIN=\"evolution-2.12\"		\
-	-DSYSTEM_ZONEINFODIR=\"/usr/share/zoneinfo\"		\
+	-DEVOLUTION_TEXTDOMAIN=\"evolution-2.22\"		\
 	-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE
 
 if HAVE_LIBECAL

Modified: trunk/applets/clock/clock-zoneinfo.h
==============================================================================
--- trunk/applets/clock/clock-zoneinfo.h	(original)
+++ trunk/applets/clock/clock-zoneinfo.h	Tue Apr  8 15:30:19 2008
@@ -6,6 +6,12 @@
 
 G_BEGIN_DECLS
 
+#ifdef HAVE_SOLARIS
+#define SYSTEM_ZONEINFODIR "/usr/share/lib/zoneinfo/tab"
+#else
+#define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo"
+#endif
+
 #define CLOCK_ZONEINFO_TYPE         (clock_zoneinfo_get_type ())
 #define CLOCK_ZONEINFO(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), CLOCK_ZONEINFO_TYPE, ClockZoneInfo))
 #define CLOCK_ZONEINFO_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), CLOCK_ZONEINFO_TYPE, ClockZoneInfoClass))

Modified: trunk/applets/clock/clock-zonetable.c
==============================================================================
--- trunk/applets/clock/clock-zonetable.c	(original)
+++ trunk/applets/clock/clock-zonetable.c	Tue Apr  8 15:30:19 2008
@@ -115,7 +115,7 @@
 #define PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CLOCK_ZONETABLE_TYPE, ClockZoneTablePrivate))
 
 ClockZoneTable *
-clock_zonetable_new (gchar *zoneinfodir)
+clock_zonetable_new (void)
 {
         ClockZoneTable *this;
         ClockZoneTablePrivate *priv;
@@ -123,8 +123,17 @@
         this = g_object_new (CLOCK_ZONETABLE_TYPE, NULL);
         priv = PRIVATE (this);
 
-        priv->zonetab = g_build_filename (zoneinfodir, "zone.tab", NULL);
-        priv->iso3166 = g_build_filename (zoneinfodir, "iso3166.tab", NULL);
+#ifdef HAVE_SOLARIS
+        priv->zonetab = g_build_filename (SYSTEM_ZONEINFODIR,
+                                          "zone_sun.tab", NULL);
+        priv->iso3166 = g_build_filename (SYSTEM_ZONEINFODIR,
+                                          "country.tab", NULL);
+#else
+        priv->zonetab = g_build_filename (SYSTEM_ZONEINFODIR,
+                                          "zone.tab", NULL);
+        priv->iso3166 = g_build_filename (SYSTEM_ZONEINFODIR,
+                                          "iso3166.tab", NULL);
+#endif
 
 #ifdef CLOCK_TEXTDOMAIN
         /* this is used when clock is embedded in the gnome-panel

Modified: trunk/applets/clock/clock-zonetable.h
==============================================================================
--- trunk/applets/clock/clock-zonetable.h	(original)
+++ trunk/applets/clock/clock-zonetable.h	Tue Apr  8 15:30:19 2008
@@ -28,7 +28,7 @@
 
 GType clock_zonetable_get_type (void);
 
-ClockZoneTable *clock_zonetable_new (gchar *zonetab);
+ClockZoneTable *clock_zonetable_new (void);
 ClockZoneInfo *clock_zonetable_get_zone (ClockZoneTable *this, gchar *name);
 ClockZoneInfo *clock_zonetable_get_l10n_zone (ClockZoneTable *this, gchar *l10n_name);
 GList *clock_zonetable_get_zones (ClockZoneTable *this);

Modified: trunk/applets/clock/clock.c
==============================================================================
--- trunk/applets/clock/clock.c	(original)
+++ trunk/applets/clock/clock.c	Tue Apr  8 15:30:19 2008
@@ -2746,7 +2746,7 @@
                         }
         }
 
-        cd->zones = clock_zonetable_new (SYSTEM_ZONEINFODIR);
+        cd->zones = clock_zonetable_new ();
 
         bonobo_ui_component_set_prop (popup_component,
                                       "/commands/ClockConfig",