diff options
| author | Ted Gould <ted@gould.cx> | 2011-07-07 16:23:04 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-07-07 16:23:04 -0500 |
| commit | 1819f029c3f3af6922e095e959e80b1ce446148b (patch) | |
| tree | 7f1b50533fb2363bd26918be73dd1349fadb672e /src/indicator-datetime.c | |
| parent | 7cb01301fdb2e2889d8ab8c09275c25d9dd28f01 (diff) | |
| parent | 51c6800c6f718c07bd0cd016a5acdf5652f7e9c4 (diff) | |
| download | ayatana-indicator-datetime-1819f029c3f3af6922e095e959e80b1ce446148b.tar.gz ayatana-indicator-datetime-1819f029c3f3af6922e095e959e80b1ce446148b.tar.bz2 ayatana-indicator-datetime-1819f029c3f3af6922e095e959e80b1ce446148b.zip | |
Import upstream version 0.2.91
Diffstat (limited to 'src/indicator-datetime.c')
| -rw-r--r-- | src/indicator-datetime.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index 800fa87..072253b 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -41,9 +41,9 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libindicator/indicator-service-manager.h> /* DBusMenu */ -#include <libdbusmenu-gtk/menu.h> +#include <libdbusmenu-gtk3/menu.h> #include <libido/libido.h> -#include <libdbusmenu-gtk/menuitem.h> +#include <libdbusmenu-gtk3/menuitem.h> #include "utils.h" #include "dbus-shared.h" @@ -761,11 +761,18 @@ set_label_to_time_in_zone (IndicatorDatetime * self, GtkLabel * label, GTimeZone * tz, const gchar * format, GDateTime ** datetime) { + gboolean unref_tz = FALSE; + if (tz == NULL) { + gchar * zone = read_timezone (); + if (zone == NULL) + return; + tz = g_time_zone_new(zone); + unref_tz = TRUE; + g_free (zone); + } + GDateTime * datetime_now; - if (tz == NULL) - datetime_now = g_date_time_new_now_local(); - else - datetime_now = g_date_time_new_now(tz); + datetime_now = g_date_time_new_now(tz); gchar * timestr; if (format == NULL) { @@ -793,6 +800,9 @@ set_label_to_time_in_zone (IndicatorDatetime * self, GtkLabel * label, else g_date_time_unref(datetime_now); + if (unref_tz) + g_time_zone_unref(tz); + return; } |