diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | ChangeLog | 28 | ||||
| -rw-r--r-- | bindings/python/appindicator.defs | 92 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | docs/reference/html/ch01.html | 2 | ||||
| -rw-r--r-- | docs/reference/html/index.html | 2 | ||||
| -rw-r--r-- | docs/reference/libappindicator-docs.sgml | 2 | ||||
| -rw-r--r-- | docs/reference/version.xml | 2 | ||||
| -rw-r--r-- | src/app-indicator.c | 2 |
11 files changed, 110 insertions, 56 deletions
@@ -22,3 +22,4 @@ Sense Egbert Hofstede Sense Hofstede Ted Gould + Артём Попов @@ -1,5 +1,33 @@ # Generated by Makefile. Do not edit. +2011-03-03 Ted Gould <ted@gould.cx> + + 0.2.97 + +2011-03-02 Ted Gould <ted@gould.cx> + + Adding additional functions into Python bindings + +2011-02-26 Артём Попов <artfwo@gmail.com> + + Updated appindicator.defs (fixes LP: #724917) + +2011-03-02 Ted Gould <ted@gould.cx> + + Fixing the pkgconfig file + +2011-02-28 Ken VanDine <ken.vandine@canonical.com> + + Set the includedir for appindicator3-0.1 to ${includedir}/libappindicator-0.1 + +2011-03-02 Ted Gould <ted@gould.cx> + + Drop theme signal handler when shutting down. + +2011-02-25 Michael Terry <mike@mterry.name> + + disconnect from icon theme on dispose + 2011-02-24 Ted Gould <ted@gould.cx> 0.2.96 diff --git a/bindings/python/appindicator.defs b/bindings/python/appindicator.defs index cc8ae75..4fcc2d5 100644 --- a/bindings/python/appindicator.defs +++ b/bindings/python/appindicator.defs @@ -33,7 +33,6 @@ ) ) - ;; From app-indicator.h (define-function app_indicator_get_type @@ -62,57 +61,50 @@ ) ) -(define-method set_label +(define-method set_attention_icon (of-object "AppIndicator") - (c-name "app_indicator_set_label") + (c-name "app_indicator_set_attention_icon_full") (return-type "none") (parameters - '("const-gchar*" "label" (null-ok)) - '("const-gchar*" "guide" (null-ok) (default "NULL")) + '("const-gchar*" "icon_name") + '("const-gchar*" "icon_desc" (null-ok) (default "NULL")) ) ) -(define-method set_accessible_desc +(define-method set_menu (of-object "AppIndicator") - (c-name "app_indicator_set_accessible_desc") + (c-name "app_indicator_set_menu") (return-type "none") (parameters - '("const-gchar*" "accessible_desc" (null-ok)) - ) -) - -(define-method set_ordering_index - (of-object "AppIndicator") - (c-name "app_indicator_set_ordering_index") - (parameters - '("guint32" "ordering_index") + '("GtkMenu*" "menu") ) ) -(define-method set_attention_icon +(define-method set_icon (of-object "AppIndicator") - (c-name "app_indicator_set_attention_icon") + (c-name "app_indicator_set_icon_full") (return-type "none") (parameters '("const-gchar*" "icon_name") + '("const-gchar*" "icon_desc" (null-ok) (default "NULL")) ) ) -(define-method set_menu +(define-method set_label (of-object "AppIndicator") - (c-name "app_indicator_set_menu") + (c-name "app_indicator_set_label") (return-type "none") (parameters - '("GtkMenu*" "menu") + '("const-gchar*" "label" (null-ok)) + '("const-gchar*" "guide" (null-ok) (default "NULL")) ) ) -(define-method set_icon +(define-method set_ordering_index (of-object "AppIndicator") - (c-name "app_indicator_set_icon") - (return-type "none") + (c-name "app_indicator_set_ordering_index") (parameters - '("const-gchar*" "icon_name") + '("guint32" "ordering_index") ) ) @@ -143,46 +135,66 @@ (return-type "AppIndicatorStatus") ) -(define-method get_label +(define-method get_icon (of-object "AppIndicator") - (c-name "app_indicator_get_label") + (c-name "app_indicator_get_icon") (return-type "const-gchar*") ) -(define-method get_label_guide +(define-method get_icon_desc (of-object "AppIndicator") - (c-name "app_indicator_get_label_guide") + (c-name "app_indicator_get_icon_desc") (return-type "const-gchar*") ) -(define-method get_accessible_desc +(define-method get_icon_theme_path (of-object "AppIndicator") - (c-name "app_indicator_get_accessible_desc") + (c-name "app_indicator_get_icon_theme_path") (return-type "const-gchar*") ) -(define-method get_ordering_index +(define-method get_attention_icon (of-object "AppIndicator") - (c-name "app_indicator_get_ordering_index") - (return-type "guint32") + (c-name "app_indicator_get_attention_icon") + (return-type "const-gchar*") ) -(define-method get_icon +(define-method get_attention_icon_desc (of-object "AppIndicator") - (c-name "app_indicator_get_icon") + (c-name "app_indicator_get_attention_icon_desc") (return-type "const-gchar*") ) -(define-method get_icon_theme_path +(define-method get_menu (of-object "AppIndicator") - (c-name "app_indicator_get_icon_theme_path") + (c-name "app_indicator_get_menu") + (return-type "GtkMenu*") +) + +(define-method get_label + (of-object "AppIndicator") + (c-name "app_indicator_get_label") (return-type "const-gchar*") ) -(define-method get_attention_icon +(define-method get_label_guide (of-object "AppIndicator") - (c-name "app_indicator_get_attention_icon") + (c-name "app_indicator_get_label_guide") (return-type "const-gchar*") ) +(define-method get_ordering_index + (of-object "AppIndicator") + (c-name "app_indicator_get_ordering_index") + (return-type "guint32") +) +(define-method build_menu_from_desktop + (of-object "AppIndicator") + (c-name "app_indicator_build_menu_from_desktop") + (return-type "none") + (parameters + '("const-gchar*" "desktop_file") + '("const-gchar*" "desktop_profile") + ) +) @@ -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.96. +# Generated by GNU Autoconf 2.67 for libappindicator 0.2.97. # # 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.96' -PACKAGE_STRING='libappindicator 0.2.96' +PACKAGE_VERSION='0.2.97' +PACKAGE_STRING='libappindicator 0.2.97' 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.96 to adapt to many kinds of systems. +\`configure' configures libappindicator 0.2.97 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.96:";; + short | recursive ) echo "Configuration of libappindicator 0.2.97:";; 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.96 +libappindicator configure 0.2.97 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.96, which was +It was created by libappindicator $as_me 0.2.97, 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.96 + VERSION=0.2.97 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.96, which was +This file was extended by libappindicator $as_me 0.2.97, 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.96 +libappindicator config.status 0.2.97 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 248c28f..8720bba 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libappindicator, 0.2.96, ted@canonical.com) +AC_INIT(libappindicator, 0.2.97, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libappindicator, 0.2.96) +AM_INIT_AUTOMAKE(libappindicator, 0.2.97) AM_MAINTAINER_MODE diff --git a/debian/changelog b/debian/changelog index 72c3b15..875295e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libappindicator (0.2.97-0ubuntu1~ppa1) UNRELEASED; urgency=low + + * New upstream release. + * Set includedir to the location of the headers provided by + libappindicator-dev (LP: #721562) + * Fix crash when importing appindicator from Python (LP: #724917). + * Fix crash when switching themes by disconnecting a signal from + the theme on dispose. LP: #708188 + + -- Ted Gould <ted@ubuntu.com> Thu, 03 Mar 2011 13:33:54 -0600 + libappindicator (0.2.96-0ubuntu4) natty; urgency=low * src/appindicator3-0.1.pc.in diff --git a/docs/reference/html/ch01.html b/docs/reference/html/ch01.html index fc7fd09..2ff4b9f 100644 --- a/docs/reference/html/ch01.html +++ b/docs/reference/html/ch01.html @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id538329"></a>Base Classes for Applications</h2></div></div></div> +<a name="id488802"></a>Base Classes for Applications</h2></div></div></div> <div class="toc"><dl><dt> <span class="refentrytitle"><a href="libappindicator-app-indicator.html">AppIndicator</a></span><span class="refpurpose"> — An object to put application information into the panel.</span> diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html index ef6a0a0..4db260d 100644 --- a/docs/reference/html/index.html +++ b/docs/reference/html/index.html @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libappindicator Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libappindicator 0.2.95 + for libappindicator 0.2.96 </p></div> </div> <hr> diff --git a/docs/reference/libappindicator-docs.sgml b/docs/reference/libappindicator-docs.sgml index a749a68..f826aaa 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.96 + for libappindicator 0.2.97 </releaseinfo> </bookinfo> diff --git a/docs/reference/version.xml b/docs/reference/version.xml index 27feebe..832560a 100644 --- a/docs/reference/version.xml +++ b/docs/reference/version.xml @@ -1 +1 @@ -0.2.96 +0.2.97 diff --git a/src/app-indicator.c b/src/app-indicator.c index 167e17f..01fdd5a 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -667,6 +667,8 @@ app_indicator_dispose (GObject *object) priv->connection = NULL; } + g_signal_handlers_disconnect_by_func(gtk_icon_theme_get_default(), G_CALLBACK(theme_changed_cb), self); + G_OBJECT_CLASS (app_indicator_parent_class)->dispose (object); return; } |