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

Proposed by Albert Astals Cid
Status: Merged
Approved by: Marco Trevisan (Treviño)
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) Approve
DBus Menu Team 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.
Revision history for this message
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
=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
--- libdbusmenu-gtk/genericmenuitem.c 2016-02-23 20:08:34 +0000
+++ libdbusmenu-gtk/genericmenuitem.c 2016-09-27 15:48:40 +0000
@@ -335,8 +335,8 @@
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#if GTK_CHECK_VERSION(3,0,0)337#if GTK_CHECK_VERSION(3,0,0)
338 gtk_widget_set_halign(GTK_WIDGET(labelw), GTK_ALIGN_START);338 gtk_label_set_xalign (labelw, 0);
339 gtk_widget_set_valign(GTK_WIDGET(labelw), GTK_ALIGN_CENTER);339 gtk_label_set_yalign (labelw, 0.5);
340#else340#else
341 gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5);341 gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5);
342#endif342#endif

Subscribers

People subscribed via source and target branches