diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2010-02-17 23:18:23 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2010-02-17 23:18:23 +0100 |
| commit | 2ac753356ff14b8c17b44f919d73d0039d89742a (patch) | |
| tree | 1d0a13b1a3e09eb0604e963bec5d8c43fee083d4 | |
| parent | 60b206c8ce2e5393029765f7c6a93b36f47acfd7 (diff) | |
| download | ayatana-indicator-application-2ac753356ff14b8c17b44f919d73d0039d89742a.tar.gz ayatana-indicator-application-2ac753356ff14b8c17b44f919d73d0039d89742a.tar.bz2 ayatana-indicator-application-2ac753356ff14b8c17b44f919d73d0039d89742a.zip | |
releasing version 0.0.13-0ubuntu40.0.13-0ubuntu4
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/libappindicator/app-indicator.c | 6 |
2 files changed, 12 insertions, 1 deletions
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 <seb128@ubuntu.com> 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; } |