diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-09-13 18:24:56 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-09-13 18:24:56 +0800 |
| commit | 2606279995f614634062e0aeb9833c482db5d083 (patch) | |
| tree | 625e6ae5d03052e753c3322397b41f4174ca3926 /src/bookmarks | |
| parent | 79ec35d68d698710604fd4e9682188ae28ba1ae0 (diff) | |
| download | gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.gz gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.bz2 gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.lz gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.xz gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.zst gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.zip | |
Merging pre-gnome-2-10 branch to HEAD.
2004-09-13 Christian Persch <chpe@cvs.gnome.org>
Merging pre-gnome-2-10 branch to HEAD.
Splitting ChangeLog.
Diffstat (limited to 'src/bookmarks')
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 4 | ||||
| -rw-r--r-- | src/bookmarks/ephy-topics-selector.c | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index e61bd17c8..360dc8f37 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -594,7 +594,7 @@ import_dialog_response_cb (GtkDialog *dialog, gint response, ephy_file_chooser_add_mime_filter (dialog, _("Epiphany bookmarks"), - "text/rdf", NULL); + "text/rdf", "application/rdf+xml", NULL); filter = ephy_file_chooser_add_pattern_filter (dialog, _("All files"), @@ -1154,8 +1154,6 @@ ephy_bookmarks_editor_dispose (GObject *object) editor = EPHY_BOOKMARKS_EDITOR (object); - g_return_if_fail (editor->priv != NULL); - if (editor->priv->key_view != NULL) { remove_focus_monitor (editor, editor->priv->key_view); diff --git a/src/bookmarks/ephy-topics-selector.c b/src/bookmarks/ephy-topics-selector.c index eabc93985..561fd9799 100644 --- a/src/bookmarks/ephy-topics-selector.c +++ b/src/bookmarks/ephy-topics-selector.c @@ -215,8 +215,7 @@ topic_destroy_cb (EphyNode *node, } static void -node_toggled_cb (EphyTopicsSelector *selector, EphyNode *node, - gboolean checked, gpointer data) +toggle_topic (EphyTopicsSelector *selector, EphyNode *node, gboolean checked) { if (selector->priv->bookmark) { @@ -252,6 +251,13 @@ node_toggled_cb (EphyTopicsSelector *selector, EphyNode *node, } static void +node_toggled_cb (EphyTopicsSelector *selector, EphyNode *node, + gboolean checked, gpointer data) +{ + toggle_topic (selector, node, checked); +} + +static void ephy_topics_selector_init (EphyTopicsSelector *selector) { selector->priv = EPHY_TOPICS_SELECTOR_GET_PRIVATE (selector); @@ -309,6 +315,7 @@ ephy_topics_selector_new_topic (EphyTopicsSelector *selector) node = ephy_bookmarks_add_keyword (selector->priv->bookmarks, _("Type a topic")); + toggle_topic (selector, node, TRUE); ephy_node_view_select_node (EPHY_NODE_VIEW (selector), node); ephy_node_view_edit (EPHY_NODE_VIEW (selector), TRUE); } |