DBus Menu

Merge lp:~ted/libdbusmenu/lp982656 into lp:libdbusmenu/0.6

Proposed by Ted Gould on 2012-04-16

Status:

Merged

Approved by:

Charles Kerr on 2012-04-16

Approved revision:

415

Merged at revision:

415

Proposed branch:

Merge into:

Diff against target:

1 file modified

libdbusmenu-gtk/genericmenuitem.c (+1/-2)

To merge this branch:

bzr merge lp:~ted/libdbusmenu/lp982656

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Charles Kerr (community)		2012-04-16	Approve on 2012-04-16
Review via email: mp+102125@code.launchpad.net

Fixes setting the widget for the accelerator even if there isn't a mnemonic.

Revision history for this message

Charles Kerr (charlesk) wrote on 2012-04-16:

Looks good to me

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
2	--- libdbusmenu-gtk/genericmenuitem.c 2012-04-11 21:26:12 +0000
3	+++ libdbusmenu-gtk/genericmenuitem.c 2012-04-16 15:32:29 +0000
4	@@ -335,10 +335,10 @@
5	labelw = GTK_LABEL(gtk_accel_label_new(local_label));
6	gtk_label_set_use_markup(GTK_LABEL(labelw), TRUE);
7	gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5);
8	+ gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item));
9
10	if (has_mnemonic(in_label, FALSE)) {
11	gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);
12	- gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item));
13	gtk_label_set_markup_with_mnemonic(labelw, local_label);
14	} else {
15	gchar * sanitized = sanitize_label(local_label);
16	@@ -365,7 +365,6 @@
17	} else {
18	if (has_mnemonic(in_label, FALSE)) {
19	gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);
20	- gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item));
21	gtk_label_set_markup_with_mnemonic(labelw, local_label);
22	} else {
23	gchar * sanitized = sanitize_label(local_label);