Unset the use-underline label property instead of doubling the

2004-10-25  Christian Persch  <chpe@cvs.gnome.org>

	* src/bookmarks/ephy-bookmark-action.c: (connect_proxy),
	(bookmark_changed_cb):
	* src/bookmarks/ephy-topic-action.c: (create_menu_item),
	(topic_changed_cb):

	Unset the use-underline label property instead of doubling the
	underscores. Saves tons of strdups.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 14de49a99..25432d755 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -703,6 +703,10 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
 	}
 	else if (GTK_IS_MENU_ITEM (proxy))
 	{
+		GtkLabel *label;
+
+		label = (GtkLabel *) ((GtkBin *) proxy)->child;
+		gtk_label_set_use_underline (label, FALSE);
 		g_signal_connect (proxy, "activate", G_CALLBACK (activate_cb), action);
 	}
 }
@@ -715,14 +719,12 @@ bookmark_changed_cb (EphyNode *node,
 	if (property_id == EPHY_NODE_BMK_PROP_TITLE)
 	{
 		GValue value = { 0, };
-		const char *tmp;
-		char *title, *short_title;
+		const char *title;
+		char *short_title;
 
-		tmp = ephy_node_get_property_string
+		title = ephy_node_get_property_string
 			(action->priv->node, EPHY_NODE_BMK_PROP_TITLE);
-		title = ephy_string_double_underscores (tmp);
 		short_title = ephy_string_shorten (title, MAX_LABEL_LENGTH);
-		g_free (title);
 
 		g_value_init (&value, G_TYPE_STRING);
 		g_value_take_string (&value, short_title);