From c591e81bea3ae2f6e52626d397e4779bba65122d Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Fri, 25 Feb 2011 14:16:24 -0500 Subject: disconnect from icon theme on dispose --- src/app-indicator.c | 2 ++ 1 file changed, 2 insertions(+) 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; } -- cgit v1.2.3 From 8669272186348de996b9bcbdc919bfa63b803626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=BE=D0=BF=D0=BE?= =?UTF-8?q?=D0=B2?= Date: Sat, 26 Feb 2011 19:04:45 +0600 Subject: Updated appindicator.defs (fixes LP: #724917) --- bindings/python/appindicator.defs | 92 ++++++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 40 deletions(-) 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") + ) +) -- cgit v1.2.3 From 6c5c047edff7c565dc4d573dd40e50be5981eae2 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Mon, 28 Feb 2011 23:34:45 -0500 Subject: Set the includedir for appindicator3-0.1 to ${includedir}/libappindicator-0.1 --- src/appindicator3-0.1.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in index f59ac70..0ffe409 100644 --- a/src/appindicator3-0.1.pc.in +++ b/src/appindicator3-0.1.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -Cflags: -I${includedir}/libappindicator3-0.1 +Cflags: -I${includedir}/libappindicator-0.1 Requires: dbusmenu-glib-0.4 gtk+-3.0 Libs: -L${libdir} -lappindicator3 -- cgit v1.2.3 From 4490e2e731cb092b3d8fffb02cb8440e2cd7ea33 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Mar 2011 13:28:53 -0600 Subject: 0.2.97 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3