[epiphany-extensions] Build with gtk+-3.0

[Diego Escalante Urrelo <diegoe src gnome org>]

commit 5d2623b1edf88547d8baf310057356362527e640
Author: Diego Escalante Urrelo <descalante igalia com>
Date:   Tue Jul 6 16:10:57 2010 -0500

    Build with gtk+-3.0

 configure.ac                                  |    6 +++---
 extensions/auto-scroller/ephy-auto-scroller.c |    4 ++--
 extensions/gestures/ephy-gesture.c            |    4 ++--
 extensions/gestures/ephy-gestures-extension.c |    1 -
 extensions/push-scroller/ephy-push-scroller.c |    4 ++--
 extensions/rss/rss-ui.c                       |    2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 54f422c..bea018b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,7 @@ GNOME_DOC_INIT
 EPIPHANY_REQUIRED=2.27.4
 LIBXML_REQUIRED=2.6.0
 LIBGLIB_REQUIRED=2.15.5
-LIBGTK_REQUIRED=2.19.5
+LIBGTK_REQUIRED=2.90.4
 
 AC_SUBST([EPIPHANY_REQUIRED])
 AC_SUBST([LIBXML_REQUIRED])
@@ -123,13 +123,13 @@ PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
 		  glib-2.0 >= $LIBGLIB_REQUIRED \
 		  gio-2.0 >= $LIBGLIB_REQUIRED \
 		  gmodule-2.0 \
-		  gtk+-2.0 >= $LIBGTK_REQUIRED \
+		  gtk+-3.0 >= $LIBGTK_REQUIRED \
 		  gconf-2.0 \
 		  epiphany-$EPIPHANY_API_VERSION >= $EPIPHANY_REQUIRED])
 AC_SUBST([EPIPHANY_DEPENDENCY_CFLAGS])
 AC_SUBST([EPIPHANY_DEPENDENCY_LIBS])
 
-PKG_CHECK_MODULES([WEBKIT], [webkit-1.0])
+PKG_CHECK_MODULES([WEBKIT], [webkitgtk-3.0])
 AC_SUBST([WEBKIT_CFLAGS])
 AC_SUBST([WEBKIT_LIBS])
 
diff --git a/extensions/auto-scroller/ephy-auto-scroller.c b/extensions/auto-scroller/ephy-auto-scroller.c
index 2153dfc..241d471 100644
--- a/extensions/auto-scroller/ephy-auto-scroller.c
+++ b/extensions/auto-scroller/ephy-auto-scroller.c
@@ -366,7 +366,7 @@ ephy_auto_scroller_start (EphyAutoScroller *scroller,
 	/* grab the pointer */
 	widget = GTK_WIDGET (priv->window);
 	gtk_grab_add (widget);
-	if (gdk_pointer_grab (widget->window, FALSE,
+	if (gdk_pointer_grab (gtk_widget_get_window (widget), FALSE,
 			      GDK_POINTER_MOTION_MASK |
 			      GDK_BUTTON_PRESS_MASK,
 			      NULL, priv->cursor, timestamp) != GDK_GRAB_SUCCESS)
@@ -375,7 +375,7 @@ ephy_auto_scroller_start (EphyAutoScroller *scroller,
 		return;
 	}
 
-	if (gdk_keyboard_grab (widget->window, FALSE, timestamp) != GDK_GRAB_SUCCESS)
+	if (gdk_keyboard_grab (gtk_widget_get_window (widget), FALSE, timestamp) != GDK_GRAB_SUCCESS)
 	{
 		ephy_auto_scroller_stop (scroller, timestamp);
 		return;
diff --git a/extensions/gestures/ephy-gesture.c b/extensions/gestures/ephy-gesture.c
index 2c73056..c252598 100644
--- a/extensions/gestures/ephy-gesture.c
+++ b/extensions/gestures/ephy-gesture.c
@@ -262,12 +262,12 @@ ephy_gesture_start (EphyGesture *gesture)
 	g_object_ref (priv->window);
 	gtk_grab_add (priv->window);
 
-	if (gdk_pointer_grab (priv->window->window, FALSE,
+	if (gdk_pointer_grab (gtk_widget_get_window (priv->window), FALSE,
 			     GDK_POINTER_MOTION_MASK |
 			     GDK_BUTTON_RELEASE_MASK |
 			     GDK_BUTTON_PRESS_MASK,
 			     NULL, priv->cursor, time) != GDK_GRAB_SUCCESS ||
-	    gdk_keyboard_grab (priv->window->window, FALSE, time) != GDK_GRAB_SUCCESS)
+	    gdk_keyboard_grab (gtk_widget_get_window (priv->window), FALSE, time) != GDK_GRAB_SUCCESS)
 	{
 		ephy_gesture_stop (gesture, time);
 
diff --git a/extensions/gestures/ephy-gestures-extension.c b/extensions/gestures/ephy-gestures-extension.c
index cfc6d7c..a435b0c 100644
--- a/extensions/gestures/ephy-gestures-extension.c
+++ b/extensions/gestures/ephy-gestures-extension.c
@@ -276,7 +276,6 @@ dom_mouse_down_cb (EphyWebView *view,
 	EphyEmbed *embed;
 	GtkWidget *toplevel;
 	EphyWindow *window;
-	gboolean ppv_mode;
 	guint button;
 	WebKitHitTestResult *hit_test;
 	guint context;
diff --git a/extensions/push-scroller/ephy-push-scroller.c b/extensions/push-scroller/ephy-push-scroller.c
index ea1286b..80de408 100644
--- a/extensions/push-scroller/ephy-push-scroller.c
+++ b/extensions/push-scroller/ephy-push-scroller.c
@@ -250,7 +250,7 @@ ephy_push_scroller_start (EphyPushScroller *scroller,
 	/* grab the pointer */
 	widget = GTK_WIDGET (priv->window);
 	gtk_grab_add (widget);
-	if (gdk_pointer_grab (widget->window, FALSE,
+	if (gdk_pointer_grab (gtk_widget_get_window (widget), FALSE,
 			      GDK_POINTER_MOTION_MASK |
 			      GDK_BUTTON_PRESS_MASK |
 			      GDK_BUTTON_RELEASE_MASK,
@@ -260,7 +260,7 @@ ephy_push_scroller_start (EphyPushScroller *scroller,
 		return;
 	}
 
-	if (gdk_keyboard_grab (widget->window, FALSE, timestamp) != GDK_GRAB_SUCCESS)
+	if (gdk_keyboard_grab (gtk_widget_get_window (widget), FALSE, timestamp) != GDK_GRAB_SUCCESS)
 	{
 		ephy_push_scroller_stop (scroller, timestamp);
 		return;
diff --git a/extensions/rss/rss-ui.c b/extensions/rss/rss-ui.c
index a1d01d8..f18905f 100644
--- a/extensions/rss/rss-ui.c
+++ b/extensions/rss/rss-ui.c
@@ -368,7 +368,7 @@ rss_ui_drag_data_get_cb (GtkWidget *widget,
 	if (feed == NULL || feed->address == NULL) return;
 
 	gtk_selection_data_set (selection_data,
-			        selection_data->target,
+			        gtk_selection_data_get_target (selection_data),
 			        8,
 			        (const guchar*) feed->address,
 			        strlen (feed->address));