From c156b45819d746c8d700aa2e28a215b66ba6f94a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 8 Mar 2011 15:58:16 -0600 Subject: Dropping the client_menu_changed function as dbusmenu should do this for us. --- src/app-indicator.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 01fdd5a..fc640da 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -184,7 +184,6 @@ static void status_icon_menu_activate (GtkStatusIcon *status_icon, guint button, static void unfallback (AppIndicator * self, GtkStatusIcon * status_icon); static gchar * append_panel_icon_suffix (const gchar * icon_name); static void watcher_owner_changed (GObject * obj, GParamSpec * pspec, gpointer user_data); -static void client_menu_changed (GtkWidget *widget, GtkWidget *child, AppIndicator *indicator); static void theme_changed_cb (GtkIconTheme * theme, gpointer user_data); static GVariant * bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * property, GError ** error, gpointer user_data); static void bus_method_call (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * method, GVariant * params, GDBusMethodInvocation * invocation, gpointer user_data); @@ -637,10 +636,7 @@ app_indicator_dispose (GObject *object) } if (priv->menu != NULL) { - g_signal_handlers_disconnect_by_func (G_OBJECT (priv->menu), - client_menu_changed, - self); - g_object_unref(G_OBJECT(priv->menu)); + g_object_unref(G_OBJECT(priv->menu)); priv->menu = NULL; } @@ -1925,14 +1921,6 @@ setup_dbusmenu (AppIndicator *self) return; } -static void -client_menu_changed (GtkWidget *widget, - GtkWidget *child, - AppIndicator *indicator) -{ - setup_dbusmenu (indicator); -} - /** app_indicator_set_menu: @self: The #AppIndicator @@ -1967,14 +1955,7 @@ app_indicator_set_menu (AppIndicator *self, GtkMenu *menu) check_connect (self); - g_signal_connect (menu, - "child-added", - G_CALLBACK (client_menu_changed), - self); - g_signal_connect (menu, - "child-removed", - G_CALLBACK (client_menu_changed), - self); + return; } /** -- cgit v1.2.3 -- cgit v1.2.3 From 29f86302e8f05d241de715dd44fe7975f1d6a54f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 10 Mar 2011 12:28:45 -0600 Subject: Adding a TargetEnvironment to the desktop file --- tests/test-libappindicator.desktop | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/test-libappindicator.desktop b/tests/test-libappindicator.desktop index 59be810..f8a72f3 100644 --- a/tests/test-libappindicator.desktop +++ b/tests/test-libappindicator.desktop @@ -6,18 +6,19 @@ Exec=/usr/bin/false Terminal=false Type=Application X-Ayatana-Desktop-Shortcuts=Short1;Short2;Short3; +TargetEnvironment=Test Program; [Short1 Shortcut Group] Name=Shortcut 1 Exec=/usr/bin/true -OnlyShowIn=Test Program; +TargetEnvironment=Test Program; [Short2 Shortcut Group] Name=Shortcut 2 Exec=/usr/bin/true -OnlyShowIn=Test Program; +TargetEnvironment=Test Program; [Short3 Shortcut Group] Name=Shortcut 3 Exec=/usr/bin/true -OnlyShowIn=Test Program; +TargetEnvironment=Test Program; -- cgit v1.2.3 From 0f9fc0fa4eba3103c0c2a0d2168167997c545a79 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 10 Mar 2011 12:28:53 -0600 Subject: 0.2.98 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8720bba..3af905a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libappindicator, 0.2.97, ted@canonical.com) +AC_INIT(libappindicator, 0.2.98, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libappindicator, 0.2.97) +AM_INIT_AUTOMAKE(libappindicator, 0.2.98) AM_MAINTAINER_MODE -- cgit v1.2.3 From 38951a7bfbd92cbb354754d5dc4b2b1d53f3f251 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 10 Mar 2011 13:36:02 -0600 Subject: releasing version 0.2.98-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 80eb080..cebc8be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libappindicator (0.2.98-0ubuntu1~ppa1) UNRELEASED; urgency=low +libappindicator (0.2.98-0ubuntu1~ppa1) natty; urgency=low * New upstream release. ∘ Don't watch signals we don't need to. (LP: #728503) - -- Ted Gould Thu, 10 Mar 2011 12:59:05 -0600 + -- Ted Gould Thu, 10 Mar 2011 13:35:59 -0600 libappindicator (0.2.97-0ubuntu1) natty; urgency=low -- cgit v1.2.3