/soc/2015/mmcc/main: 4804c4fc3a19: we now assume that we have Pa...

[Michael McConville]

Changeset: 4804c4fc3a19191e0fd6686207dd0658f5421dbd
Author:	 Michael McConville <mmcconville at mykolab.com>
Date:	 2015-06-24 20:31 -0400
Branch:	 default
URL: https://hg.pidgin.im/soc/2015/mmcc/main/rev/4804c4fc3a19

Description:

we now assume that we have Pango when using GTK

diffstat:

 configure.ac      |  15 +++++++++++----
 pidgin/gtkutils.c |  22 ----------------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diffs (74 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -479,11 +479,12 @@ AM_CONDITIONAL(INSTALL_I18N, test "x$ena
 dnl #######################################################################
 dnl # Check for GLib 2.40 (required)
 dnl #######################################################################
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.40.0 gobject-2.0 gthread-2.0], , [
+GLIB_VERSION=2.40.0
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= $GLIB_VERSION gobject-2.0 gthread-2.0], , [
 	AC_MSG_RESULT(no)
 	AC_MSG_ERROR([
 
-You must have GLib 2.40.0 or newer development headers installed to build.
+You must have GLib $GLIB_VERSION or newer development headers installed to build.
 
 If you have these installed already you may need to install pkg-config so
 I can find them.
@@ -592,8 +593,14 @@ running configure.
 	AC_SUBST(GTK_PC_MODULE)
 	AC_SUBST(GTK_VERSION)
 
-	PKG_CHECK_MODULES(PANGO, [pango >= 1.34.0],
-			AC_DEFINE(HAVE_PANGO134, 1, [Define if we have Pango 1.34 or newer.]),:)
+	PANGO_VERSION=1.34.0
+	PKG_CHECK_MODULES(PANGO, [pango >= $PANGO_VERSION], , [
+		AC_MSG_RESULT(no)
+		AC_MSG_ERROR([
+You must have Pango $PANGO_VERSION or newer development headers
+installed to compile Pidgin.  If you want to build only Finch then specify
+--disable-gtkui when running configure.
+])])
 
 	WEBKIT_VERSION=1.3.7
 	WEBKIT_PC_MODULE="webkitgtk-3.0"
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -2629,7 +2629,6 @@ gboolean pidgin_tree_view_search_equal_f
 		return FALSE;
 	}
 
-
 	/* Use Pango to separate by words. */
 	len = g_utf8_strlen(normalized, -1);
 	log_attrs = g_new(PangoLogAttr, len + 1);
@@ -2650,27 +2649,6 @@ gboolean pidgin_tree_view_search_equal_f
 	}
 	g_free(log_attrs);
 
-/* The non-Pango version. */
-#if 0
-	word = normalized;
-	result = TRUE;
-	while (word[0] != '\0')
-	{
-		gunichar c = g_utf8_get_char(word);
-		if (!g_unichar_isalnum(c))
-		{
-			word = g_utf8_find_next_char(word, NULL);
-			if (purple_str_has_prefix(word, enteredstring))
-			{
-				result = FALSE;
-				break;
-			}
-		}
-		else
-			word = g_utf8_find_next_char(word, NULL);
-	}
-#endif
-
 	g_free(withmarkup);
 	g_free(enteredstring);
 	g_free(normalized);