[evolution-rss] fix gtk2/3 conditionals

[Lucian Langa <lucilanga src gnome org>]

commit a61fff1cf429bfd52f60c720b5cff66372d78c76
Author: Lucian Langa <lucilanga gnome org>
Date:   Sat Feb 26 10:27:52 2011 +0200

    fix gtk2/3 conditionals

 src/rss-status-icon.c |    4 ++--
 src/rss.c             |    6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/src/rss-status-icon.c b/src/rss-status-icon.c
index 7fc243b..7bd2818 100644
--- a/src/rss-status-icon.c
+++ b/src/rss-status-icon.c
@@ -95,7 +95,7 @@ create_status_icon(void)
 gboolean
 flicker_stop(gpointer user_data)
 {
-#if GTK_MINOR_VERSION < 22
+#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 22
 	gtk_status_icon_set_blinking (status_icon, FALSE);
 #endif
 	return FALSE;
@@ -182,7 +182,7 @@ update_status_icon(const char *channel, gchar *title)
 #else
 		gtk_status_icon_set_tooltip (status_icon, flat_status_msg);
 #endif
-#if GTK_MINOR_VERSION < 22
+#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 22
 		if (gconf_client_get_bool (rss_gconf, GCONF_KEY_BLINK_ICON, NULL)
 		&& !gtk_status_icon_get_blinking(status_icon))
 			gtk_status_icon_set_blinking (status_icon, TRUE);
diff --git a/src/rss.c b/src/rss.c
index 23f2d6d..56bf3ec 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -661,7 +661,7 @@ create_user_pass_dialog(RSS_AUTH *auth)
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_OK, GTK_RESPONSE_OK,
 		NULL);
-#if GTK_MINOR_VERSION < 22
+#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 22
 	gtk_dialog_set_has_separator (GTK_DIALOG (widget), FALSE);
 #endif
 	gtk_dialog_set_default_response (
@@ -1369,7 +1369,11 @@ webkit_net_status (WebKitWebView *view,
 				if (resize_pane_hsize+14 > width && width != 1) {
 					gtk_widget_set_size_request(rf->mozembed,
 						-1, -1);
+#if GTK_MAJOR_VERSION < 3
 					gtk_widget_size_request(rf->mozembed, &req);
+#else
+					gtk_widget_get_preferred_size(rf->mozembed, &req, NULL);
+#endif
 
 					if (req.width < resize_pane_hsize+14)
 						w = resize_pane_hsize-14;