aboutsummaryrefslogtreecommitdiffstats
path: root/lib/widgets
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-02-11 22:38:12 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-02-11 22:38:12 +0800
commit79ccb3d443d31072de5718da6a3883aa35df9211 (patch)
tree27bba5a8d7442f6a0ae896e5f582721fbb3bc499 /lib/widgets
parentf842ea4bfff7c63fbc4f21d6c21e2b6ede6d35d0 (diff)
downloadgsoc2013-epiphany-79ccb3d443d31072de5718da6a3883aa35df9211.tar
gsoc2013-epiphany-79ccb3d443d31072de5718da6a3883aa35df9211.tar.gz
gsoc2013-epiphany-79ccb3d443d31072de5718da6a3883aa35df9211.tar.bz2
gsoc2013-epiphany-79ccb3d443d31072de5718da6a3883aa35df9211.tar.lz
gsoc2013-epiphany-79ccb3d443d31072de5718da6a3883aa35df9211.tar.xz
gsoc2013-epiphany-79ccb3d443d31072de5718da6a3883aa35df9211.tar.zst
gsoc2013-epiphany-79ccb3d443d31072de5718da6a3883aa35df9211.zip
Pass the property id to the changed signal.
2004-02-11 Marco Pesenti Gritti <marco@gnome.org> * lib/ephy-node.c: (callback), (child_changed), (ephy_node_set_property): Pass the property id to the changed signal. * lib/ephy-node.h: Cleanup. * embed/ephy-history.c: (hosts_changed_cb), (pages_changed_cb): * lib/widgets/ephy-location-entry.c: (completion_func): * lib/widgets/ephy-tree-model-node.c: (root_child_changed_cb): * src/bookmarks/ephy-bookmark-action.c: (bookmarks_child_changed_cb): * src/bookmarks/ephy-bookmarks-menu.c: (topic_child_changed_cb): * src/bookmarks/ephy-topic-action.c: (topic_child_changed_cb): * src/ephy-completion-model.c: (root_child_changed_cb): * src/ephy-location-action.c: (actions_child_changed_cb): Fixup changed signals signature. * src/bookmarks/ephy-bookmarks.c: (update_bookmark_keywords), (bookmarks_changed_cb), (bookmark_is_categorized), (topics_removed_cb), (ephy_bookmarks_set_keyword), (ephy_bookmarks_unset_keyword): Cleanup keywords building, normalize and case fold it, add the title words as keywords too.
Diffstat (limited to 'lib/widgets')
-rw-r--r--lib/widgets/ephy-location-entry.c18
-rw-r--r--lib/widgets/ephy-tree-model-node.c1
2 files changed, 4 insertions, 15 deletions
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 8d0a95bf1..36b1b4d8c 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -201,8 +201,6 @@ completion_func (GtkEntryCompletion *completion,
int i;
char *item = NULL;
char *keywords = NULL;
- char *normalized_string, *normalized_keywords;
- char *case_normalized_string, *case_normalized_keywords;
gboolean ret = FALSE;
EphyLocationEntry *le = EPHY_LOCATION_ENTRY (data);
GtkTreeModel *model;
@@ -214,16 +212,11 @@ completion_func (GtkEntryCompletion *completion,
gtk_tree_model_get (model, iter,
le->priv->keywords_col, &keywords, -1);
- normalized_string = g_utf8_normalize (item, -1, G_NORMALIZE_ALL);
- case_normalized_string = g_utf8_casefold (normalized_string, -1);
- normalized_keywords = g_utf8_normalize (keywords, -1, G_NORMALIZE_ALL);
- case_normalized_keywords = g_utf8_casefold (normalized_keywords, -1);
-
- if (!strncmp (key, case_normalized_string, strlen (key)))
+ if (!strncmp (key, item, strlen (key)))
{
ret = TRUE;
}
- else if (strstr (case_normalized_keywords, key))
+ else if (strstr (keywords, key))
{
ret = TRUE;
}
@@ -235,8 +228,7 @@ completion_func (GtkEntryCompletion *completion,
key_prefixed = g_strconcat (web_prefixes[i], key, NULL);
- if (!strncmp (key_prefixed, case_normalized_string,
- strlen (key_prefixed)))
+ if (!strncmp (key_prefixed, item, strlen (key_prefixed)))
{
g_free (key_prefixed);
@@ -249,11 +241,7 @@ completion_func (GtkEntryCompletion *completion,
}
g_free (item);
- g_free (normalized_string);
- g_free (case_normalized_string);
g_free (keywords);
- g_free (normalized_keywords);
- g_free (case_normalized_keywords);
return ret;
}
diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c
index 872fa7702..b60783af9 100644
--- a/lib/widgets/ephy-tree-model-node.c
+++ b/lib/widgets/ephy-tree-model-node.c
@@ -174,6 +174,7 @@ ephy_tree_model_node_update_node (EphyTreeModelNode *model,
static void
root_child_changed_cb (EphyNode *node,
EphyNode *child,
+ guint property_id,
EphyTreeModelNode *model)
{
ephy_tree_model_node_update_node (model, child, -1);