[gnome-flashback] desktop: do not require pango 1.44.0
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback] desktop: do not require pango 1.44.0
- Date: Thu, 31 Oct 2019 21:42:23 +0000 (UTC)
commit 34e7e3a8b80b232a56a4fe37f4098dcac7bcbc36
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Thu Oct 31 23:37:25 2019 +0200
desktop: do not require pango 1.44.0
configure.ac | 10 ++++++++--
gnome-flashback/libdesktop/gf-icon.c | 4 ++++
2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 29d1f80..7465ead 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,6 @@ LIBGNOME_DESKTOP_REQUIRED=3.12.0
CANBERRA_REQUIRED=0.13
GLIB_REQUIRED=2.44.0
GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=3.31.0
-PANGO_REQUIRED=1.44.0
POLKIT_AGENT_REQUIRED=0.97
POLKIT_GOBJECT_REQUIRED=0.97
IBUS_REQUIRED=1.5.2
@@ -157,7 +156,6 @@ PKG_CHECK_MODULES([DESKTOP], [
gio-2.0 >= $GLIB_REQUIRED
gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
gtk+-3.0 >= $GTK_REQUIRED
- pango >= $PANGO_REQUIRED
])
PKG_CHECK_MODULES([END_SESSION_DIALOG], [
@@ -271,6 +269,14 @@ dnl **************************************************************************
AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
+dnl **************************************************************************
+dnl Check if we have Pango 1.44.0 or newer
+dnl **************************************************************************
+
+PKG_CHECK_EXISTS([pango >= 1.44.0],
+ AC_DEFINE([HAVE_PANGO144], [1],
+ [Define if Pango is 1.44.0 or newer]))
+
dnl **************************************************************************
dnl Check if we have XRandR 1.5 or newer
dnl **************************************************************************
diff --git a/gnome-flashback/libdesktop/gf-icon.c b/gnome-flashback/libdesktop/gf-icon.c
index a10188a..d9efef2 100644
--- a/gnome-flashback/libdesktop/gf-icon.c
+++ b/gnome-flashback/libdesktop/gf-icon.c
@@ -186,7 +186,9 @@ gf_icon_init (GfIcon *self)
{
GtkWidget *box;
GtkLabel *label;
+#ifdef HAVE_PANGO144
PangoAttrList *attrs;
+#endif
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_container_add (GTK_CONTAINER (self), box);
@@ -209,11 +211,13 @@ gf_icon_init (GfIcon *self)
gtk_label_set_justify (label, GTK_JUSTIFY_CENTER);
gtk_label_set_yalign (label, 0.0);
+#ifdef HAVE_PANGO144
attrs = pango_attr_list_new ();
pango_attr_list_insert (attrs, pango_attr_insert_hyphens_new (FALSE));
gtk_label_set_attributes (label, attrs);
pango_attr_list_unref (attrs);
+#endif
}
GtkWidget *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]