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/window-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/window-commands.c')
| -rw-r--r-- | src/window-commands.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/window-commands.c b/src/window-commands.c index c9c086734..a879a4029 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -34,7 +34,6 @@ #include "ephy-dialog.h" #include "ephy-bookmarks-editor.h" #include "ephy-history-window.h" -#include "ephy-new-bookmark.h" #include "ephy-file-chooser.h" #include "ephy-file-helpers.h" #include "ephy-toolbar.h" @@ -45,6 +44,7 @@ #include "ephy-toolbar-editor.h" #include "ephy-find-toolbar.h" #include "ephy-location-entry.h" +#include "ephy-bookmarks-ui.h" #include "pdm-dialog.h" #include <string.h> @@ -233,9 +233,6 @@ window_cmd_file_bookmark_page (GtkAction *action, { EphyTab *tab; EphyEmbed *embed; - EphyBookmarks *bookmarks; - GtkWidget *new_bookmark; - const char *location, *icon, *title; tab = ephy_window_get_active_tab (window); g_return_if_fail (tab != NULL); @@ -243,22 +240,9 @@ window_cmd_file_bookmark_page (GtkAction *action, embed = ephy_window_get_active_embed (window); g_return_if_fail (embed != NULL); - location = ephy_tab_get_address (tab); - title = ephy_tab_get_title (tab); - icon = ephy_tab_get_icon_address (tab); - - bookmarks = ephy_shell_get_bookmarks (ephy_shell); - if (ephy_new_bookmark_is_unique (bookmarks, GTK_WINDOW (window), - location)) - { - new_bookmark = ephy_new_bookmark_new - (bookmarks, GTK_WINDOW (window), location); - ephy_new_bookmark_set_title - (EPHY_NEW_BOOKMARK (new_bookmark), title); - ephy_new_bookmark_set_icon - (EPHY_NEW_BOOKMARK (new_bookmark), icon); - gtk_widget_show (new_bookmark); - } + ephy_bookmarks_ui_add_bookmark (GTK_WINDOW (window), + ephy_tab_get_address (tab), + ephy_tab_get_title (tab)); } static void |