diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-06-07 11:34:25 -0400 |
|---|---|---|
| committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-06-07 11:34:25 -0400 |
| commit | 1d4bcddfc33392da493c97fd75eda058e492579d (patch) | |
| tree | 41f93938311f484335aee4ac4bbfe4702616f4a9 | |
| parent | 12cc75fba26176cef0eb2ed8b98d0b377e10519f (diff) | |
| parent | 4adb2af27c3b195856d6b22234beec70da8b7c04 (diff) | |
| download | libayatana-indicator-1d4bcddfc33392da493c97fd75eda058e492579d.tar.gz libayatana-indicator-1d4bcddfc33392da493c97fd75eda058e492579d.tar.bz2 libayatana-indicator-1d4bcddfc33392da493c97fd75eda058e492579d.zip | |
Merge lp:~larsu/call-ido-init
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | tools/indicator-loader.c | 2 |
3 files changed, 6 insertions, 1 deletions
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/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 diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index 2ec9913..ff3a71b 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -24,6 +24,7 @@ License along with this library. If not, see #include <gtk/gtk.h> #include <libindicator/indicator-object.h> +#include <libido/libido.h> #if GTK_MAJOR_VERSION == 3 #include <libindicator/indicator-ng.h> @@ -212,6 +213,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); |