[nautilus-actions] gtk_widget_is_sensitive(): use GTK_CHECK_VERSION macro

[Pierre Wieser <pwieser src gnome org>]

commit 2d804eef0d8e10e2194d66191ff83e7c1267b696
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sun Jan 2 14:39:15 2011 +0100

    gtk_widget_is_sensitive(): use GTK_CHECK_VERSION macro

 ChangeLog                             |    5 ++++-
 src/nact/egg-sm-client-private.h      |    6 +++---
 src/nact/nact-add-capability-dialog.c |    7 ++++++-
 src/nact/nact-add-scheme-dialog.c     |    7 ++++++-
 src/nact/nact-main-tab.c              |    7 ++++++-
 5 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 518da65..c8aa02f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,10 @@
 
 	* src/nact/base-keysyms.h:
 	* src/nact/egg-sm-client-private.h:
-	* src/nact/egg-sm-client-xsmp.c: Use GTK_CHECK_VERSION macro.
+	* src/nact/egg-sm-client-xsmp.c: 
+	* src/nact/nact-add-capability-dialog.c:
+	* src/nact/nact-add-scheme-dialog.c:
+	* src/nact/nact-main-tab.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 aae7782..b28361c 100644
--- a/src/nact/egg-sm-client-private.h
+++ b/src/nact/egg-sm-client-private.h
@@ -20,12 +20,12 @@
 #ifndef __EGG_SM_CLIENT_PRIVATE_H__
 #define __EGG_SM_CLIENT_PRIVATE_H__
 
+#include <gtk/gtk.h>
+
 /* patch provided by Mathias Clasen
  * see http://git.gnome.org/browse/libegg/commit/?id=0be81fa47fb5dabba2be40888ed5d4b16f0ae6a3
  */
-#if GTK_CHECK_VERSION( 2, 91, 7 )
-#include <gtk/gtk.h>
-#else
+#if !GTK_CHECK_VERSION( 2, 91, 7 )
 /* GTK+ 3 includes this automatically */
 #include <gdkconfig.h>
 #endif
diff --git a/src/nact/nact-add-capability-dialog.c b/src/nact/nact-add-capability-dialog.c
index bca510d..7ed327b 100644
--- a/src/nact/nact-add-capability-dialog.c
+++ b/src/nact/nact-add-capability-dialog.c
@@ -547,7 +547,12 @@ try_for_send_ok( NactAddCapabilityDialog *dialog )
 
 	button = base_window_get_widget( BASE_WINDOW( dialog ), "OKButton" );
 
-#if(( GTK_MAJOR_VERSION > 2 ) || ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 18 ))
+/* gtk_widget_is_sensitive() appears with Gtk+ 2.17.5 released on 2009-07-18
+ * see http://git.gnome.org/browse/gtk+/commit/?id=8f6017622937770082f7b49dfbe135fae5608704
+ * GTK_WIDGET_IS_SENSITIVE macro is deprecated since 2.19.7 released on 2010-03-09
+ * see http://git.gnome.org/browse/gtk+/commit/?id=a27d5a2c9eba7af5b056de32ff9b2b4dd1eb97e1
+ */
+#if GTK_CHECK_VERSION( 2, 17, 5 )
 	is_sensitive = gtk_widget_is_sensitive( button );
 #else
 	is_sensitive = GTK_WIDGET_IS_SENSITIVE( button );
diff --git a/src/nact/nact-add-scheme-dialog.c b/src/nact/nact-add-scheme-dialog.c
index ca76a01..66ca96f 100644
--- a/src/nact/nact-add-scheme-dialog.c
+++ b/src/nact/nact-add-scheme-dialog.c
@@ -406,7 +406,12 @@ try_for_send_ok( NactAddSchemeDialog *dialog )
 
 	button = base_window_get_widget( BASE_WINDOW( dialog ), "OKButton" );
 
-#if(( GTK_MAJOR_VERSION > 2 ) || ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 18 ))
+/* gtk_widget_is_sensitive() appears with Gtk+ 2.17.5 released on 2009-07-18
+ * see http://git.gnome.org/browse/gtk+/commit/?id=8f6017622937770082f7b49dfbe135fae5608704
+ * GTK_WIDGET_IS_SENSITIVE macro is deprecated since 2.19.7 released on 2010-03-09
+ * see http://git.gnome.org/browse/gtk+/commit/?id=a27d5a2c9eba7af5b056de32ff9b2b4dd1eb97e1
+ */
+#if GTK_CHECK_VERSION( 2, 17, 5 )
 	is_sensitive = gtk_widget_is_sensitive( button );
 #else
 	is_sensitive = GTK_WIDGET_IS_SENSITIVE( button );
diff --git a/src/nact/nact-main-tab.c b/src/nact/nact-main-tab.c
index acd3d85..c2901c1 100644
--- a/src/nact/nact-main-tab.c
+++ b/src/nact/nact-main-tab.c
@@ -75,7 +75,12 @@ nact_main_tab_is_page_enabled( NactMainWindow *window, gint num_page )
 	notebook = GTK_NOTEBOOK( base_window_get_widget( BASE_WINDOW( window ), "MainNotebook" ));
 	page = gtk_notebook_get_nth_page( notebook, num_page );
 
-#if(( GTK_MAJOR_VERSION > 2 ) || ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 18 ))
+/* gtk_widget_is_sensitive() appears with Gtk+ 2.17.5 released on 2009-07-18
+ * see http://git.gnome.org/browse/gtk+/commit/?id=8f6017622937770082f7b49dfbe135fae5608704
+ * GTK_WIDGET_IS_SENSITIVE macro is deprecated since 2.19.7 released on 2010-03-09
+ * see http://git.gnome.org/browse/gtk+/commit/?id=a27d5a2c9eba7af5b056de32ff9b2b4dd1eb97e1
+ */
+#if GTK_CHECK_VERSION( 2, 17, 5 )
 	is_sensitive = gtk_widget_is_sensitive( page );
 #else
 	is_sensitive = GTK_WIDGET_IS_SENSITIVE( page );