diff options
| author | karl-qdh <karl@qdh.org.uk> | 2011-01-31 10:30:06 +0000 |
|---|---|---|
| committer | karl-qdh <karl@qdh.org.uk> | 2011-01-31 10:30:06 +0000 |
| commit | 93a2d0e1f1b238e2c77eaa2ceb0070d92c72b317 (patch) | |
| tree | c7f8d60340becc5c0e6d72c4ecb57b1363fc59de /src/indicator-datetime.c | |
| parent | 665f9ece45a30a255c85aab6b9a855dda8a56b1d (diff) | |
| parent | c023a16ebdef8c0bdbd10cdfe9cf753afad1191b (diff) | |
| download | ayatana-indicator-datetime-93a2d0e1f1b238e2c77eaa2ceb0070d92c72b317.tar.gz ayatana-indicator-datetime-93a2d0e1f1b238e2c77eaa2ceb0070d92c72b317.tar.bz2 ayatana-indicator-datetime-93a2d0e1f1b238e2c77eaa2ceb0070d92c72b317.zip | |
Added mterry's merge
Diffstat (limited to 'src/indicator-datetime.c')
| -rw-r--r-- | src/indicator-datetime.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index a07e667..7aef969 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; } @@ -1117,7 +1117,7 @@ indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, gchar * value, in Copied verbatim from an old revision (including comments) of indicator-messages */ static gboolean -new_appointment_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) +new_appointment_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data) { g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE); g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE); @@ -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; } |