diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -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 | 14 |
7 files changed, 36 insertions, 25 deletions
@@ -1,5 +1,17 @@ # Generated by Makefile. Do not edit. +2011-03-23 Ted Gould <ted@gould.cx> + + 0.3.0 + +2011-03-23 Ted Gould <ted@gould.cx> + + Use icon-name instead of GIcon in the fallback GtkStatusIcon + +2011-03-23 Ted Gould <ted@gould.cx> + + Set gtk_status_icon using icon_name instead of gicon + 2011-03-16 Ted Gould <ted@gould.cx> 0.2.99 @@ -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.99. +# Generated by GNU Autoconf 2.67 for libappindicator 0.3.0. # # 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.99' -PACKAGE_STRING='libappindicator 0.2.99' +PACKAGE_VERSION='0.3.0' +PACKAGE_STRING='libappindicator 0.3.0' 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.99 to adapt to many kinds of systems. +\`configure' configures libappindicator 0.3.0 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.99:";; + short | recursive ) echo "Configuration of libappindicator 0.3.0:";; 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.99 +libappindicator configure 0.3.0 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.99, which was +It was created by libappindicator $as_me 0.3.0, 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.99 + VERSION=0.3.0 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.99, which was +This file was extended by libappindicator $as_me 0.3.0, 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.99 +libappindicator config.status 0.3.0 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e8b1d6c..360df06 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libappindicator, 0.2.99, ted@canonical.com) +AC_INIT(libappindicator, 0.3.0, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libappindicator, 0.2.99) +AM_INIT_AUTOMAKE(libappindicator, 0.3.0) AM_MAINTAINER_MODE diff --git a/debian/changelog b/debian/changelog index 44267d1..4b8ce40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libappindicator (0.3.0-0ubuntu1~ppa1) UNRELEASED; urgency=low + + * New upstream release. + * Don't use GIcon with GtkStatusIcon (LP: #708118) + + -- Ted Gould <ted@ubuntu.com> Wed, 23 Mar 2011 15:33:44 -0500 + libappindicator (0.2.99-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/docs/reference/libappindicator-docs.sgml b/docs/reference/libappindicator-docs.sgml index aa38ebc..82b8560 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.99 + for libappindicator 0.3.0 </releaseinfo> </bookinfo> diff --git a/docs/reference/version.xml b/docs/reference/version.xml index 556f9e2..0d91a54 100644 --- a/docs/reference/version.xml +++ b/docs/reference/version.xml @@ -1 +1 @@ -0.2.99 +0.3.0 diff --git a/src/app-indicator.c b/src/app-indicator.c index 347e168..cc785ca 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1471,34 +1471,26 @@ static void status_icon_changes (AppIndicator * self, gpointer data) { GtkStatusIcon * icon = GTK_STATUS_ICON(data); - GIcon *themed_icon = NULL; gchar *longname = NULL; switch (app_indicator_get_status(self)) { case APP_INDICATOR_STATUS_PASSIVE: longname = append_panel_icon_suffix(app_indicator_get_icon(self)); - themed_icon = g_themed_icon_new_with_default_fallbacks (longname); gtk_status_icon_set_visible(icon, FALSE); - gtk_status_icon_set_from_gicon(icon, themed_icon); + gtk_status_icon_set_from_icon_name(icon, longname); break; case APP_INDICATOR_STATUS_ACTIVE: longname = append_panel_icon_suffix(app_indicator_get_icon(self)); - themed_icon = g_themed_icon_new_with_default_fallbacks (longname); - gtk_status_icon_set_from_gicon(icon, themed_icon); + gtk_status_icon_set_from_icon_name(icon, longname); gtk_status_icon_set_visible(icon, TRUE); break; case APP_INDICATOR_STATUS_ATTENTION: longname = append_panel_icon_suffix(app_indicator_get_attention_icon(self)); - themed_icon = g_themed_icon_new_with_default_fallbacks (longname); - gtk_status_icon_set_from_gicon(icon, themed_icon); + gtk_status_icon_set_from_icon_name(icon, longname); gtk_status_icon_set_visible(icon, TRUE); break; }; - if (themed_icon) { - g_object_unref (themed_icon); - } - if (longname) { g_free(longname); } |