c3adf93714
Fix build with current gtk-doc, see Staging:O - Drop dependency on deprecated gnome-common, just run autoreconf - Do not include unused tree_index.sgml, fix build with gtk-doc >= 1.32, see https://gitlab.gnome.org/GNOME/gtk-doc/issues/103 * add 0001-Fix-build-with-gtk-doc-1.32-due-to-non-existing-tree.patch - Fix missing accelerators, add 0002-genericmenuitem-Make-accelerator-text-appear-again.patch - Split Gtk2 and Gtk3 build - glib, tools and doc subpackage are created from the Gtk2 flavor. * Fix building with disabled tests, add 0003-Fix-HAVE_VALGRIND-AM_CONDITIONAL.patch OBS-URL: https://build.opensuse.org/request/show/749395 OBS-URL: https://build.opensuse.org/package/show/X11:Unity/libdbusmenu?expand=0&rev=12
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 1c427472046418934192d484778839b90358876f Mon Sep 17 00:00:00 2001
|
|
From: Albert Astals Cid <aacid@kde.org>
|
|
Date: Mon, 18 Nov 2019 19:57:06 +0100
|
|
Subject: [PATCH 2/3] genericmenuitem: Make accelerator text appear again
|
|
|
|
The deprecation porting from gtk_misc_set_alignment was not done
|
|
correctly in r479 (LP: #1628196)
|
|
---
|
|
libdbusmenu-gtk/genericmenuitem.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c
|
|
index fbd0416..3a362d1 100644
|
|
--- a/libdbusmenu-gtk/genericmenuitem.c
|
|
+++ b/libdbusmenu-gtk/genericmenuitem.c
|
|
@@ -335,8 +335,8 @@ 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);
|
|
#if GTK_CHECK_VERSION(3,0,0)
|
|
- gtk_widget_set_halign(GTK_WIDGET(labelw), GTK_ALIGN_START);
|
|
- gtk_widget_set_valign(GTK_WIDGET(labelw), GTK_ALIGN_CENTER);
|
|
+ gtk_label_set_xalign (labelw, 0);
|
|
+ gtk_label_set_yalign (labelw, 0.5);
|
|
#else
|
|
gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5);
|
|
#endif
|
|
--
|
|
2.24.0
|
|
|