diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-04 15:52:21 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-04 15:52:21 -0600 |
| commit | d55485874e75f38e18b5ace2ee45455900dafcfe (patch) | |
| tree | 21df60d487251441d459a34824dc78e86392a8d0 | |
| parent | f4a727b6f697774d6238f4110a8417892ed91396 (diff) | |
| parent | 8855894205bae81b1423a2004caf2c421e720229 (diff) | |
| download | ayatana-indicator-datetime-d55485874e75f38e18b5ace2ee45455900dafcfe.tar.gz ayatana-indicator-datetime-d55485874e75f38e18b5ace2ee45455900dafcfe.tar.bz2 ayatana-indicator-datetime-d55485874e75f38e18b5ace2ee45455900dafcfe.zip | |
* Upstream Merge
* Debugging statements and cleaning code a bit
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/datetime-service.c | 20 |
2 files changed, 17 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index f3e1b00..e4a31d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt3) UNRELEASED; urgency=low + + * Upstream Merge + * Debugging statements and cleaning code a bit + + -- Ted Gould <ted@ubuntu.com> Fri, 04 Feb 2011 15:51:57 -0600 + indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt2) natty; urgency=low * Upstream Merge diff --git a/src/datetime-service.c b/src/datetime-service.c index 6a925bb..f2efcfe 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -295,7 +295,6 @@ update_appointment_menu_items (gpointer user_data) { time_t t1, t2; gchar *query, *is, *ie, *ad; GList *objects = NULL, *l; - DbusmenuMenuitem * item = NULL; GError *gerror = NULL; gint i; gint width, height; @@ -318,19 +317,18 @@ update_appointment_menu_items (gpointer user_data) { } g_debug("Number of objects returned: %d", g_list_length(objects)); gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); + + /* Remove all of the previous appointments */ if (appointments != NULL) { g_debug("Freeing old appointments"); - for (l = appointments; l; l = l->next) { - g_debug("Freeing old appointment"); - item = l->data; + while (appointments != NULL) { + DbusmenuMenuitem * litem = DBUSMENU_MENUITEM(appointments->data); + g_debug("Freeing old appointment: %p", litem); // Remove all the existing menu items which are in appointments. - appointments = g_list_remove(appointments, item); - dbusmenu_menuitem_child_delete(root, DBUSMENU_MENUITEM(item)); - //g_free(item); freeing makes it crash :/ is that a double free from child delete? - g_object_unref(G_OBJECT(item)); - item = NULL; + appointments = g_list_remove(appointments, litem); + dbusmenu_menuitem_child_delete(root, DBUSMENU_MENUITEM(litem)); + g_object_unref(G_OBJECT(litem)); } - appointments = NULL; } // Sort the list see above FIXME regarding queries @@ -346,6 +344,7 @@ update_appointment_menu_items (gpointer user_data) { char right[20]; //const gchar *uri; struct tm tmp_tm; + DbusmenuMenuitem * item; ECalComponentVType vtype = e_cal_component_get_vtype (ecalcomp); @@ -444,6 +443,7 @@ update_appointment_menu_items (gpointer user_data) { dbusmenu_menuitem_child_add_position (root, item, 4+i); appointments = g_list_append (appointments, item); // Keep track of the items here to make them east to remove + g_debug("Adding appointment: %p", item); if (i == 4) break; // See above FIXME regarding query result limit i++; |