/pidgin/main: f269ff3e4830: Clang warnings: clean up pidgin

[Tomasz Wasilczyk]

Changeset: f269ff3e4830b653e23e49d687ea2de22bc1b6ab
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2013-10-04 21:59 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/f269ff3e4830

Description:

Clang warnings: clean up pidgin

diffstat:

 configure.ac           |   3 ++-
 pidgin/gtkimhtml.c     |   2 +-
 pidgin/gtksourceiter.c |  18 ++++++++++--------
 3 files changed, 13 insertions(+), 10 deletions(-)

diffs (61 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1490,8 +1490,9 @@ AC_SUBST(CFLAGS)
 
 AC_PATH_PROG(pidginpath, pidgin)
 
-if test "x$CC" = "xclang"; then
+if test "${CC: -6}" = "/clang" -o "$CC" = "clang"; then
 	AC_DEFINE([HAVE_CLANG], [1], [Define to 1 if you compile with clang.])
+	GLIB_LIBS=`echo $GLIB_LIBS | $sedpath 's/-pthread/-lpthread/'`
 fi
 
 dnl #######################################################################
diff --git a/pidgin/gtkimhtml.c b/pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c
+++ b/pidgin/gtkimhtml.c
@@ -733,7 +733,7 @@ gtk_motion_event_notify(GtkWidget *imhtm
 	}
 
 	if (GTK_IMHTML(imhtml)->tip) {
-		if ((tip == GTK_IMHTML(imhtml)->tip)) {
+		if (tip == GTK_IMHTML(imhtml)->tip) {
 			g_slist_free(tags);
 			return FALSE;
 		}
diff --git a/pidgin/gtksourceiter.c b/pidgin/gtksourceiter.c
--- a/pidgin/gtksourceiter.c
+++ b/pidgin/gtksourceiter.c
@@ -575,10 +575,11 @@ gtk_source_iter_forward_search (const Gt
 	g_return_val_if_fail (iter != NULL, FALSE);
 	g_return_val_if_fail (str != NULL, FALSE);
 
-	if ((flags & GTK_SOURCE_SEARCH_CASE_INSENSITIVE) == 0)
-		return gtk_text_iter_forward_search (iter, str, flags,
-						     match_start, match_end,
-						     limit);
+	if ((flags & GTK_SOURCE_SEARCH_CASE_INSENSITIVE) == 0) {
+		return gtk_text_iter_forward_search (iter, str,
+			(GtkTextSearchFlags)flags, match_start, match_end,
+			limit);
+	}
 
 	if (limit && gtk_text_iter_compare (iter, limit) >= 0)
 		return FALSE;
@@ -678,10 +679,11 @@ gtk_source_iter_backward_search (const G
 	g_return_val_if_fail (iter != NULL, FALSE);
 	g_return_val_if_fail (str != NULL, FALSE);
 
-	if ((flags & GTK_SOURCE_SEARCH_CASE_INSENSITIVE) == 0)
-		return gtk_text_iter_backward_search (iter, str, flags,
-						      match_start, match_end,
-						      limit);
+	if ((flags & GTK_SOURCE_SEARCH_CASE_INSENSITIVE) == 0) {
+		return gtk_text_iter_backward_search (iter, str,
+			(GtkTextSearchFlags)flags, match_start, match_end,
+			limit);
+	}
 
 	if (limit && gtk_text_iter_compare (iter, limit) <= 0)
 		return FALSE;