debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use katze_strip_mnemonics in Shortcuts

Browse source
This commit is contained in:
Christian Dywan 2009-07-17 21:30:40 +02:00
parent 25da412215
commit 4135b1ffe8
1 changed files with 2 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
extensions/shortcuts.c
View file

@ -32,52 +32,6 @@ shortcuts_deactivate_cb (MidoriExtension* extension,
app, shortcuts_app_add_browser_cb, extension); app, shortcuts_app_add_browser_cb, extension);
} }
/* A copy of _gtk_toolbar_elide_underscores
Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
Copied from GTK+ 2.17.1 */
static gchar *
elide_underscores (const gchar *original)
{
gchar *q, *result;
const gchar *p, *end;
gsize len;
gboolean last_underscore;
if (!original)
return NULL;
len = strlen (original);
q = result = g_malloc (len + 1);
last_underscore = FALSE;
end = original + len;
for (p = original; p < end; p++)
{
if (!last_underscore && *p == '_')
last_underscore = TRUE;
else
{
last_underscore = FALSE;
if (original + 2 <= p && p + 1 <= end &&
p[-2] == '(' && p[-1] == '_' && p[0] != '_' && p[1] == ')')
{
q--;
*q = '\0';
p++;
}
else
*q++ = *p;
}
}
if (last_underscore)
*q++ = '_';
*q = '\0';
return result;
}
static void static void
shortcuts_preferences_render_text (GtkTreeViewColumn* column, shortcuts_preferences_render_text (GtkTreeViewColumn* column,
GtkCellRenderer* renderer, GtkCellRenderer* renderer,
@ -91,13 +45,13 @@ shortcuts_preferences_render_text (GtkTreeViewColumn* column,
gtk_tree_model_get (model, iter, 0, &action, -1); gtk_tree_model_get (model, iter, 0, &action, -1);
if ((label = katze_object_get_string (action, "label"))) if ((label = katze_object_get_string (action, "label")))
stripped = elide_underscores (label); stripped = katze_strip_mnemonics (label);
else else
{ {
GtkStockItem item; GtkStockItem item;
g_object_get (action, "stock-id", &label, NULL); g_object_get (action, "stock-id", &label, NULL);
if (gtk_stock_lookup (label, &item)) if (gtk_stock_lookup (label, &item))
stripped = elide_underscores (item.label); stripped = katze_strip_mnemonics (item.label);
else else
stripped = g_strdup (""); stripped = g_strdup ("");
} }