aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/bookmarks/ephy-topic-action.c7
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 452a9695a..e03123f66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-10-27 Christian Persch <chpe@cvs.gnome.org>
+ * src/bookmarks/ephy-topic-action.c:
+ (ephy_topic_action_sync_label), (connect_proxy):
+
+ Fix label of "All" topic on bookmarksbar.
+
+2004-10-27 Christian Persch <chpe@cvs.gnome.org>
+
* lib/widgets/ephy-location-entry.c: (completion_func):
Avoid strdups in entry completion func. Patch by Peter Harvey.
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 629d08b65..e0c52f9cc 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -193,19 +193,19 @@ ephy_topic_action_sync_label (GtkAction *gaction,
if (GTK_IS_TOOL_ITEM (proxy))
{
GtkWidget *label = NULL;
- const char *title;
+ char *title;
char *title_short;
label = g_object_get_data (G_OBJECT (proxy), "label");
g_return_if_fail (label != NULL);
- title = ephy_node_get_property_string
- (action->priv->topic_node, EPHY_NODE_KEYWORD_PROP_NAME);
+ g_object_get (G_OBJECT (action), "label", &title, NULL);
title_short = ephy_string_shorten (title, MAX_LABEL_LENGTH);
gtk_label_set_label (GTK_LABEL (label), title_short);
g_free (title_short);
+ g_free (title);
}
}
@@ -860,7 +860,6 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
}
}
-
static void
topic_changed_cb (EphyNode *node,
guint property_id,