Just use the popup_menu signal. Fixes bug #150830.

2004-08-23  Christian Persch  <chpe@cvs.gnome.org>

	* configure.in:
	* lib/widgets/ephy-node-view.c: (ephy_node_view_class_init),
	(ephy_node_view_key_press_cb), (ephy_node_view_button_press_cb):
	* src/bookmarks/ephy-bookmarks-editor.c:
	(ephy_bookmarks_editor_show_popup_cb),
	(keyword_node_show_popup_cb), (ephy_bookmarks_editor_construct):
	* src/ephy-history-window.c: (ephy_history_window_show_popup_cb),
	(ephy_history_window_construct), (ephy_history_window_dispose):

	Just use the popup_menu signal. Fixes bug #150830.

5 files changed, 36 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index ff9c876e9..47d81fc95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-08-23  Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.in:
+	* lib/widgets/ephy-node-view.c: (ephy_node_view_class_init),
+	(ephy_node_view_key_press_cb), (ephy_node_view_button_press_cb):
+	* src/bookmarks/ephy-bookmarks-editor.c:
+	(ephy_bookmarks_editor_show_popup_cb),
+	(keyword_node_show_popup_cb), (ephy_bookmarks_editor_construct):
+	* src/ephy-history-window.c: (ephy_history_window_show_popup_cb),
+	(ephy_history_window_construct), (ephy_history_window_dispose):
+
+	Just use the popup_menu signal. Fixes bug #150830.
+
 2004-08-21  Christian Persch  <chpe@cvs.gnome.org>
 
 	* configure.in:
diff --git a/configure.in b/configure.in
index 00f991a48..9492189c0 100644
--- a/configure.in
+++ b/configure.in
@@ -210,12 +210,12 @@ branch1.7) MOZILLA_SNAPSHOT=17 ;;
 1.8a1) MOZILLA_SNAPSHOT=18 ;;
 1.8a2) MOZILLA_SNAPSHOT=19 ;;
 1.8a3) MOZILLA_SNAPSHOT=20 ;;
-1.8a4) MOZILLA_SNAPSHOT=20 ;;
- 1.8b) MOZILLA_SNAPSHOT=20 ;;
-1.8rc1) MOZILLA_SNAPSHOT=20 ;;
-  1.8) MOZILLA_SNAPSHOT=20 ;;
-branch1.8) MOZILLA_SNAPSHOT = 20 ;;
-trunk) MOZILLA_SNAPSHOT=20 ;;
+1.8a4) MOZILLA_SNAPSHOT=21 ;;
+ 1.8b) MOZILLA_SNAPSHOT=21 ;;
+1.8rc1) MOZILLA_SNAPSHOT=21 ;;
+  1.8) MOZILLA_SNAPSHOT=21 ;;
+branch1.8) MOZILLA_SNAPSHOT = 21 ;;
+trunk) MOZILLA_SNAPSHOT=21 ;;
     *) AC_ERROR([
 *****************************************************************************
 Epiphany can be built using Mozilla 1.4, 1.4.1, 1.4.2, 1.5, 1.5.1, 1.6,  1.7,
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index f5e35d4b0..6332e85fa 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -89,7 +89,6 @@ enum
 	NODE_ACTIVATED,
 	NODE_SELECTED,
 	NODE_DROPPED,
-	SHOW_POPUP,
 	LAST_SIGNAL
 };
 
@@ -191,15 +190,6 @@ ephy_node_view_class_init (EphyNodeViewClass *klass)
 			      2,
 			      G_TYPE_POINTER,
 			      G_TYPE_POINTER);
-	ephy_node_view_signals[SHOW_POPUP] =
-		g_signal_new ("show_popup",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EphyNodeViewClass, show_popup),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE,
-			      0);
 
 	g_type_class_add_private (object_class, sizeof (EphyNodeViewPrivate));
 }
