diff options
Diffstat (limited to 'x11/gnome-panel/files/patch-applets_clock_clock.c')
| -rw-r--r-- | x11/gnome-panel/files/patch-applets_clock_clock.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c index 9767645..ccf5378 100644 --- a/x11/gnome-panel/files/patch-applets_clock_clock.c +++ b/x11/gnome-panel/files/patch-applets_clock_clock.c @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- applets/clock/clock.c 2002/05/14 14:08:16 1.1 -+++ applets/clock/clock.c 2002/05/14 14:12:56 -@@ -14,7 +14,9 @@ +--- applets/clock/clock.c.orig Tue Jan 13 11:55:58 2004 ++++ applets/clock/clock.c Wed Jan 14 15:43:39 2004 +@@ -47,7 +47,9 @@ #include <dirent.h> #include <string.h> #include <time.h> @@ -13,15 +10,15 @@ $FreeBSD$ #include <panel-applet.h> #include <panel-applet-gconf.h> -@@ -684,7 +686,11 @@ - cd->hourformat = panel_applet_gconf_get_int (applet, KEY_HOUR_FORMAT, &error); - if (error || (cd->hourformat != 12 && cd->hourformat != 24)) { - /* if value is not valid, set it according to locale */ +@@ -539,7 +541,11 @@ + { + const char *am; + +#ifdef HAVE_LANGINFO_H - const char *am = nl_langinfo (AM_STR); + am = nl_langinfo (AM_STR); +#else -+ const char *am = "AM"; ++ am = "AM"; +#endif - cd->hourformat = (am[0] == '\0') ? 24 : 12; + return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12; + } - if (error) |
