diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-03-23 14:13:12 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-03-23 14:13:12 +0800 |
| commit | 67dbffdc24041bcceee74da2c070c43de259ae3d (patch) | |
| tree | c7feb8fe0a932793c4e6d832832ef6ae8b414e2f /x11/gnome-panel | |
| parent | cee9614054bec6e94320b7fc3e489edeb452553d (diff) | |
| download | marcuscom-ports-67dbffdc24041bcceee74da2c070c43de259ae3d.tar marcuscom-ports-67dbffdc24041bcceee74da2c070c43de259ae3d.tar.gz marcuscom-ports-67dbffdc24041bcceee74da2c070c43de259ae3d.tar.bz2 marcuscom-ports-67dbffdc24041bcceee74da2c070c43de259ae3d.tar.lz marcuscom-ports-67dbffdc24041bcceee74da2c070c43de259ae3d.tar.xz marcuscom-ports-67dbffdc24041bcceee74da2c070c43de259ae3d.tar.zst marcuscom-ports-67dbffdc24041bcceee74da2c070c43de259ae3d.zip | |
Avoid a memory leak in the previous timezone location commit.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10810 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-panel')
| -rw-r--r-- | x11/gnome-panel/Makefile | 4 | ||||
| -rw-r--r-- | x11/gnome-panel/files/patch-applets_clock_clock-location.c | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 0fafc126b..3db46e916 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-panel/Makefile,v 1.175 2008/03/11 02:28:48 mezz Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.176 2008/03/23 03:39:55 marcus Exp $ # PORTNAME= gnome-panel PORTVERSION= 2.22.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-location.c b/x11/gnome-panel/files/patch-applets_clock_clock-location.c index 7ab6064a0..1bb485f32 100644 --- a/x11/gnome-panel/files/patch-applets_clock_clock-location.c +++ b/x11/gnome-panel/files/patch-applets_clock_clock-location.c @@ -1,5 +1,5 @@ --- applets/clock/clock-location.c.orig 2008-03-22 21:14:45.000000000 -0400 -+++ applets/clock/clock-location.c 2008-03-22 23:30:43.000000000 -0400 ++++ applets/clock/clock-location.c 2008-03-23 02:11:34.000000000 -0400 @@ -28,6 +28,8 @@ #include "set-timezone.h" #include "gweather-xml.h" @@ -37,18 +37,23 @@ monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, NULL); -@@ -632,9 +638,12 @@ gboolean +@@ -632,10 +638,17 @@ gboolean clock_location_is_current (ClockLocation *loc) { ClockLocationPrivate *priv = PRIVATE (loc); - const char *zone; + ClockZoneTable *zones; + char *zone; -+ -+ zones = clock_zonetable_new (SYSTEM_ZONEINFODIR); - if ((zone = zone_from_etc_sysconfig_clock ())) -+ if ((zone = clock_location_guess_zone (zones))) ++ zones = clock_zonetable_new (SYSTEM_ZONEINFODIR); ++ ++ if ((zone = clock_location_guess_zone (zones))) { ++ g_object_unref (zones); return strcmp (zone, priv->timezone) == 0; ++ } ++ ++ g_object_unref (zones); return clock_location_get_offset (loc) == 0; + } |