DBus Menu

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

  1. lp982656
  2. Merge into trunk.0.6
Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 415
Merged at revision: 415
Proposed branch: lp:~ted/libdbusmenu/lp982656
Merge into: lp:libdbusmenu/0.6
Diff against target: 23 lines (+1/-2)
1 file modified
libdbusmenu-gtk/genericmenuitem.c (+1/-2)
To merge this branch: bzr merge lp:~ted/libdbusmenu/lp982656
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+102125@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
--- libdbusmenu-gtk/genericmenuitem.c 2012-04-11 21:26:12 +0000
+++ libdbusmenu-gtk/genericmenuitem.c 2012-04-16 15:32:29 +0000
@@ -335,10 +335,10 @@
335 labelw = GTK_LABEL(gtk_accel_label_new(local_label));335 labelw = GTK_LABEL(gtk_accel_label_new(local_label));
336 gtk_label_set_use_markup(GTK_LABEL(labelw), TRUE);336 gtk_label_set_use_markup(GTK_LABEL(labelw), TRUE);
337 gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5);337 gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5);
338 gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item));
338339
339 if (has_mnemonic(in_label, FALSE)) {340 if (has_mnemonic(in_label, FALSE)) {
340 gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);341 gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);
341 gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item));
342 gtk_label_set_markup_with_mnemonic(labelw, local_label);342 gtk_label_set_markup_with_mnemonic(labelw, local_label);
343 } else {343 } else {
344 gchar * sanitized = sanitize_label(local_label);344 gchar * sanitized = sanitize_label(local_label);
@@ -365,7 +365,6 @@
365 } else {365 } else {
366 if (has_mnemonic(in_label, FALSE)) {366 if (has_mnemonic(in_label, FALSE)) {
367 gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);367 gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);
368 gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item));
369 gtk_label_set_markup_with_mnemonic(labelw, local_label);368 gtk_label_set_markup_with_mnemonic(labelw, local_label);
370 } else {369 } else {
371 gchar * sanitized = sanitize_label(local_label);370 gchar * sanitized = sanitize_label(local_label);

Subscribers

People subscribed via source and target branches

to all changes: