aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-05-26 03:39:09 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-05-26 03:39:09 +0800
commit9ae7960ca8c3ca534ba07bb6d58b430ee9cda413 (patch)
tree552cf6c6fded80d05acaea44eeef46f7509d21ad /src
parentc159006b08ac492649715c9a3ce55f258e199f97 (diff)
downloadgsoc2013-epiphany-9ae7960ca8c3ca534ba07bb6d58b430ee9cda413.tar
gsoc2013-epiphany-9ae7960ca8c3ca534ba07bb6d58b430ee9cda413.tar.gz
gsoc2013-epiphany-9ae7960ca8c3ca534ba07bb6d58b430ee9cda413.tar.bz2
gsoc2013-epiphany-9ae7960ca8c3ca534ba07bb6d58b430ee9cda413.tar.lz
gsoc2013-epiphany-9ae7960ca8c3ca534ba07bb6d58b430ee9cda413.tar.xz
gsoc2013-epiphany-9ae7960ca8c3ca534ba07bb6d58b430ee9cda413.tar.zst
gsoc2013-epiphany-9ae7960ca8c3ca534ba07bb6d58b430ee9cda413.zip
Try to fix node removal problems. I cant repro crashes ... but they are
2003-05-25 Marco Pesenti Gritti <marco@it.gnome.org> * configure.in: * embed/ephy-favicon-cache.c: (ephy_favicon_cache_save): * embed/ephy-history.c: (ephy_history_save), (hosts_removed_cb), (pages_removed_cb), (unref_empty_host), (page_removed_from_host_cb), (connect_page_removed_from_host), (ephy_history_init), (ephy_history_add_host): * lib/ephy-file-helpers.c: (ephy_file_save_xml): * lib/ephy-file-helpers.h: * lib/ephy-node.c: (callback), (ephy_node_emit_signal), (real_remove_child), (ephy_node_dispose): * lib/ephy-node.h: * lib/ephy-state.c: (ephy_states_save): * lib/widgets/ephy-tree-model-node.c: (root_child_removed_cb): * src/bookmarks/ephy-bookmarks-export.c: (ephy_bookmarks_export_rdf): * src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_save), (bookmarks_removed_cb), (topics_removed_cb): Try to fix node removal problems. I cant repro crashes ... but they are quite hard to reproduce. Use a save_xml helper that is low disk safe. * src/ephy-automation.c: (impl_ephy_automation_loadurl): Use OPEN_PAGE when an url is passed
Diffstat (limited to 'src')
-rw-r--r--src/bookmarks/ephy-bookmarks-export.c2
-rw-r--r--src/bookmarks/ephy-bookmarks.c4
-rw-r--r--src/ephy-automation.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c
index 3403a1931..e17a67dc0 100644
--- a/src/bookmarks/ephy-bookmarks-export.c
+++ b/src/bookmarks/ephy-bookmarks-export.c
@@ -137,6 +137,6 @@ ephy_bookmarks_export_rdf (EphyBookmarks *bookmarks,
}
ephy_node_thaw (bmks);
- xmlSaveFormatFile (filename, doc, 1);
+ ephy_file_save_xml (filename, doc);
xmlFreeDoc(doc);
}
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 9e7c9dacc..b83c29888 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -339,7 +339,7 @@ ephy_bookmarks_save (EphyBookmarks *eb)
}
ephy_node_thaw (eb->priv->bookmarks);
- xmlSaveFormatFile (eb->priv->xml_file, doc, 1);
+ ephy_file_save_xml (eb->priv->xml_file, doc);
xmlFreeDoc(doc);
/* Export bookmarks in rdf */
@@ -482,6 +482,7 @@ bookmarks_changed_cb (EphyNode *node,
static void
bookmarks_removed_cb (EphyNode *node,
EphyNode *child,
+ guint old_index,
EphyBookmarks *eb)
{
long id;
@@ -544,6 +545,7 @@ update_topics_list (EphyNode *bookmark, const char *list)
static void
topics_removed_cb (EphyNode *node,
EphyNode *child,
+ guint old_index,
EphyBookmarks *eb)
{
long id;
diff --git a/src/ephy-automation.c b/src/ephy-automation.c
index 96ed5f2d3..0fbea13bb 100644
--- a/src/ephy-automation.c
+++ b/src/ephy-automation.c
@@ -120,7 +120,7 @@ impl_ephy_automation_loadurl (PortableServer_Servant _servant,
}
else
{
- flags |= EPHY_NEW_TAB_NEW_PAGE;
+ flags |= EPHY_NEW_TAB_OPEN_PAGE;
}
if (open_in_new_tab)