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

[Pierre Wieser <pwieser src gnome org>]

commit 0c6b99f83181231e241601f05a14a3599f72956b
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sun Jan 2 14:58:34 2011 +0100

    gtk_widget_size_request(): use GTK_CHECK_VERSION macro

 ChangeLog                      |    3 ++-
 src/nact/nact-gtk-utils.c      |   10 +++++-----
 src/nact/nact-iaction-tab.c    |   14 +++++++++-----
 src/nact/nact-main-statusbar.c |    8 ++++++--
 4 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3f618fe..3802ed9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,8 @@
 	* src/nact/nact-clipboard.c:
 	* src/nact/nact-tree-model-dnd.c:
 	* src/nact/nact-gtk-utils.c:
-	* src/nact/nact-iaction-tab.c: Use GTK_CHECK_VERSION macro.
+	* src/nact/nact-iaction-tab.c:
+	* src/nact/nact-main-statusbar.c: Use GTK_CHECK_VERSION macro.
 
 	* configure.ac:
 	* m4/na-check-for-gtk.m4:
diff --git a/src/nact/nact-gtk-utils.c b/src/nact/nact-gtk-utils.c
index c1d4c49..1389992 100644
--- a/src/nact/nact-gtk-utils.c
+++ b/src/nact/nact-gtk-utils.c
@@ -212,11 +212,11 @@ nact_gtk_utils_get_pixbuf( const gchar *name, GtkWidget *widget, GtkIconSize siz
 			}
 
 		} else {
-			/* gtk_widget_render_icon() is deprecated since Gtk+ 3.0
-			 * see http://library.gnome.org/devel/gtk/unstable/GtkWidget.html#gtk-widget-render-icon
-			 * and http://git.gnome.org/browse/gtk+/commit/?id=07eeae15825403037b7df139acf9bfa104d5559d
-			 */
-#if(( GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 91 ) || GTK_MAJOR_VERSION >= 3 )
+/* gtk_widget_render_icon() is deprecated since Gtk+ 3.0
+ * see http://library.gnome.org/devel/gtk/unstable/GtkWidget.html#gtk-widget-render-icon
+ * and http://git.gnome.org/browse/gtk+/commit/?id=07eeae15825403037b7df139acf9bfa104d5559d
+ */
+#if GTK_CHECK_VERSION( 2, 91, 7 )
 			pixbuf = gtk_widget_render_icon_pixbuf( widget, name, size );
 #else
 			pixbuf = gtk_widget_render_icon( widget, name, size, NULL );
diff --git a/src/nact/nact-iaction-tab.c b/src/nact/nact-iaction-tab.c
index 40ae1b7..8272fea 100644
--- a/src/nact/nact-iaction-tab.c
+++ b/src/nact/nact-iaction-tab.c
@@ -192,7 +192,11 @@ nact_iaction_tab_initial_load_toplevel( NactIActionTab *instance )
 	GtkFrame *frame;
 	GtkButton *button;
 	gint size;
-#if(( GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 91 ) || GTK_MAJOR_VERSION >= 3 )
+/* gtk_widget_size_request() is deprecated since Gtk+ 3.0
+ * see http://library.gnome.org/devel/gtk/unstable/GtkWidget.html#gtk-widget-render-icon
+ * and http://git.gnome.org/browse/gtk+/commit/?id=07eeae15825403037b7df139acf9bfa104d5559d
+ */
+#if GTK_CHECK_VERSION( 2, 91, 7 )
 	GtkRequisition minimal_size, natural_size;
 #else
 	GtkRequisition requisition;
@@ -209,7 +213,7 @@ nact_iaction_tab_initial_load_toplevel( NactIActionTab *instance )
 
 		button = GTK_BUTTON( base_window_get_widget( BASE_WINDOW( instance ), "ActionIconBrowseButton" ));
 		frame = GTK_FRAME( base_window_get_widget( BASE_WINDOW( instance ), "ActionIconFrame" ));
-#if(( GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 91 ) || GTK_MAJOR_VERSION >= 3 )
+#if GTK_CHECK_VERSION( 2, 91, 7 )
 		gtk_widget_get_preferred_size( GTK_WIDGET( button ), &minimal_size, &natural_size );
 		size = MAX( minimal_size.height, natural_size.height );
 #else
@@ -656,9 +660,9 @@ set_label_label( NactIActionTab *instance, const gchar *color_str )
 
 	label = base_window_get_widget( BASE_WINDOW( instance ), "ActionMenuLabelLabel" );
 
-	/* gtk_widget_modify_fg() is deprecated as of Gtk+ 3.0
-	 */
-#if(( GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 91 ) || GTK_MAJOR_VERSION >= 3 )
+/* gtk_widget_modify_fg() is deprecated as of Gtk+ 3.0
+ */
+#if GTK_CHECK_VERSION( 2, 91, 7 )
 	GdkRGBA color;
 	gdk_rgba_parse( &color, color_str );
 	gtk_widget_override_color( label, GTK_STATE_FLAG_ACTIVE, &color );
diff --git a/src/nact/nact-main-statusbar.c b/src/nact/nact-main-statusbar.c
index 0b39068..96cee00 100644
--- a/src/nact/nact-main-statusbar.c
+++ b/src/nact/nact-main-statusbar.c
@@ -63,7 +63,11 @@ nact_main_statusbar_initial_load_toplevel( NactMainWindow *window )
 	gint width, height;
 	GtkStatusbar *bar;
 	GtkFrame *frame;
-#if(( GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 91 ) || GTK_MAJOR_VERSION >= 3 )
+/* gtk_widget_size_request() is deprecated since Gtk+ 3.0
+ * see http://library.gnome.org/devel/gtk/unstable/GtkWidget.html#gtk-widget-render-icon
+ * and http://git.gnome.org/browse/gtk+/commit/?id=07eeae15825403037b7df139acf9bfa104d5559d
+ */
+#if GTK_CHECK_VERSION( 2, 91, 7 )
 	GtkRequisition minimal_size, natural_size;
 #else
 	GtkRequisition requisition;
@@ -76,7 +80,7 @@ nact_main_statusbar_initial_load_toplevel( NactMainWindow *window )
 	bar = get_statusbar( window );
 	frame = GTK_FRAME( base_window_get_widget( BASE_WINDOW( window ), "ActionLockedFrame" ));
 
-#if(( GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 91 ) || GTK_MAJOR_VERSION >= 3 )
+#if GTK_CHECK_VERSION( 2, 91, 7 )
 	gtk_widget_get_preferred_size( GTK_WIDGET( bar ), &minimal_size, &natural_size );
 	gtk_widget_set_size_request( GTK_WIDGET( bar ), natural_size.width, height+8 );
 #else