[PATCH 5/9] Dropped ifdefs for gtkmm 2.16 now that the minimum required is 2.20
- From: Kalev Lember <kalevlember gmail com>
- To: nemiver-list gnome org
- Cc: Kalev Lember <kalev smartlink ee>
- Subject: [PATCH 5/9] Dropped ifdefs for gtkmm 2.16 now that the minimum required is 2.20
- Date: Wed, 23 Mar 2011 18:44:16 +0200
* src/uicommon/nmv-ui-utils.h: Removed #ifdef HAVE_GTKMM_2_16.
* configure.ac: Removed HAVE_GTKMM_2_16 define.
---
configure.ac | 2 --
src/uicommon/nmv-ui-utils.h | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index aa7f8df..472b87d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -311,8 +311,6 @@ NEMIVERUICOMMON_LIBS="$NEMIVERUICOMMON_LIBS $CPPUNIT_LIBS"
AC_SUBST(NEMIVERUICOMMON_LIBS)
AC_SUBST(NEMIVERUICOMMON_CFLAGS)
-PKG_CHECK_EXISTS([gtkmm-2.4 >= 2.16], [AC_DEFINE([HAVE_GTKMM_2_16], [1], [gtkmm is at least 2.16])])
-
dnl library dependencies for the nemiver workbench module
dnl dependencies list already declared above
diff --git a/src/uicommon/nmv-ui-utils.h b/src/uicommon/nmv-ui-utils.h
index 2c245c0..8962b6a 100644
--- a/src/uicommon/nmv-ui-utils.h
+++ b/src/uicommon/nmv-ui-utils.h
@@ -117,10 +117,10 @@ public:
default:
THROW ("should never reach this point");
}
-#ifdef HAVE_GTKMM_2_16
+
if (result)
result->set_is_important (m_is_important);
-#endif
+
return result;
}
};//end class ActionEntry
--
1.7.4
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]