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.c3
-rw-r--r--src/bookmarks/ephy-bookmarks-menu.c3
-rw-r--r--src/bookmarks/ephy-bookmarks.c6
-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-location-action.c1
-rw-r--r--src/ephy-main.c2
10 files changed, 0 insertions, 28 deletions
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 088af8a70..f2bd52b6e 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -1186,8 +1186,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,
@@ -1200,8 +1198,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 1043f19c0..42bc28783 100644
--- a/src/bookmarks/ephy-bookmarks-export.c
+++ b/src/bookmarks/ephy-bookmarks-export.c
@@ -56,7 +56,6 @@ write_topics_list (EphyNode *topics,
keywords = g_list_prepend (keywords, kid);
}
}
- ephy_node_thaw (topics);
for (l = keywords; l != NULL; l = l->next)
{
@@ -186,7 +185,6 @@ ephy_bookmarks_export_rdf (EphyBookmarks *bookmarks,
ret = xmlTextWriterEndElement (writer); /* rdf:li */
if (ret < 0) break;
}
- ephy_node_thaw (bmks);
if (ret < 0) goto out;
ret = xmlTextWriterEndElement (writer); /* rdf:Seq */
@@ -262,7 +260,6 @@ ephy_bookmarks_export_rdf (EphyBookmarks *bookmarks,
g_free (link);
}
- ephy_node_thaw (bmks);
if (ret < 0) goto out;
ret = xmlTextWriterEndElement (writer); /* rdf:RDF */
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index 7548dfce9..b1b546ae6 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -225,8 +225,6 @@ add_bookmarks_menu (EphyBookmarksMenu *menu, EphyNode *node, const char *path)
}
g_list_free (node_list);
}
-
- ephy_node_thaw (node);
}
static void
@@ -269,7 +267,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 3ae0d41e4..c569ec2ca 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -335,7 +335,6 @@ compute_lower_fav (EphyNode *favorites, double *score)
result = child;
}
}
- ephy_node_thaw (favorites);
if (result == NULL) *score = 0;
@@ -449,7 +448,6 @@ get_topics_list (EphyBookmarks *eb,
*no_topics = FALSE;
}
}
- ephy_node_thaw (eb->priv->keywords);
return g_string_free (list, FALSE);
}
@@ -497,7 +495,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);
}
@@ -753,11 +750,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;
}
@@ -1054,7 +1049,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 2bdc167fc..1861418ff 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -293,8 +293,6 @@ append_bookmarks_menu (EphyTopicAction *action, GtkWidget *menu, EphyNode *node,
g_list_free (node_list);
}
-
- ephy_node_thaw (node);
}
static GtkWidget *
@@ -400,7 +398,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 e1a583a72..7dd84a501 100644
--- a/src/bookmarks/ephy-topics-selector.c
+++ b/src/bookmarks/ephy-topics-selector.c
@@ -219,7 +219,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 67dafe759..40d3afddf 100644
--- a/src/ephy-favorites-menu.c
+++ b/src/ephy-favorites-menu.c
@@ -153,7 +153,6 @@ ephy_favorites_menu_rebuild (EphyFavoritesMenu *menu)
name, verb,
GTK_UI_MANAGER_MENUITEM, FALSE);
}
- ephy_node_thaw (fav);
STOP_PROFILER ("Rebuild favorites menu")
}
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 4c0af9398..1adf9db6d 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -941,8 +941,6 @@ static void
setup_filters (EphyHistoryWindow *editor,
gboolean pages, gboolean sites)
{
- GDK_THREADS_ENTER ();
-
LOG ("Setup filters for pages %d and sites %d", pages, sites);
if (pages)
@@ -965,8 +963,6 @@ setup_filters (EphyHistoryWindow *editor,
ephy_node_filter_done_changing (editor->priv->sites_filter);
}
-
- GDK_THREADS_LEAVE ();
}
static void
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c
index efb838d57..ff6dd64e9 100644
--- a/src/ephy-location-action.c
+++ b/src/ephy-location-action.c
@@ -397,7 +397,6 @@ init_actions_list (EphyLocationAction *action)
action->priv->actions = g_list_append
(action->priv->actions, kid);
}
- ephy_node_thaw (action->priv->smart_bmks);
}
static void
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 276b39734..ccb349ee3 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -22,7 +22,6 @@
#include "ephy-shell.h"
#include "ephy-file-helpers.h"
-#include "ephy-thread-helpers.h"
#include "ephy-state.h"
#include "ephy-debug.h"
#include "ephy-stock-icons.h"
@@ -153,7 +152,6 @@ main (int argc, char *argv[])
gnome_vfs_init ();
glade_gnome_init ();
ephy_debug_init ();
- ephy_thread_helpers_init ();
ephy_file_helpers_init ();
ephy_stock_icons_init ();
eel_gconf_monitor_add ("/apps/epiphany/general");
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 19:45:19 +0800