aboutsummaryrefslogtreecommitdiffstats
path: root/src/bookmarks/ephy-new-bookmark.c
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-01-30 21:53:39 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-01-30 21:53:39 +0800
commitbd2108eb559d0538b59c6907b89f7aba137431dd (patch)
tree5a35409492af0c228f90a2e524a6db804c579992 /src/bookmarks/ephy-new-bookmark.c
parentc1008f8781b7940bb7096bc6e5fe250ec6ebcaf2 (diff)
downloadgsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.tar
gsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.tar.gz
gsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.tar.bz2
gsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.tar.lz
gsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.tar.xz
gsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.tar.zst
gsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.zip
Allow to drag also normal urls in the toolbars. Commit some fixes I did to
2003-01-30 Marco Pesenti Gritti <marco@it.gnome.org> * data/ui/epiphany-toolbar.xml.in: * embed/mozilla/EphyWrapper.cpp: * embed/mozilla/Makefile.am: * lib/egg/egg-action.c: (disconnect_proxy): * lib/egg/egg-menu-merge.c: (update_node): * lib/ephy-dnd.c: (ephy_dnd_uri_list_extract_uris): * lib/ephy-dnd.h: * lib/ephy-string.c: (ephy_str_to_int): * lib/widgets/ephy-editable-toolbar.c: (item_node_new), (impl_get_action), (add_action), (parse_item_list), (toolbar_list_to_xml), (ephy_editable_toolbar_save), (do_merge), (free_node), (ephy_editable_toolbar_finalize): * src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_get_bookmark_id): * src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_add), (ephy_new_bookmark_response_cb), (ephy_new_bookmark_init), (ephy_new_bookmark_set_icon), (ephy_new_bookmark_get_id): * src/bookmarks/ephy-new-bookmark.h: * src/popup-commands.c: (popup_cmd_add_link_bookmark): * src/toolbar.c: (get_bookmark_action), (toolbar_get_action): * src/window-commands.c: (window_cmd_file_add_bookmark): Allow to drag also normal urls in the toolbars. Commit some fixes I did to the eggmenu stuff, now toolbar editor should work well, please start reporting bugs :)
Diffstat (limited to 'src/bookmarks/ephy-new-bookmark.c')
-rw-r--r--src/bookmarks/ephy-new-bookmark.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index de3cdbe80..dab846439 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -48,6 +48,7 @@ struct EphyNewBookmarkPrivate
char *location;
char *smarturl;
char *icon;
+ gulong id;
GtkWidget *title_entry;
GtkWidget *keywords_entry;
@@ -144,14 +145,16 @@ ephy_new_bookmark_add (EphyNewBookmark *new_bookmark)
{
char *title;
char *keywords;
+ EphyNode *node;
title = gtk_editable_get_chars
(GTK_EDITABLE (new_bookmark->priv->title_entry), 0, -1);
keywords = gtk_editable_get_chars
(GTK_EDITABLE (new_bookmark->priv->keywords_entry), 0, -1);
- ephy_bookmarks_add (new_bookmark->priv->bookmarks, title,
- new_bookmark->priv->location,
- new_bookmark->priv->smarturl, keywords);
+ node = ephy_bookmarks_add (new_bookmark->priv->bookmarks, title,
+ new_bookmark->priv->location,
+ new_bookmark->priv->smarturl, keywords);
+ new_bookmark->priv->id = ephy_node_get_id (node);
if (new_bookmark->priv->icon)
{
@@ -174,8 +177,6 @@ ephy_new_bookmark_response_cb (GtkDialog *dialog,
ephy_new_bookmark_add (new_bookmark);
break;
}
-
- gtk_widget_destroy (GTK_WIDGET (dialog));
}
static GtkWidget *
@@ -334,6 +335,7 @@ ephy_new_bookmark_init (EphyNewBookmark *editor)
editor->priv->location = NULL;
editor->priv->smarturl = NULL;
editor->priv->icon = NULL;
+ editor->priv->id = 0;
}
void
@@ -361,3 +363,9 @@ ephy_new_bookmark_set_icon (EphyNewBookmark *bookmark,
bookmark->priv->icon = icon ? g_strdup (icon) : NULL;
}
+gulong
+ephy_new_bookmark_get_id (EphyNewBookmark *bookmark)
+{
+ return bookmark->priv->id;
+}
+