callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Elide (_x) in the middle of the string, too. (#323956, Abel Cheung)

Browse Source 
2006-05-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Elide (_x) in the middle
	of the string, too.  (#323956, Abel Cheung)
This commit is contained in:
Matthias Clasen
2006-05-08 18:10:23 +00:00
committed by Matthias Clasen
parent 8ade92495d
commit 729715465a
3 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-05-08 Matthias Clasen <mclasen@redhat.com> 2006-05-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Elide (_x) in the middle
of the string, too. (#323956, Abel Cheung)
* gtk/gtkuimanager.c (update_node): Fix tooltips. * gtk/gtkuimanager.c (update_node): Fix tooltips.
* configure.in: Require Pango 1.13.0 * configure.in: Require Pango 1.13.0

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2006-05-08 Matthias Clasen <mclasen@redhat.com> 2006-05-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Elide (_x) in the middle
of the string, too. (#323956, Abel Cheung)
* gtk/gtkuimanager.c (update_node): Fix tooltips. * gtk/gtkuimanager.c (update_node): Fix tooltips.
* configure.in: Require Pango 1.13.0 * configure.in: Require Pango 1.13.0

30
gtk/gtktoolbar.c
View File

@ -4877,39 +4877,41 @@ gchar *
_gtk_toolbar_elide_underscores (const gchar *original) _gtk_toolbar_elide_underscores (const gchar *original)
{ {
gchar *q, *result; gchar *q, *result;
const gchar *p; const gchar *p, *end;
gsize len;
gboolean last_underscore; gboolean last_underscore;
gint s;
if (!original) if (!original)
return NULL; return NULL;
s = strlen (original); len = strlen (original);
q = result = g_malloc (s + 1); q = result = g_malloc (len + 1);
last_underscore = FALSE; last_underscore = FALSE;
for (p = original; *p; p++) end = original + len;
for (p = original; p < end; p++)
{ {
if (!last_underscore && *p == '_') if (!last_underscore && *p == '_')
last_underscore = TRUE; last_underscore = TRUE;
else else
{ {
last_underscore = FALSE; last_underscore = FALSE;
if (*p != '_' && original + 2 <= p && p + 1 <= end && p[-2] == '(' && p[1] == ')')
{
q--;
*q = '\0';
p++;
}
else
*q++ = *p; *q++ = *p;
} }
} }
if (last_underscore)
*q++ = '_';
*q = '\0'; *q = '\0';
if (s > 4)
{
if (original[s - 4] == '(' &&
original[s - 3] == '_' &&
original[s - 1] == ')')
q[-3] = '\0';
}
return result; return result;
} }