diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | lib/widgets/ephy-node-view.c | 21 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 12 | ||||
| -rw-r--r-- | src/ephy-history-window.c | 7 |
4 files changed, 27 insertions, 25 deletions
@@ -1,5 +1,17 @@ 2004-08-23 Christian Persch <chpe@cvs.gnome.org> + * lib/widgets/ephy-node-view.c: (ephy_node_view_key_press_cb), + (ephy_node_view_button_press_cb), (ephy_node_view_class_init): + * 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-23 Christian Persch <chpe@cvs.gnome.org> + * src/bookmarks/ephy-bookmarks.h: Change hierarchy separator to "->". Fixes bug #149150. diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c index 9b0f4a5d4..0afbb9844 100644 --- a/lib/widgets/ephy-node-view.c +++ b/lib/widgets/ephy-node-view.c @@ -91,7 +91,6 @@ enum NODE_ACTIVATED, NODE_SELECTED, NODE_DROPPED, - SHOW_POPUP, LAST_SIGNAL }; @@ -586,13 +585,6 @@ ephy_node_view_key_press_cb (GtkTreeView *treeview, gtk_tree_selection_selected_foreach (selection, path_toggled, view); } - } - else 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 && unicode) { @@ -810,7 +802,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) { @@ -1652,15 +1646,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)); } diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 5d80ec2aa..e61bd17c8 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -1129,7 +1129,7 @@ remove_focus_monitor (EphyBookmarksEditor *editor, GtkWidget *widget) editor); } -static void +static gboolean ephy_bookmarks_editor_show_popup_cb (GtkWidget *view, EphyBookmarksEditor *editor) { @@ -1139,6 +1139,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 @@ -1221,7 +1223,7 @@ keyword_node_selected_cb (EphyNodeView *view, } } -static void +static gboolean keyword_node_show_popup_cb (GtkWidget *view, EphyBookmarksEditor *editor) { GtkWidget *widget; @@ -1230,6 +1232,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 @@ -1526,7 +1530,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); @@ -1587,7 +1591,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 69f3a3c91..b045d48ab 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -834,7 +834,7 @@ remove_focus_monitor (EphyHistoryWindow *editor, GtkWidget *widget) editor); } -static void +static gboolean ephy_history_window_show_popup_cb (GtkWidget *view, EphyHistoryWindow *editor) { @@ -844,6 +844,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 @@ -1350,7 +1352,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), @@ -1505,4 +1507,3 @@ ephy_history_window_dispose (GObject *object) G_OBJECT_CLASS (parent_class)->dispose (object); } - |