src/ephy-link-action.c

2005-10-25  Philip Langdale  <philipl@mail.utexas.edu>

	* src/ephy-link-action.c
	* src/ephy-link-action.h:
	(proxy_button_release_event_cb), (proxy_drag_begin_cb),
	(ephy_link_action_connect_proxy),
	(ephy_link_action_disconnect_proxy),
	(ephy_link_action_class_init), (ephy_link_action_init):

	Fix bug #319529. Don't activate the action on a middle mouse
	button release event if the release is linked to a DnD.

	This requires adding state to the action to allow us to link
	the drag-begin event to the button-release event.

3 files changed, 70 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index e1ac8029e..b1a68e431 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-10-25  Philip Langdale  <philipl@mail.utexas.edu>
+
+	* src/ephy-link-action.c
+	* src/ephy-link-action.h:
+	(proxy_button_release_event_cb), (proxy_drag_begin_cb),
+	(ephy_link_action_connect_proxy),
+	(ephy_link_action_disconnect_proxy),
+	(ephy_link_action_class_init), (ephy_link_action_init):
+
+	Fix bug #319529. Don't activate the action on a middle mouse
+	button release event if the release is linked to a DnD.
+
+	This requires adding state to the action to allow us to link
+	the drag-begin event to the button-release event.
+
 2005-10-24  Christian Persch  <chpe@cvs.gnome.org>
 
 	* src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_add),
diff --git a/src/ephy-link-action.c b/src/ephy-link-action.c
index d4667090f..da627f451 100644
--- a/src/ephy-link-action.c
+++ b/src/ephy-link-action.c
@@ -28,15 +28,23 @@
 #include "ephy-gui.h"
 
 #include <gtk/gtkbutton.h>
+#include <gtk/gtkmain.h>
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkmenutoolbutton.h>
 
+#define EPHY_LINK_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_LINK_ACTION, EphyLinkActionPrivate))
+
+struct _EphyLinkActionPrivate
+{
+	gboolean ignore_next_middle_click;
+};
+
 static GObjectClass *parent_class = NULL;
 
 static gboolean
 proxy_button_release_event_cb (GtkWidget *widget,
 			       GdkEventButton *event,
-			       GtkAction *action)
+			       EphyLinkAction *action)
 {
 	/**
 	 * We do not use ephy_gui_is_middle_click() here because
@@ -45,12 +53,37 @@ proxy_button_release_event_cb (GtkWidget *widget,
 	 */
 	if (event->button == 2)
 	{
-		gtk_action_activate(action);
+		if (!action->priv->ignore_next_middle_click)
+		{
+			gtk_action_activate (GTK_ACTION (action));
+		}
+		action->priv->ignore_next_middle_click = FALSE;
 	}
 
 	return FALSE;
 }
 
+static void
+proxy_drag_begin_cb (GtkWidget *widget,
+		     GdkDragContext *context,
+		     EphyLinkAction *action)
+{
+	GdkEventMotion *event;
+	GdkEvent *base_event = gtk_get_current_event ();
+
+	g_return_if_fail (base_event != NULL);
+	g_return_if_fail (base_event->type == GDK_MOTION_NOTIFY);
+
+	event = (GdkEventMotion *) base_event;
+
+	if (event->state & GDK_BUTTON2_MASK)
+	{
+		action->priv->ignore_next_middle_click = TRUE;
+	}
+
+	gdk_event_free(base_event);
+}
+
 static GtkWidget *
 get_event_widget (GtkWidget *proxy)
 {
@@ -107,6 +140,9 @@ ephy_link_action_connect_proxy (GtkAction *action, GtkWidget *proxy)
 		g_signal_connect (widget, "button-release-event",
 				  G_CALLBACK (proxy_button_release_event_cb),
 				  action);
+		g_signal_connect (widget, "drag-begin",
+				  G_CALLBACK (proxy_drag_begin_cb),
+				  action);
 	}
 
 	GTK_ACTION_CLASS (parent_class)->connect_proxy (action, proxy);
@@ -125,6 +161,9 @@ ephy_link_action_disconnect_proxy (GtkAction *action, GtkWidget *proxy)
 		g_signal_handlers_disconnect_by_func (widget,
 						      G_CALLBACK (proxy_button_release_event_cb),
 						      action);
+		g_signal_handlers_disconnect_by_func (widget,
+						      G_CALLBACK (proxy_drag_begin_cb),
+						      action);
 	}
 
 	GTK_ACTION_CLASS (parent_class)->disconnect_proxy (action, proxy);
@@ -133,14 +172,23 @@ ephy_link_action_disconnect_proxy (GtkAction *action, GtkWidget *proxy)
 static void
 ephy_link_action_class_init (EphyLinkActionClass *class)
 {
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 	GtkActionClass *action_class = GTK_ACTION_CLASS (class);
 
 	parent_class = g_type_class_peek_parent (class);
 
 	action_class->connect_proxy = ephy_link_action_connect_proxy;
 	action_class->disconnect_proxy = ephy_link_action_disconnect_proxy;
+
+	g_type_class_add_private (object_class, sizeof (EphyLinkActionPrivate));
 }
 
+static void
+ephy_link_action_init (EphyLinkAction *action)
+{
+	action->priv = EPHY_LINK_ACTION_GET_PRIVATE (action);
+	action->priv->ignore_next_middle_click = FALSE;
+}
 
 GType
 ephy_link_action_get_type (void)
@@ -159,7 +207,7 @@ ephy_link_action_get_type (void)
 			NULL, /* class_data */
 			sizeof (EphyLinkAction),
 			0,   /* n_preallocs */
-			NULL /* instance_init */
+			(GInstanceInitFunc) ephy_link_action_init
 		};
 		static const GInterfaceInfo link_info = 
 		{
diff --git a/src/ephy-link-action.h b/src/ephy-link-action.h
index 7dbc5794c..3bccd157b 100644
--- a/src/ephy-link-action.h
+++ b/src/ephy-link-action.h
@@ -41,6 +41,7 @@ G_BEGIN_DECLS
 #define EPHY_LINK_ACTION_GROUP_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_LINK_ACTION_GROUP, EphyLinkActionGroupClass))
 
 typedef struct _EphyLinkAction			EphyLinkAction;
+typedef struct _EphyLinkActionPrivate		EphyLinkActionPrivate;
 typedef struct _EphyLinkActionClass		EphyLinkActionClass;
 
 typedef struct _EphyLinkActionGroup		EphyLinkActionGroup;
@@ -49,6 +50,9 @@ typedef struct _EphyLinkActionGroupClass	EphyLinkActionGroupClass;
 struct _EphyLinkAction
 {
 	GtkAction parent_instance;
+
+	/*< private >*/
+	EphyLinkActionPrivate *priv;
 };
 
 struct _EphyLinkActionClass