[nautilus-actions] Fix test against nautilus_menu_provider_get_toolbar_items()
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] Fix test against nautilus_menu_provider_get_toolbar_items()
- Date: Mon, 25 Jul 2011 20:24:06 +0000 (UTC)
commit 8b802b5297b0565d9b6a33582bcf9695c3dd2b06
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Jul 25 22:23:48 2011 +0200
Fix test against nautilus_menu_provider_get_toolbar_items()
Fix #655237 - Toolbar icons are not created.
Rather logically, testing a function is only relevant when the library is
already referenced in the LIBS variable...
ChangeLog | 5 +++++
configure.ac | 7 +++----
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 22356d2..ab9fd05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-25 Pierre Wieser <pwieser trychlos org>
+
+ * configure.ac: Fix test for nautilus_menu_provider_get_toolbar_items().
+ Fix #655237 - Toolbar icons are not created.
+
2011-07-03 Pierre Wieser <pwieser trychlos org>
* configure.ac: Post-release version bump.
diff --git a/configure.ac b/configure.ac
index 76258eb..0ad9492 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,9 +151,6 @@ NA_CHECK_MODULE([NAUTILUS_EXTENSION],[libnautilus-extension >= 2.16])
AC_SUBST([NAUTILUS_ACTIONS_CFLAGS])
AC_SUBST([NAUTILUS_ACTIONS_LIBS])
-# starting with 2.91.90, Nautilus no more allows extensions to add toolbar items
-AC_CHECK_FUNCS([nautilus_menu_provider_get_toolbar_items])
-
# check for gtk-doc
# - starting with gtk-doc 1.15, multiple source dirs are directly handled
# by gtk-doc.make
@@ -190,7 +187,9 @@ AC_DEFINE([NAUTILUS_ACTIONS_DEBUG],["NAUTILUS_ACTIONS_DEBUG"],[Debug environment
# Check for menu update function
AC_CHECK_LIB(nautilus-extension, nautilus_menu_item_new)
-AC_CHECK_FUNCS(nautilus_menu_provider_emit_items_updated_signal)
+AC_CHECK_FUNCS([nautilus_menu_provider_emit_items_updated_signal])
+# starting with 2.91.90, Nautilus no more allows extensions to add toolbar items
+AC_CHECK_FUNCS([nautilus_menu_provider_get_toolbar_items])
# display and keep configuration informations
config_options="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]