/soc/2015/mmcc/main: 65a3bdae9444: bump pango version requiremen...

[Michael McConville]

Changeset: 65a3bdae94442ee3c705e8be4f67f43ae16a2f37
Author:	 Michael McConville <mmcconville at mykolab.com>
Date:	 2015-06-20 13:54 -0400
Branch:	 default
URL: https://hg.pidgin.im/soc/2015/mmcc/main/rev/65a3bdae9444

Description:

bump pango version requirement to 1.36

diffstat:

 configure.ac     |  7 +++----
 pidgin/gtkconv.c |  6 ------
 2 files changed, 3 insertions(+), 10 deletions(-)

diffs (37 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -587,14 +587,13 @@ running configure.
 	AC_SUBST(GTK_LIBS)
 
 	GTK_PC_MODULE="gtk+-3.0"
-	dnl XXX: should probably be axed, as it's constant
+	dnl XXX: should probably be axed, as it must be 3 and is therefore constant
 	GTK_VERSION="3"
 	AC_SUBST(GTK_PC_MODULE)
 	AC_SUBST(GTK_VERSION)
 
-	dnl We only really need Pango >= 1.4 for decent RTL support
-	PKG_CHECK_MODULES(PANGO, [pango >= 1.4.0],
-			AC_DEFINE(HAVE_PANGO14, 1, [Define if we have Pango 1.4 or newer.]),:)
+	PKG_CHECK_MODULES(PANGO, [pango >= 1.36.0],
+			AC_DEFINE(HAVE_PANGO136, 1, [Define if we have Pango 1.36 or newer.]),:)
 
 	WEBKIT_VERSION=1.3.7
 	WEBKIT_PC_MODULE="webkitgtk-3.0"
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -10241,12 +10241,6 @@ pidgin_conv_window_switch_gtkconv(Pidgin
 static gboolean
 gtkconv_tab_set_tip(GtkWidget *widget, GdkEventCrossing *event, PidginConversation *gtkconv)
 {
-/* PANGO_VERSION_CHECK macro was introduced in 1.15. So we need this double check. */
-#ifndef PANGO_VERSION_CHECK
-#define pango_layout_is_ellipsized(l) TRUE
-#elif !PANGO_VERSION_CHECK(1,16,0)
-#define pango_layout_is_ellipsized(l) TRUE
-#endif
 	PangoLayout *layout;
 
 	layout = gtk_label_get_layout(GTK_LABEL(gtkconv->tab_label));