aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c4
-rw-r--r--src/bookmarks/ephy-bookmarks-export.c2
-rw-r--r--src/bookmarks/ephy-bookmarks-menu.c3
-rw-r--r--src/bookmarks/ephy-bookmarks.c9
-rw-r--r--src/bookmarks/ephy-topic-action.c3
-rw-r--r--src/bookmarks/ephy-topics-selector.c1
-rw-r--r--src/ephy-favorites-menu.c1
-rw-r--r--src/ephy-history-window.c4
-rw-r--r--src/ephy-shell.c2
9 files changed, 0 insertions, 29 deletions
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 6e468c900..cae27c385 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -1073,8 +1073,6 @@ search_entry_search_cb (GtkWidget *entry, const char *search_text, EphyBookmarks
search_text = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);
- GDK_THREADS_ENTER ();
-
ephy_node_filter_empty (editor->priv->bookmarks_filter);
ephy_node_filter_add_expression (editor->priv->bookmarks_filter,
ephy_node_filter_expression_new (EPHY_NODE_FILTER_EXPRESSION_STRING_PROP_CONTAINS,
@@ -1087,8 +1085,6 @@ search_entry_search_cb (GtkWidget *entry, const char *search_text, EphyBookmarks
search_text),
0);
ephy_node_filter_done_changing (editor->priv->bookmarks_filter);
-
- GDK_THREADS_LEAVE ();
}
static GtkWidget *
diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c
index 0e314b4f8..2fba78215 100644
--- a/src/bookmarks/ephy-bookmarks-export.c
+++ b/src/bookmarks/ephy-bookmarks-export.c
@@ -50,7 +50,6 @@ add_topics_list (EphyNode *topics, EphyNode *bmk,
bmks = g_list_append (bmks, kid);
}
}
- ephy_node_thaw (topics);
if (bmks == NULL) return;
@@ -182,7 +181,6 @@ ephy_bookmarks_export_rdf (EphyBookmarks *bookmarks,
xmlFree (encoded_title);
g_free (link);
}
- ephy_node_thaw (bmks);
ephy_file_save_xml (filename, doc);
xmlFreeDoc(doc);
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index 9231d7a4c..8d5ed4fc1 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -239,8 +239,6 @@ add_bookmarks_menu (EphyBookmarksMenu *menu, EphyNode *node, GString *xml)
g_list_free (node_list);
}
-
- ephy_node_thaw (node);
}
static void
@@ -298,7 +296,6 @@ ephy_bookmarks_menu_rebuild (EphyBookmarksMenu *menu)
node_list = g_list_prepend (node_list, kid);
}
}
- ephy_node_thaw (topics);
node_list = g_list_sort (node_list, (GCompareFunc)sort_topics);
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 1904fe8d7..9c0db743e 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -190,7 +190,6 @@ ephy_bookmarks_autocompletion_source_foreach (EphyAutocompletionSource *source,
func (source, keywords, title, url, smart_url,
!smart_url, 0, data);
}
- ephy_node_thaw (eb->priv->bookmarks);
}
static void
@@ -387,7 +386,6 @@ ephy_bookmarks_save (EphyBookmarks *eb)
ephy_node_save_to_xml (kid, root);
}
}
- ephy_node_thaw (eb->priv->keywords);
children = ephy_node_get_children (eb->priv->bookmarks);
for (i = 0; i < children->len; i++)
@@ -398,7 +396,6 @@ ephy_bookmarks_save (EphyBookmarks *eb)
ephy_node_save_to_xml (kid, root);
}
- ephy_node_thaw (eb->priv->bookmarks);
ephy_file_save_xml (eb->priv->xml_file, doc);
xmlFreeDoc(doc);
@@ -476,7 +473,6 @@ compute_lower_fav (EphyNode *favorites, double *score)
result = child;
}
}
- ephy_node_thaw (favorites);
if (result == NULL) *score = 0;
@@ -612,7 +608,6 @@ get_topics_list (EphyBookmarks *eb,
*no_topics = FALSE;
}
}
- ephy_node_thaw (eb->priv->keywords);
return g_string_free (list, FALSE);
}
@@ -660,7 +655,6 @@ topics_removed_cb (EphyNode *node,
g_free (list);
}
- ephy_node_thaw (child);
g_signal_emit (G_OBJECT (eb), ephy_bookmarks_signals[TREE_CHANGED], 0);
}
@@ -912,11 +906,9 @@ ephy_bookmarks_find_bookmark (EphyBookmarks *eb,
if (location != NULL && strcmp (url, location) == 0)
{
- ephy_node_thaw (eb->priv->bookmarks);
return kid;
}
}
- ephy_node_thaw (eb->priv->bookmarks);
return NULL;
}
@@ -1213,7 +1205,6 @@ ephy_bookmarks_find_keyword (EphyBookmarks *eb,
node = kid;
}
}
- ephy_node_thaw (eb->priv->keywords);
return node;
}
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 7fa6ab705..72aaaea39 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -282,8 +282,6 @@ append_bookmarks_menu (EphyTopicAction *action, GtkWidget *menu, EphyNode *node,
g_list_free (node_list);
}
-
- ephy_node_thaw (node);
}
static GtkWidget *
@@ -389,7 +387,6 @@ build_topics_menu (EphyTopicAction *action, EphyNode *node)
gtk_widget_show (bmk_menu);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), bmk_menu);
}
- ephy_node_thaw (node);
g_list_free (node_list);
uncategorized = ephy_bookmarks_get_not_categorized (bookmarks);
diff --git a/src/bookmarks/ephy-topics-selector.c b/src/bookmarks/ephy-topics-selector.c
index 9d8447731..689e5eb9d 100644
--- a/src/bookmarks/ephy-topics-selector.c
+++ b/src/bookmarks/ephy-topics-selector.c
@@ -235,7 +235,6 @@ fill_model (EphyTopicsSelector *editor)
-1);
}
}
- ephy_node_thaw (keywords);
}
static void
diff --git a/src/ephy-favorites-menu.c b/src/ephy-favorites-menu.c
index 11d341062..082b03501 100644
--- a/src/ephy-favorites-menu.c
+++ b/src/ephy-favorites-menu.c
@@ -158,7 +158,6 @@ ephy_favorites_menu_rebuild (EphyFavoritesMenu *wrhm)
g_free (verb);
}
- ephy_node_thaw (fav);
g_string_append (xml, "</placeholder></submenu></menu></Root>");
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 1a6816764..21fa26922 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -843,8 +843,6 @@ search_entry_search_cb (GtkWidget *entry, char *search_text, EphyHistoryWindow *
G_CALLBACK (site_node_selected_cb),
editor);
- GDK_THREADS_ENTER ();
-
ephy_node_filter_empty (editor->priv->pages_filter);
ephy_node_filter_add_expression (editor->priv->pages_filter,
ephy_node_filter_expression_new (EPHY_NODE_FILTER_EXPRESSION_STRING_PROP_CONTAINS,
@@ -857,8 +855,6 @@ search_entry_search_cb (GtkWidget *entry, char *search_text, EphyHistoryWindow *
search_text),
0);
ephy_node_filter_done_changing (editor->priv->pages_filter);
-
- GDK_THREADS_LEAVE ();
}
static GtkWidget *
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index e8f52b50e..b2acb09aa 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -31,7 +31,6 @@
#include "ephy-stock-icons.h"
#include "ephy-window.h"
#include "ephy-file-helpers.h"
-#include "ephy-thread-helpers.h"
#include "ephy-bookmarks-import.h"
#include "ephy-bookmarks-editor.h"
#include "ephy-history-window.h"
@@ -208,7 +207,6 @@ ephy_shell_init (EphyShell *gs)
(gpointer *)ptr);
ephy_debug_init ();
- ephy_thread_helpers_init ();
ephy_file_helpers_init ();
ephy_stock_icons_init ();
ephy_ensure_dir_exists (ephy_dot_dir ());