@@ -713,15 +703,8 @@ ephy_node_view_key_press_cb (GtkTreeView *treeview,
 			     GdkEventKey *event,
 			     EphyNodeView *view)
 {
-	if ((event->state & GDK_SHIFT_MASK) &&
-	    (event->keyval == GDK_F10))
-	{
-		g_signal_emit (G_OBJECT (view), ephy_node_view_signals[SHOW_POPUP], 0);
-
-		return TRUE;
-	}
-	else if (view->priv->searchable_data_column != -1 &&
-		 gdk_keyval_to_unicode (event->keyval))
+	if (view->priv->searchable_data_column != -1 &&
+	    gdk_keyval_to_unicode (event->keyval))
 	{
 		return ephy_node_view_select_node_by_key (view, event);
 	}
@@ -939,7 +922,9 @@ ephy_node_view_button_press_cb (GtkWidget *treeview,
 
 		if (event->button == 3)
 		{
-			g_signal_emit (G_OBJECT (view), ephy_node_view_signals[SHOW_POPUP], 0);
+			gboolean retval;
+
+			g_signal_emit_by_name (view, "popup_menu", &retval);
 		}
 		else if (event->button == 1)
 		{
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index e869b92cb..04d58ca69 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -1075,7 +1075,7 @@ remove_focus_monitor (EphyBookmarksEditor *editor, GtkWidget *widget)
                                              editor);
 }
 
-static void
+static gboolean
 ephy_bookmarks_editor_show_popup_cb (GtkWidget *view,
 				     EphyBookmarksEditor *editor)
 {
@@ -1085,6 +1085,8 @@ ephy_bookmarks_editor_show_popup_cb (GtkWidget *view,
 					    "/EphyBookmarkEditorPopup");
 	gtk_menu_popup (GTK_MENU (widget), NULL, NULL, NULL, NULL, 2,
 			gtk_get_current_event_time ());
+
+	return TRUE;
 }
 
 static void
@@ -1167,7 +1169,7 @@ keyword_node_selected_cb (EphyNodeView *view,
 	}
 }
 
-static void
+static gboolean
 keyword_node_show_popup_cb (GtkWidget *view, EphyBookmarksEditor *editor)
 {
 	GtkWidget *widget;
@@ -1176,6 +1178,8 @@ keyword_node_show_popup_cb (GtkWidget *view, EphyBookmarksEditor *editor)
 					   "/EphyBookmarkKeywordPopup");
 	gtk_menu_popup (GTK_MENU (widget), NULL, NULL, NULL, NULL, 2,
 			gtk_get_current_event_time ());
+
+	return TRUE;
 }
 
 static void
@@ -1469,7 +1473,7 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
 			  G_CALLBACK (node_dropped_cb),
 			  editor);
 	g_signal_connect (G_OBJECT (key_view),
-			  "show_popup",
+			  "popup_menu",
 			  G_CALLBACK (keyword_node_show_popup_cb),
 			  editor);
 
@@ -1529,7 +1533,7 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
 			  G_CALLBACK (ephy_bookmarks_editor_node_activated_cb),
 			  editor);
 	g_signal_connect (G_OBJECT (bm_view),
-			  "show_popup",
+			  "popup_menu",
 			  G_CALLBACK (ephy_bookmarks_editor_show_popup_cb),
 			  editor);
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (bm_view));
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 1548c57ee..a0daa398a 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -826,7 +826,7 @@ remove_focus_monitor (EphyHistoryWindow *editor, GtkWidget *widget)
                                              editor);
 }
 
-static void
+static gboolean
 ephy_history_window_show_popup_cb (GtkWidget *view,
 				   EphyHistoryWindow *editor)
 {
@@ -836,6 +836,8 @@ ephy_history_window_show_popup_cb (GtkWidget *view,
 					    "/EphyHistoryWindowPopup");
 	gtk_menu_popup (GTK_MENU (widget), NULL, NULL, NULL, NULL, 2,
 			gtk_get_current_event_time ());
+
+	return TRUE;
 }
 
 static gboolean
@@ -1335,7 +1337,7 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
 			  G_CALLBACK (ephy_history_window_node_activated_cb),
 			  editor);
 	g_signal_connect (G_OBJECT (pages_view),
-			  "show_popup",
+			  "popup_menu",
 			  G_CALLBACK (ephy_history_window_show_popup_cb),
 			  editor);
 	g_signal_connect (G_OBJECT (pages_view),
@@ -1490,4 +1492,3 @@ ephy_history_window_dispose (GObject *object)
 
 	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
-