diff options
author | Peter Harvey <peter.a.harvey@gmail.com> | 2006-01-17 07:03:28 +0800 |
---|---|---|
committer | Peter Anthony Harvey <paharvey@src.gnome.org> | 2006-01-17 07:03:28 +0800 |
commit | fc06f146e376e09becdfcdd1076dcf08b6ef7626 (patch) | |
tree | 2549619c6cd66f391b201add3cec286af77e41bf /src/ephy-history-window.c | |
parent | 7eff391d24a75404504a52ef7b7d2b38ca6d76f6 (diff) | |
download | gsoc2013-epiphany-fc06f146e376e09becdfcdd1076dcf08b6ef7626.tar.gz gsoc2013-epiphany-fc06f146e376e09becdfcdd1076dcf08b6ef7626.tar.zst gsoc2013-epiphany-fc06f146e376e09becdfcdd1076dcf08b6ef7626.zip |
src/Makefile.am
2006-01-17 Peter Harvey <peter.a.harvey@gmail.com>
* src/Makefile.am
Removed ephy-new-bookmark and ephy-topics-selector from the Makefile.
* src/ephy-history-window.c
* src/popup-commands.c
* src/window-commands.c
* src/bookmarks/ephy-bookmarks-editor.c
Removed all the slightly different bits of code to create a
bookmark and called ephy_bookmarks_ui_add_bookmark instead.
* src/bookmarks/ephy-bookmarks.c
* src/bookmarks/ephy-bookmarks.h
Moved the hashtable for bookmark windows to ephy-bookmarks-ui.
Added a new field "usericon" to the ephynode/bookmarks database,
to store the URL of the user-defined icon (if any). It can be
NULL (use site icon), "" (use none), or a URL.
* src/bookmarks/ephy-bookmark-properties.c
* src/bookmarks/ephy-bookmark-properties.h
Large changes to the bookmark properties window to handle different
use cases (adding or changing a bookmark), to use the new topics
palette widget, and to support the new usericon.
* src/bookmarks/ephy-bookmarks-ui.c
* src/bookmarks/ephy-bookmarks-ui.h
Large additions to ephy-bookmarks-ui to replace ephy-new-bookmark.
Fixed some bugs in the datatype handlers for the toolbar which
are supplied by ephy-bookmarks-ui.
Diffstat (limited to 'src/ephy-history-window.c')
-rw-r--r-- | src/ephy-history-window.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index be0464a6c..482015a7b 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -56,7 +56,6 @@ #include "window-commands.h" #include "ephy-file-helpers.h" #include "ephy-debug.h" -#include "ephy-new-bookmark.h" #include "ephy-stock-icons.h" #include "ephy-gui.h" #include "ephy-stock-icons.h" @@ -67,6 +66,7 @@ #include "ephy-node.h" #include "ephy-node-common.h" #include "ephy-node-view.h" +#include "ephy-bookmarks-ui.h" static const GtkTargetEntry page_drag_types [] = { @@ -475,14 +475,8 @@ static void cmd_bookmark_link (GtkAction *action, EphyHistoryWindow *editor) { - GtkWindow *window; - EphyBookmarks *bookmarks; - GtkWidget *new_bookmark; GList *selection; - window = GTK_WINDOW (editor); - bookmarks = ephy_shell_get_bookmarks (ephy_shell); - selection = ephy_node_view_get_selection (EPHY_NODE_VIEW (editor->priv->pages_view)); if (g_list_length (selection) == 1) @@ -494,16 +488,10 @@ cmd_bookmark_link (GtkAction *action, node = selection->data; location = ephy_node_get_property_string (node, EPHY_NODE_PAGE_PROP_LOCATION); title = ephy_node_get_property_string (node, EPHY_NODE_PAGE_PROP_TITLE); - if (ephy_new_bookmark_is_unique (bookmarks, GTK_WINDOW (window), - location)) - { - new_bookmark = ephy_new_bookmark_new - (bookmarks, window, location); - ephy_new_bookmark_set_title - (EPHY_NEW_BOOKMARK (new_bookmark), title); - gtk_widget_show (new_bookmark); - } + + ephy_bookmarks_ui_add_bookmark (GTK_WIDGET (editor), location, title); } + g_list_free (selection); } |