From da6333c06e51b7c4447d6d534d301c3f728679d9 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@gnome.org>
Date: Wed, 24 Sep 2003 12:45:45 +0000
Subject: Do not use _ as accellerators in bookmarks menus.

2003-09-24  Marco Pesenti Gritti  <marco@gnome.org>

        * lib/ephy-string.c: (ephy_string_double_underscores):
        * lib/ephy-string.h:
        * src/bookmarks/ephy-bookmark-action.c: (sync_bookmark_properties):
        * src/bookmarks/ephy-bookmarks-menu.c:
        (ephy_bookmarks_menu_rebuild):
        * src/bookmarks/ephy-topic-action.c: (create_menu_item),
        (sync_topic_properties):

        Do not use _ as accellerators in bookmarks menus.
---
 lib/ephy-string.c | 39 +++++++++++++++++++++++++++++++++++++++
 lib/ephy-string.h |  2 ++
 2 files changed, 41 insertions(+)

(limited to 'lib')

diff --git a/lib/ephy-string.c b/lib/ephy-string.c
index fdadfbd17..1c4ff358d 100644
--- a/lib/ephy-string.c
+++ b/lib/ephy-string.c
@@ -156,3 +156,42 @@ ephy_string_elide_underscores (const gchar *original)
 
 	return result;
 }
+
+char *
+ephy_string_double_underscores (const char *string)
+{
+	int underscores;
+	const char *p;
+	char *q;
+	char *escaped;
+
+	if (string == NULL)
+	{
+		return NULL;
+	}
+
+	underscores = 0;
+	for (p = string; *p != '\0'; p++)
+	{
+		underscores += (*p == '_');
+	}
+        
+	if (underscores == 0)
+	{
+		return g_strdup (string);
+	}
+
+	escaped = g_new (char, strlen (string) + underscores + 1);
+	for (p = string, q = escaped; *p != '\0'; p++, q++)
+	{
+		/* Add an extra underscore. */
+		if (*p == '_') {
+			*q++ = '_';
+		}
+		*q = *p;
+	}
+	*q = '\0';
+                                                                                                                             
+	return escaped;
+}
+
diff --git a/lib/ephy-string.h b/lib/ephy-string.h
index a7d083457..89aa4564c 100644
--- a/lib/ephy-string.h
+++ b/lib/ephy-string.h
@@ -34,6 +34,8 @@ char		*ephy_string_shorten			(const gchar *str,
 
 char		*ephy_string_elide_underscores		(const gchar *original);
 
+char            *ephy_string_double_underscores         (const char *string);
+
 G_END_DECLS
 
 #endif
-- 
cgit v1.2.3