Merge lp:~aacid/libdbusmenu/fix_accelerator_not_showing into lp:libdbusmenu

Proposed by Albert Astals Cid on 2016-09-27
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2016-09-27
Approved revision: 482
Merged at revision: 482
Proposed branch: lp:~aacid/libdbusmenu/fix_accelerator_not_showing
Merge into: lp:libdbusmenu
Diff against target: 14 lines (+2/-2)
1 file modified
libdbusmenu-gtk/genericmenuitem.c (+2/-2)
To merge this branch: bzr merge lp:~aacid/libdbusmenu/fix_accelerator_not_showing
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2016-09-27 Approve on 2016-09-27
DBus Menu Team 2016-09-27 Pending
Review via email: mp+306911@code.launchpad.net

Commit message

genericmenuitem: Make accelerator text appear again

The deprecation porting from gtk_misc_set_alignment was not done correctly in r479

Description of the change

Firefox now shows the shortcuts again properly (as well as Qt apps)

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

Good catch, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
2--- libdbusmenu-gtk/genericmenuitem.c 2016-02-23 20:08:34 +0000
3+++ libdbusmenu-gtk/genericmenuitem.c 2016-09-27 15:48:40 +0000
4@@ -335,8 +335,8 @@
5 labelw = GTK_LABEL(gtk_accel_label_new(local_label));
6 gtk_label_set_use_markup(GTK_LABEL(labelw), TRUE);
7 #if GTK_CHECK_VERSION(3,0,0)
8- gtk_widget_set_halign(GTK_WIDGET(labelw), GTK_ALIGN_START);
9- gtk_widget_set_valign(GTK_WIDGET(labelw), GTK_ALIGN_CENTER);
10+ gtk_label_set_xalign (labelw, 0);
11+ gtk_label_set_yalign (labelw, 0.5);
12 #else
13 gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5);
14 #endif

Subscribers

People subscribed via source and target branches