diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-export.c | 16 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-menu.c | 4 | ||||
| -rw-r--r-- | src/bookmarks/ephy-open-tabs-action.c | 3 |
3 files changed, 20 insertions, 3 deletions
diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c index e08965be3..ba2d78a48 100644 --- a/src/bookmarks/ephy-bookmarks-export.c +++ b/src/bookmarks/ephy-bookmarks-export.c @@ -94,6 +94,9 @@ write_rdf (EphyBookmarks *bookmarks, GPtrArray *children; char *file_uri; int i, ret; +#ifdef ENABLE_ZEROCONF + EphyNode *local; +#endif START_PROFILER ("Writing RDF") @@ -168,6 +171,9 @@ write_rdf (EphyBookmarks *bookmarks, bmks = ephy_bookmarks_get_bookmarks (bookmarks); topics = ephy_bookmarks_get_keywords (bookmarks); smart_bmks = ephy_bookmarks_get_smart_bookmarks (bookmarks); +#ifdef ENABLE_ZEROCONF + local = ephy_bookmarks_get_local (bookmarks); +#endif children = ephy_node_get_children (bmks); for (i=0; i < children->len; i++) @@ -179,6 +185,11 @@ write_rdf (EphyBookmarks *bookmarks, kid = g_ptr_array_index (children, i); +#ifdef ENABLE_ZEROCONF + /* Don't export the local bookmarks */ + if (ephy_node_has_child (local, kid)) continue; +#endif + ret = xmlTextWriterStartElementNS (writer, (xmlChar *) "rdf", @@ -239,6 +250,11 @@ write_rdf (EphyBookmarks *bookmarks, kid = g_ptr_array_index (children, i); +#ifdef ENABLE_ZEROCONF + /* Don't export the local bookmarks */ + if (ephy_node_has_child (local, kid)) continue; +#endif + smart_url = ephy_node_has_child (smart_bmks, kid); url = ephy_node_get_property_string (kid, EPHY_NODE_BMK_PROP_LOCATION); diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c index 1a04f86f1..0ef14dfd3 100644 --- a/src/bookmarks/ephy-bookmarks-menu.c +++ b/src/bookmarks/ephy-bookmarks-menu.c @@ -137,8 +137,8 @@ append_menu (GString *string, const GPtrArray *topics, const GPtrArray *bookmark EPHY_TOPIC_ACTION_NAME_PRINTF (name, topic); - g_string_append_printf (string, "<menu name=\"%s\" action=\"%s\">", - name, name); + g_string_append_printf (string, "<menu action=\"%s\">", + name); append_menu (string, topics, subset, flags); g_string_append (string, "</menu>"); separate = TRUE; diff --git a/src/bookmarks/ephy-open-tabs-action.c b/src/bookmarks/ephy-open-tabs-action.c index 4dcc04dfa..19ab5f2ad 100644 --- a/src/bookmarks/ephy-open-tabs-action.c +++ b/src/bookmarks/ephy-open-tabs-action.c @@ -74,7 +74,8 @@ node_added_cb (EphyNode *parent, EPHY_OPEN_TABS_ACTION_NAME_PRINTF (name, child); /* FIXME !!!! */ - action = gtk_action_new (name, _("Open in New _Tabs"), "Open this topic in tabs", NULL); + action = gtk_action_new (name, _("Open in New _Tabs"), + _("Open the bookmarks in this topic in new tabs"), NULL); action_object = (GObject *) action; g_object_set_data (action_object, "ephy-node", child); |