diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2012-11-05 17:22:01 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2012-11-05 17:22:01 +0100 |
| commit | 0bc9c19a1838eb93ae43cf36c76d6480e2e015f0 (patch) | |
| tree | 7e6a2d31ea9ca69da073647d2f6b23065fabfe5e | |
| parent | 5e96f18045e9d3fbb98893da64ac329ec6b3daa4 (diff) | |
| parent | 60825ab6ff90e0755dce38d533aecb677995ff24 (diff) | |
| download | ayatana-indicator-datetime-0bc9c19a1838eb93ae43cf36c76d6480e2e015f0.tar.gz ayatana-indicator-datetime-0bc9c19a1838eb93ae43cf36c76d6480e2e015f0.tar.bz2 ayatana-indicator-datetime-0bc9c19a1838eb93ae43cf36c76d6480e2e015f0.zip | |
* Backported r192 and r193, fix:
- "shows all-day events one day too early" (lp: #1000182)
- "Bogus insensitive events after clicking on different date"
(lp: #1069177)
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | src/datetime-prefs.c | 2 | ||||
| -rw-r--r-- | src/datetime-service.c | 10 |
3 files changed, 14 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 031b0c4..b8d8742 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +indicator-datetime (12.10.2-0ubuntu4) UNRELEASED; urgency=low + + * Backported r192 and r193, fix: + - "shows all-day events one day too early" (lp: #1000182) + - "Bogus insensitive events after clicking on different date" + (lp: #1069177) + + -- Sebastien Bacher <seb128@ubuntu.com> Mon, 05 Nov 2012 17:20:21 +0100 + indicator-datetime (12.10.2-0ubuntu3) quantal; urgency=low * Backport "fix off-by-one error" leading to have the settings item run diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c index d80a59f..952dce1 100644 --- a/src/datetime-prefs.c +++ b/src/datetime-prefs.c @@ -308,7 +308,7 @@ proxy_ready (GObject *object, GAsyncResult *res, IndicatorDatetimePanel * self) g_dbus_proxy_call (priv->proxy, "GetUsingNtp", NULL, G_DBUS_CALL_FLAGS_NONE, -1, priv->ntp_query_cancel, (GAsyncReadyCallback)ntp_query_answered, self); } - if (priv->tz_query_cancel == NULL); { + if (priv->tz_query_cancel == NULL) { priv->tz_query_cancel = g_cancellable_new(); g_dbus_proxy_call (priv->proxy, "GetTimezone", NULL, G_DBUS_CALL_FLAGS_NONE, -1, priv->tz_query_cancel, (GAsyncReadyCallback)tz_query_answered, self); diff --git a/src/datetime-service.c b/src/datetime-service.c index b34c23e..e63fed6 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -399,8 +399,10 @@ hide_all_appointments (void) { int i; - for (i=0; i<MAX_APPOINTMENT_MENUITEMS; i++) + for (i=0; i<MAX_APPOINTMENT_MENUITEMS; i++) { dbusmenu_menuitem_property_set_bool(appointments[i], DBUSMENU_MENUITEM_PROP_ENABLED, FALSE); + dbusmenu_menuitem_property_set_bool(appointments[i], DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); + } } static gboolean @@ -415,8 +417,6 @@ month_changed_cb (DbusmenuMenuitem * menuitem, gchar *name, GVariant *variant, g user. */ dbusmenu_menuitem_property_remove(menuitem, CALENDAR_MENUITEM_PROP_MARKS); - hide_all_appointments (); - g_idle_add(update_appointment_menu_items_idle, NULL); return TRUE; } @@ -446,8 +446,6 @@ day_selected_cb (DbusmenuMenuitem * menuitem, gchar *name, GVariant *variant, gu } } - hide_all_appointments (); - start_time_appointments = new_time; g_debug("Received day-selected with timestamp: %d -> %s",(int)start_time_appointments, ctime(&start_time_appointments)); @@ -864,7 +862,7 @@ update_appointment_menu_items (gpointer unused) // Due text if (full_day) { struct tm fulldaytime = {0}; - gmtime_r(&ci->start, &fulldaytime); + localtime_r(&ci->start, &fulldaytime); /* TRANSLATORS: This is a strftime string for the day for full day events in the menu. It should most likely be either '%A' for a full text day |