From 2ac753356ff14b8c17b44f919d73d0039d89742a Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 17 Feb 2010 23:18:23 +0100 Subject: releasing version 0.0.13-0ubuntu4 --- debian/changelog | 7 +++++++ src/libappindicator/app-indicator.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d92c9aa..1e782a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.13-0ubuntu4) lucid; urgency=low + + * Backport Cody Russell's change to fix rhythmbox crashing on closing + (lp: #522942) + + -- Sebastien Bacher Wed, 17 Feb 2010 23:13:10 +0100 + indicator-application (0.0.13-0ubuntu3) lucid; urgency=low * Backport trunk change to fix stock items labels (lp: #520048) diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 0324a34..bb3c71f 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -141,6 +141,7 @@ static void status_icon_changes (AppIndicator * self, gpointer data); static void status_icon_activate (GtkStatusIcon * icon, gpointer data); static void unfallback (AppIndicator * self, GtkStatusIcon * status_icon); static void watcher_proxy_destroyed (GObject * object, gpointer data); +static void client_menu_changed (GtkWidget *widget, GtkWidget *child, AppIndicator *indicator); /* GObject type */ G_DEFINE_TYPE (AppIndicator, app_indicator, G_TYPE_OBJECT); @@ -364,7 +365,10 @@ app_indicator_dispose (GObject *object) } if (priv->menu != NULL) { - g_object_unref(G_OBJECT(priv->menu)); + g_signal_handlers_disconnect_by_func (G_OBJECT (priv->menu), + client_menu_changed, + self); + g_object_unref(G_OBJECT(priv->menu)); priv->menu = NULL; } -- cgit v1.2.3 From d90b4c34fe41e19c4e71ee23e828ea529c3901a3 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 19 Feb 2010 11:53:37 -0500 Subject: * debian/patches/unregister.patch - Fix to remove the registration of dbus objects (LP: #497870) --- debian/changelog | 7 +++++++ debian/patches/unregister.patch | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 debian/patches/unregister.patch diff --git a/debian/changelog b/debian/changelog index 1e782a5..a63aa68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.13-0ubuntu5) UNRELEASED; urgency=low + + * debian/patches/unregister.patch + - Fix to remove the registration of dbus objects (LP: #497870) + + -- Ken VanDine Fri, 19 Feb 2010 11:16:13 -0500 + indicator-application (0.0.13-0ubuntu4) lucid; urgency=low * Backport Cody Russell's change to fix rhythmbox crashing on closing diff --git a/debian/patches/unregister.patch b/debian/patches/unregister.patch new file mode 100644 index 0000000..87b2bb2 --- /dev/null +++ b/debian/patches/unregister.patch @@ -0,0 +1,39 @@ +=== modified file 'src/libappindicator/app-indicator.c' +--- src/libappindicator/app-indicator.c 2010-02-17 22:04:09 +0000 ++++ src/libappindicator/app-indicator.c 2010-02-19 15:21:19 +0000 +@@ -598,6 +598,7 @@ + if (priv->id == NULL) return; + + gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->clean_id); ++ + dbus_g_connection_register_g_object(priv->connection, + path, + G_OBJECT(self)); +@@ -612,6 +613,8 @@ + /* Unable to get proxy, but we're handling that now so + it's not a warning anymore. */ + g_error_free(error); ++ dbus_g_connection_unregister_g_object(priv->connection, ++ G_OBJECT(self)); + start_fallback_timer(self, FALSE); + g_free(path); + return; +@@ -632,6 +635,8 @@ + AppIndicator * self = APP_INDICATOR(data); + g_return_if_fail(self != NULL); + ++ dbus_g_connection_unregister_g_object(self->priv->connection, ++ G_OBJECT(self)); + self->priv->watcher_proxy = NULL; + start_fallback_timer(self, FALSE); + return; +@@ -649,6 +654,8 @@ + /* They didn't respond, ewww. Not sure what they could + be doing */ + g_warning("Unable to connect to the Notification Watcher: %s", error->message); ++ dbus_g_connection_unregister_g_object(priv->connection, ++ G_OBJECT(data)); + g_object_unref(G_OBJECT(priv->watcher_proxy)); + priv->watcher_proxy = NULL; + start_fallback_timer(APP_INDICATOR(data), TRUE); + -- cgit v1.2.3 From 494d1b10b3a202806b988945ec485d33b7801dfe Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 19 Feb 2010 17:55:41 +0100 Subject: releasing version 0.0.13-0ubuntu5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a63aa68..7cbeb21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-application (0.0.13-0ubuntu5) UNRELEASED; urgency=low +indicator-application (0.0.13-0ubuntu5) lucid; urgency=low * debian/patches/unregister.patch - Fix to remove the registration of dbus objects (LP: #497870) - -- Ken VanDine Fri, 19 Feb 2010 11:16:13 -0500 + -- Ken VanDine Fri, 19 Feb 2010 17:55:11 +0100 indicator-application (0.0.13-0ubuntu4) lucid; urgency=low -- cgit v1.2.3 From b1e72a50c92348a707396990cea5474143bff8cf Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 19 Feb 2010 12:22:35 -0500 Subject: Cherry picked fix to check for a null string as the attention icon --- debian/changelog | 6 ++++++ src/application-service-appstore.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7cbeb21..da11c18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-application (0.0.13-0ubuntu6) lucid; urgency=low + + * Cherry picked fix to check for a null string as the attention icon + + -- Ken VanDine Fri, 19 Feb 2010 12:21:39 -0500 + indicator-application (0.0.13-0ubuntu5) lucid; urgency=low * debian/patches/unregister.patch diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index ec6da50..b189a45 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -397,7 +397,7 @@ apply_status (Application * app, ApplicationStatus status) } else { /* Figure out which icon we should be using */ gchar * newicon = app->icon; - if (status == APP_STATUS_ATTENTION && app->aicon != NULL) { + if (status == APP_STATUS_ATTENTION && app->aicon != NULL && app->aicon[0] != '\0') { newicon = app->aicon; } -- cgit v1.2.3 From a889ee7685e4d5d5cf8fe51467eb9ad8121475a1 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 19 Feb 2010 12:24:17 -0500 Subject: * Cherrypick fix to check for a null string as the attention icon * Cherrypick fix to remove the registration of dbus objects (LP: #497870) - lets us drop debian/patches/unregister.patch --- debian/changelog | 4 +++- debian/patches/unregister.patch | 39 ------------------------------------- src/libappindicator/app-indicator.c | 7 +++++++ 3 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 debian/patches/unregister.patch diff --git a/debian/changelog b/debian/changelog index da11c18..ce7af3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ indicator-application (0.0.13-0ubuntu6) lucid; urgency=low - * Cherry picked fix to check for a null string as the attention icon + * Cherrypick fix to check for a null string as the attention icon + * Cherrypick fix to remove the registration of dbus objects (LP: #497870) + - lets us drop debian/patches/unregister.patch -- Ken VanDine Fri, 19 Feb 2010 12:21:39 -0500 diff --git a/debian/patches/unregister.patch b/debian/patches/unregister.patch deleted file mode 100644 index 87b2bb2..0000000 --- a/debian/patches/unregister.patch +++ /dev/null @@ -1,39 +0,0 @@ -=== modified file 'src/libappindicator/app-indicator.c' ---- src/libappindicator/app-indicator.c 2010-02-17 22:04:09 +0000 -+++ src/libappindicator/app-indicator.c 2010-02-19 15:21:19 +0000 -@@ -598,6 +598,7 @@ - if (priv->id == NULL) return; - - gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->clean_id); -+ - dbus_g_connection_register_g_object(priv->connection, - path, - G_OBJECT(self)); -@@ -612,6 +613,8 @@ - /* Unable to get proxy, but we're handling that now so - it's not a warning anymore. */ - g_error_free(error); -+ dbus_g_connection_unregister_g_object(priv->connection, -+ G_OBJECT(self)); - start_fallback_timer(self, FALSE); - g_free(path); - return; -@@ -632,6 +635,8 @@ - AppIndicator * self = APP_INDICATOR(data); - g_return_if_fail(self != NULL); - -+ dbus_g_connection_unregister_g_object(self->priv->connection, -+ G_OBJECT(self)); - self->priv->watcher_proxy = NULL; - start_fallback_timer(self, FALSE); - return; -@@ -649,6 +654,8 @@ - /* They didn't respond, ewww. Not sure what they could - be doing */ - g_warning("Unable to connect to the Notification Watcher: %s", error->message); -+ dbus_g_connection_unregister_g_object(priv->connection, -+ G_OBJECT(data)); - g_object_unref(G_OBJECT(priv->watcher_proxy)); - priv->watcher_proxy = NULL; - start_fallback_timer(APP_INDICATOR(data), TRUE); - diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index bb3c71f..cd28bdd 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -598,6 +598,7 @@ check_connect (AppIndicator *self) if (priv->id == NULL) return; gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->clean_id); + dbus_g_connection_register_g_object(priv->connection, path, G_OBJECT(self)); @@ -612,6 +613,8 @@ check_connect (AppIndicator *self) /* Unable to get proxy, but we're handling that now so it's not a warning anymore. */ g_error_free(error); + dbus_g_connection_unregister_g_object(priv->connection, + G_OBJECT(self)); start_fallback_timer(self, FALSE); g_free(path); return; @@ -632,6 +635,8 @@ watcher_proxy_destroyed (GObject * object, gpointer data) AppIndicator * self = APP_INDICATOR(data); g_return_if_fail(self != NULL); + dbus_g_connection_unregister_g_object(self->priv->connection, + G_OBJECT(self)); self->priv->watcher_proxy = NULL; start_fallback_timer(self, FALSE); return; @@ -649,6 +654,8 @@ register_service_cb (DBusGProxy * proxy, GError * error, gpointer data) /* They didn't respond, ewww. Not sure what they could be doing */ g_warning("Unable to connect to the Notification Watcher: %s", error->message); + dbus_g_connection_unregister_g_object(priv->connection, + G_OBJECT(data)); g_object_unref(G_OBJECT(priv->watcher_proxy)); priv->watcher_proxy = NULL; start_fallback_timer(APP_INDICATOR(data), TRUE); -- cgit v1.2.3 From 5308b54ae9076e6ebdbce737d158869f19a5b9d2 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 19 Feb 2010 12:26:04 -0500 Subject: set to UNRELEASED --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ce7af3d..3a3f664 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-application (0.0.13-0ubuntu6) lucid; urgency=low +indicator-application (0.0.13-0ubuntu6) UNRELEASED; urgency=low * Cherrypick fix to check for a null string as the attention icon * Cherrypick fix to remove the registration of dbus objects (LP: #497870) -- cgit v1.2.3 From 05db164a8664cc978a4b54683265ff74d1e667b4 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 19 Feb 2010 18:52:46 +0100 Subject: releasing version 0.0.13-0ubuntu6 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3a3f664..c413172 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-application (0.0.13-0ubuntu6) UNRELEASED; urgency=low +indicator-application (0.0.13-0ubuntu6) lucid; urgency=low * Cherrypick fix to check for a null string as the attention icon * Cherrypick fix to remove the registration of dbus objects (LP: #497870) - lets us drop debian/patches/unregister.patch - -- Ken VanDine Fri, 19 Feb 2010 12:21:39 -0500 + -- Ken VanDine Fri, 19 Feb 2010 18:52:40 +0100 indicator-application (0.0.13-0ubuntu5) lucid; urgency=low -- cgit v1.2.3 From d0087bc21f0468fed2fe6d5e048a449ade2c8070 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Mon, 22 Feb 2010 17:50:42 +0100 Subject: releasing version 0.0.13-0ubuntu7 --- debian/changelog | 7 +++++++ src/libappindicator/app-indicator.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index c413172..f54da04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.13-0ubuntu7) lucid; urgency=low + + * Backported upstream change to fix menu item sensitivity update, + thanks to Jan Arne Petersen (lp: #522151) + + -- Sebastien Bacher Mon, 22 Feb 2010 17:49:23 +0100 + indicator-application (0.0.13-0ubuntu6) lucid; urgency=low * Cherrypick fix to check for a null string as the attention icon diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index cd28bdd..74c1a23 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -1245,6 +1245,10 @@ container_iterate (GtkWidget *widget, } } + dbusmenu_menuitem_property_set_bool (child, + DBUSMENU_MENUITEM_PROP_ENABLED, + GTK_WIDGET_IS_SENSITIVE (widget)); + g_signal_connect (widget, "notify", G_CALLBACK (widget_notify_cb), child); -- cgit v1.2.3