From f77f41e21ade7d44ede8c990959807adf77a430b Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 23 May 2013 09:02:44 -0400 Subject: indicator-image-helper: stop using deprecated gtk_icon_info_free() --- libindicator/indicator-image-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index aff9e39..04cc71d 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -119,7 +119,7 @@ refresh_image (GtkImage * image) } if (icon_info != NULL) { - gtk_icon_info_free (icon_info); + g_object_unref(icon_info); } } -- cgit v1.2.3 From a5913055316b1d2efe05435db3ed78898e8042d9 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 23 May 2013 09:04:13 -0400 Subject: Depend on ido and call ido_init() in indicator-loader Ido provides the custom menu items that indicator services request. ido_init() registers those items with gtk+, so that they'll be created from gtk_menu_new_from_model(). --- configure.ac | 4 +++- tools/indicator-loader.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3dc40f1..698d64b 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,7 @@ AS_IF([test "x$enable_deprecations" = xno], GTK_REQUIRED_VERSION=2.18 GTK3_REQUIRED_VERSION=3.6 GIO_UNIX_REQUIRED_VERSION=2.37 +IDO_REQUIRED_VERSION=13.10.0 AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk], @@ -54,7 +55,8 @@ AC_ARG_WITH([gtk], AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION gmodule-2.0 - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION + libido3-0.1 >= $IDO_REQUIRED_VERSION) ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index 5659dea..ca34bf0 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -24,6 +24,7 @@ License along with this library. If not, see #include #include +#include #if GTK_MAJOR_VERSION == 3 #include @@ -211,6 +212,7 @@ main (int argc, char ** argv) g_unsetenv("UBUNTU_MENUPROXY"); gtk_init(&argc, &argv); + ido_init (); entry_to_menuitem = g_hash_table_new (g_direct_hash, g_direct_equal); -- cgit v1.2.3 From f9c097164aeaa8648d59af7510a63ca5d83ce298 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 27 May 2013 12:08:30 -0400 Subject: debian/control: add ido dependency --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 698ceda..fee7987 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 9), libglib2.0-dev (>= 2.37), libgtk2.0-dev (>= 2.18), libgtk-3-dev (>= 2.91.3), + libido3-0.1-dev (>= 13.10.0) Standards-Version: 3.9.2 Homepage: https://launchpad.net/libindicator # If you aren't a member of ~indicator-applet-developers but need to upload -- cgit v1.2.3 From 4adb2af27c3b195856d6b22234beec70da8b7c04 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 4 Jun 2013 13:11:17 -0400 Subject: Revert r490 It's already applied on trunk --- libindicator/indicator-image-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 04cc71d..aff9e39 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -119,7 +119,7 @@ refresh_image (GtkImage * image) } if (icon_info != NULL) { - g_object_unref(icon_info); + gtk_icon_info_free (icon_info); } } -- cgit v1.2.3