diff options
| author | Michael Terry <mike@mterry.name> | 2011-01-26 11:12:48 -0500 |
|---|---|---|
| committer | Michael Terry <mike@mterry.name> | 2011-01-26 11:12:48 -0500 |
| commit | c023a16ebdef8c0bdbd10cdfe9cf753afad1191b (patch) | |
| tree | a1d73dda564a4246ad5fb2084f63aa6953b1e706 | |
| parent | 665f9ece45a30a255c85aab6b9a855dda8a56b1d (diff) | |
| download | ayatana-indicator-datetime-c023a16ebdef8c0bdbd10cdfe9cf753afad1191b.tar.gz ayatana-indicator-datetime-c023a16ebdef8c0bdbd10cdfe9cf753afad1191b.tar.bz2 ayatana-indicator-datetime-c023a16ebdef8c0bdbd10cdfe9cf753afad1191b.zip | |
fix some crashes
| -rw-r--r-- | src/datetime-service.c | 1 | ||||
| -rw-r--r-- | src/indicator-datetime.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/datetime-service.c b/src/datetime-service.c index 020371f..d80fc18 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -415,6 +415,7 @@ update_appointment_menu_items (gpointer user_data) { i++; } g_free(ecal); // Really we should do the setup somewhere where we know it'll only run once, right now, we'll do it every time and free it. + ecal = NULL; return TRUE; } diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index a07e667..288ab26 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -340,7 +340,7 @@ service_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data) } if (error != NULL) { - g_error("Could not grab DBus proxy for %s: %s", SERVICE_NAME, error->message); + g_warning("Could not grab DBus proxy for %s: %s", SERVICE_NAME, error->message); g_error_free(error); return; } @@ -1182,7 +1182,7 @@ new_appointment_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbu dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent); g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(indicator_prop_change_cb), mi_data); - g_signal_connect(G_OBJECT(newitem), "destroyed", G_CALLBACK(g_free), mi_data); + g_signal_connect_swapped(G_OBJECT(newitem), "destroyed", G_CALLBACK(g_free), mi_data); return TRUE; } |