diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2012-04-16 21:27:40 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2012-04-16 21:27:40 +0200 |
| commit | 011bdda852d6d7c661c091a9fdb86d9f46aef5ff (patch) | |
| tree | 31f5c3d74f3ab2fd14f2928eeb1250b134150408 | |
| parent | 77b9809abe5041c67ad3728aaab463b5997e620f (diff) | |
| parent | a8e3ae7fc4119e6ff87247369b9c2d6b46632cd5 (diff) | |
| download | libdbusmenu-011bdda852d6d7c661c091a9fdb86d9f46aef5ff.tar.gz libdbusmenu-011bdda852d6d7c661c091a9fdb86d9f46aef5ff.tar.bz2 libdbusmenu-011bdda852d6d7c661c091a9fdb86d9f46aef5ff.zip | |
Backport fix for keybindings not showing in menus bug (lp: #982656)
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | libdbusmenu-gtk/genericmenuitem.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index fec964e..f18290c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdbusmenu (0.6.1-0ubuntu3) UNRELEASED; urgency=low + + * Backport fix for keybindings not showing in menus bug (lp: #982656) + + -- Sebastien Bacher <seb128@ubuntu.com> Mon, 16 Apr 2012 21:25:44 +0200 + libdbusmenu (0.6.1-0ubuntu2) precise; urgency=low * libdbusmenu-gtk/genericmenuitem.c diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c index 33d888d..4125828 100644 --- a/libdbusmenu-gtk/genericmenuitem.c +++ b/libdbusmenu-gtk/genericmenuitem.c @@ -335,10 +335,10 @@ set_label (GtkMenuItem * menu_item, const gchar * in_label) labelw = GTK_LABEL(gtk_accel_label_new(local_label)); gtk_label_set_use_markup(GTK_LABEL(labelw), TRUE); gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5); + gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item)); if (has_mnemonic(in_label, FALSE)) { gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE); - gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item)); gtk_label_set_markup_with_mnemonic(labelw, local_label); } else { gchar * sanitized = sanitize_label(local_label); @@ -365,7 +365,6 @@ set_label (GtkMenuItem * menu_item, const gchar * in_label) } else { if (has_mnemonic(in_label, FALSE)) { gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE); - gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item)); gtk_label_set_markup_with_mnemonic(labelw, local_label); } else { gchar * sanitized = sanitize_label(local_label); |