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/popup-commands.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/popup-commands.c')
| -rw-r--r-- | src/popup-commands.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/popup-commands.c b/src/popup-commands.c index fe688ea7d..6c41ed252 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -22,7 +22,6 @@ #include "popup-commands.h" #include "ephy-shell.h" -#include "ephy-new-bookmark.h" #include "ephy-embed-factory.h" #include "ephy-embed-persist.h" #include "ephy-prefs.h" @@ -84,8 +83,6 @@ void popup_cmd_bookmark_link (GtkAction *action, EphyWindow *window) { - GtkWidget *new_bookmark; - EphyBookmarks *bookmarks; EphyEmbedEvent *event; const GValue *link_title; const GValue *link_rel; @@ -123,18 +120,13 @@ popup_cmd_bookmark_link (GtkAction *action, { title = location; } - - bookmarks = ephy_shell_get_bookmarks (ephy_shell); - if (ephy_new_bookmark_is_unique (bookmarks, GTK_WINDOW (window), - location)) + + if (is_smart) { - new_bookmark = ephy_new_bookmark_new - (bookmarks, GTK_WINDOW (window), - is_smart ? rel : location); - ephy_new_bookmark_set_title - (EPHY_NEW_BOOKMARK (new_bookmark), title); - gtk_widget_show (new_bookmark); + location = rel; } + + ephy_bookmarks_ui_add_bookmark (location, title, GTK_WINDOW (window)); } static void |