diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | docs/reference/libappindicator-docs.sgml | 2 | ||||
| -rw-r--r-- | docs/reference/version.xml | 2 | ||||
| -rw-r--r-- | src/app-indicator.c | 23 | ||||
| -rw-r--r-- | tests/test-libappindicator.desktop | 7 |
8 files changed, 47 insertions, 38 deletions
@@ -1,5 +1,25 @@ # Generated by Makefile. Do not edit. +2011-03-10 Ted Gould <ted@gould.cx> + + 0.2.98 + +2011-03-10 Ted Gould <ted@gould.cx> + + Adding a TargetEnvironment to the desktop file + +2011-03-09 Ted Gould <ted@gould.cx> + + Don't watch signals we shouldn't need to. + +2011-03-08 Ted Gould <ted@gould.cx> + + Attaching bug number + +2011-03-08 Ted Gould <ted@gould.cx> + + Dropping the client_menu_changed function as dbusmenu should do this for us. + 2011-03-03 Ted Gould <ted@gould.cx> 0.2.97 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for libappindicator 0.2.97. +# Generated by GNU Autoconf 2.67 for libappindicator 0.2.98. # # Report bugs to <ted@canonical.com>. # @@ -763,8 +763,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libappindicator' PACKAGE_TARNAME='libappindicator' -PACKAGE_VERSION='0.2.97' -PACKAGE_STRING='libappindicator 0.2.97' +PACKAGE_VERSION='0.2.98' +PACKAGE_STRING='libappindicator 0.2.98' PACKAGE_BUGREPORT='ted@canonical.com' PACKAGE_URL='' @@ -1581,7 +1581,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libappindicator 0.2.97 to adapt to many kinds of systems. +\`configure' configures libappindicator 0.2.98 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1651,7 +1651,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libappindicator 0.2.97:";; + short | recursive ) echo "Configuration of libappindicator 0.2.98:";; esac cat <<\_ACEOF @@ -1793,7 +1793,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libappindicator configure 0.2.97 +libappindicator configure 0.2.98 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2073,7 +2073,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libappindicator $as_me 0.2.97, which was +It was created by libappindicator $as_me 0.2.98, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2894,7 +2894,7 @@ fi # Define the identity of the package. PACKAGE=libappindicator - VERSION=0.2.97 + VERSION=0.2.98 cat >>confdefs.h <<_ACEOF @@ -14120,7 +14120,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libappindicator $as_me 0.2.97, which was +This file was extended by libappindicator $as_me 0.2.98, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14186,7 +14186,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libappindicator config.status 0.2.97 +libappindicator config.status 0.2.98 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" 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 diff --git a/debian/changelog b/debian/changelog index 0f5b4b4..43d7d6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libappindicator (0.2.98-0ubuntu1) natty; urgency=low + + * New upstream release. + ∘ Don't watch signals we don't need to. (LP: #728503) + + -- Ted Gould <ted@ubuntu.com> Thu, 10 Mar 2011 13:35:59 -0600 + libappindicator (0.2.97-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/docs/reference/libappindicator-docs.sgml b/docs/reference/libappindicator-docs.sgml index f826aaa..ff2d812 100644 --- a/docs/reference/libappindicator-docs.sgml +++ b/docs/reference/libappindicator-docs.sgml @@ -8,7 +8,7 @@ <bookinfo> <title>libappindicator Reference Manual</title> <releaseinfo> - for libappindicator 0.2.97 + for libappindicator 0.2.98 </releaseinfo> </bookinfo> diff --git a/docs/reference/version.xml b/docs/reference/version.xml index 832560a..c2f0a83 100644 --- a/docs/reference/version.xml +++ b/docs/reference/version.xml @@ -1 +1 @@ -0.2.97 +0.2.98 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; } /** 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; |