diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-04-05 03:11:39 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-04-05 03:11:39 +0000 |
| commit | c4851e78e4f63338fe9a4883e5b7a0370dce27f7 (patch) | |
| tree | 3910aa2e83f782cec94f15b4547dadb741cd29ce /x11/gnomepanel/files/patch-applets_clock_clock.c | |
| parent | Add gnomekeyring, an API and daemon for managing lists of credentials. This (diff) | |
Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release
ever. It fixes many bugs, and adds some features missing in previous
FreeBSD ports. To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:
http://www.freebsd.org/gnome/docs/faq26.html
Please read it carefully. GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:
http://www.marcuscom.com/tinderbox/
The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts. We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.
Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>
Diffstat (limited to 'x11/gnomepanel/files/patch-applets_clock_clock.c')
| -rw-r--r-- | x11/gnomepanel/files/patch-applets_clock_clock.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/x11/gnomepanel/files/patch-applets_clock_clock.c b/x11/gnomepanel/files/patch-applets_clock_clock.c index 976764570ff1..ccf5378b135f 100644 --- a/x11/gnomepanel/files/patch-applets_clock_clock.c +++ b/x11/gnomepanel/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) |