[nautilus-actions] nact/egg-sm-client: use GTK_CHECK_VERSION macro
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] nact/egg-sm-client: use GTK_CHECK_VERSION macro
- Date: Sun, 2 Jan 2011 14:09:05 +0000 (UTC)
commit efc6416b41a8718ffa42f73e7a729bf0ead9c279
Author: Pierre Wieser <pwieser trychlos org>
Date: Sun Jan 2 14:06:27 2011 +0100
nact/egg-sm-client: use GTK_CHECK_VERSION macro
ChangeLog | 4 +++-
src/nact/egg-sm-client-private.h | 2 +-
src/nact/egg-sm-client-xsmp.c | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4f9d1b1..518da65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,9 @@
* src/nact/egg-desktop-file.c:
Get ride of tests for Gtk+ 2.12.0 as this is the minimal required version.
- * src/nact/base-keysyms.h: Use GTK_CHECK_VERSION macro.
+ * src/nact/base-keysyms.h:
+ * src/nact/egg-sm-client-private.h:
+ * src/nact/egg-sm-client-xsmp.c: Use GTK_CHECK_VERSION macro.
* configure.ac:
* m4/na-check-for-gtk.m4:
diff --git a/src/nact/egg-sm-client-private.h b/src/nact/egg-sm-client-private.h
index cc5de42..aae7782 100644
--- a/src/nact/egg-sm-client-private.h
+++ b/src/nact/egg-sm-client-private.h
@@ -23,7 +23,7 @@
/* patch provided by Mathias Clasen
* see http://git.gnome.org/browse/libegg/commit/?id=0be81fa47fb5dabba2be40888ed5d4b16f0ae6a3
*/
-#if(( GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 91 && GTK_MICRO_VERSION >= 7 ) || GTK_MAJOR_VERSION >= 3 )
+#if GTK_CHECK_VERSION( 2, 91, 7 )
#include <gtk/gtk.h>
#else
/* GTK+ 3 includes this automatically */
diff --git a/src/nact/egg-sm-client-xsmp.c b/src/nact/egg-sm-client-xsmp.c
index 1456702..516baf0 100644
--- a/src/nact/egg-sm-client-xsmp.c
+++ b/src/nact/egg-sm-client-xsmp.c
@@ -40,7 +40,7 @@
/* patch provided by Mathias Clasen
* see http://git.gnome.org/browse/libegg/commit/?id=0be81fa47fb5dabba2be40888ed5d4b16f0ae6a3
*/
-#if(( GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 91 && GTK_MICRO_VERSION >= 7 ) || GTK_MAJOR_VERSION >= 3 )
+#if GTK_CHECK_VERSION( 2, 91, 7 )
#include <gdk/gdkx.h>
#endif
@@ -380,7 +380,7 @@ sm_client_xsmp_startup (EggSMClient *client,
free (ret_client_id);
gdk_threads_enter ();
-#if(( GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 91 && GTK_MICRO_VERSION >= 7 ) || GTK_MAJOR_VERSION >= 3 )
+#if GTK_CHECK_VERSION( 2, 91, 7 )
gdk_x11_set_sm_client_id (xsmp->client_id);
#else
gdk_set_sm_client_id (xsmp->client_id);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]