Mercurial > pidgin3 / changeset

--- a/Makefile.am	Wed Sep 05 04:26:46 2012 -0400
+++ b/Makefile.am	Fri Sep 07 22:50:29 2012 -0400
@@ -6,7 +6,7 @@
 		HACKING \
 		Makefile.mingw \
 		PLUGIN_HOWTO \
-		README.MTN \
+		README.hg \
 		README.mingw \
 		config.h.mingw \
 		doxy2devhelp.xsl \

--- a/configure.ac	Wed Sep 05 04:26:46 2012 -0400
+++ b/configure.ac	Fri Sep 07 22:50:29 2012 -0400
@@ -820,10 +820,8 @@
 dnl #######################################################################
 
 PKG_CHECK_MODULES(ZLIB, [zlib >= 1.2.0], , [
-	AC_MSG_RESULT(no)
-	AC_MSG_ERROR([
-You must have zlib >= 1.2.0 development headers installed to build.
-])])
+	AC_SEARCH_LIBS([deflate], [z], [], AC_MSG_ERROR([You must have zlib >= 1.2.0 development headers installed to build.]), [])
+])
 
 AC_SUBST(ZLIB_CFLAGS)
 AC_SUBST(ZLIB_LIBS)

--- a/libpurple/accountopt.c	Wed Sep 05 04:26:46 2012 -0400
+++ b/libpurple/accountopt.c	Fri Sep 07 22:50:29 2012 -0400
@@ -27,6 +27,7 @@
 
 #include "accountopt.h"
 #include "util.h"
+#include "glibcompat.h"
 
 /**
  * An option for an account.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/glibcompat.h	Fri Sep 07 22:50:29 2012 -0400
@@ -0,0 +1,55 @@
+/* pidgin
+ *
+ * Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+ */
+#ifndef _PIDGINGLIBCOMPAT_H_
+#define _PIDGINGLIBCOMPAT_H_
+
+/* This file is internal to Pidgin. Do not use!
+ * Also, any public API should not depend on this file.
+ */
+
+#if !GLIB_CHECK_VERSION(2, 28, 0)
+
+static inline void g_list_free_full(GList *list, GDestroyNotify free_func)
+{
+	GList *it;
+	it = g_list_first(list);
+	while (it)
+	{
+		free_func(it->data);
+		it = g_list_next(it);
+	}
+	g_list_free(list);
+}
+
+static inline void g_slist_free_full(GSList *list, GDestroyNotify free_func)
+{
+	GSList *it = list;
+	while (it)
+	{
+		free_func(it->data);
+		it = g_slist_next(it);
+	}
+	g_slist_free(list);
+}
+
+#endif /* 2.28.0 */
+
+#endif /* _PIDGINGLIBCOMPAT_H_ */

--- a/libpurple/protocols/gg/avatar.c	Wed Sep 05 04:26:46 2012 -0400
+++ b/libpurple/protocols/gg/avatar.c	Fri Sep 07 22:50:29 2012 -0400
@@ -30,6 +30,7 @@
 #include "avatar.h"
 
 #include <debug.h>
+#include <glibcompat.h>
 
 #include "gg.h"
 #include "utils.h"

--- a/libpurple/protocols/gg/gg.c	Wed Sep 05 04:26:46 2012 -0400
+++ b/libpurple/protocols/gg/gg.c	Fri Sep 07 22:50:29 2012 -0400
@@ -696,8 +696,11 @@
 			}
 			break;
 		case GG_EVENT_CONN_FAILED:
-			purple_input_remove(info->inpa);
-			info->inpa = 0;
+			if (info->inpa > 0)
+			{
+				purple_input_remove(info->inpa);
+				info->inpa = 0;
+			}
 			purple_debug_info("gg", "Connection failure: %d\n",
 				ev->event.failure);
 			switch (ev->event.failure) {

--- a/libpurple/protocols/gg/image.c	Wed Sep 05 04:26:46 2012 -0400
+++ b/libpurple/protocols/gg/image.c	Fri Sep 07 22:50:29 2012 -0400
@@ -30,6 +30,7 @@
 #include "image.h"
 
 #include <debug.h>
+#include <glibcompat.h>
 
 #include "gg.h"
 #include "utils.h"

--- a/libpurple/protocols/gg/roster.c	Wed Sep 05 04:26:46 2012 -0400
+++ b/libpurple/protocols/gg/roster.c	Fri Sep 07 22:50:29 2012 -0400
@@ -35,6 +35,7 @@
 #include "purplew.h"
 
 #include <debug.h>
+#include <glibcompat.h>
 
 #define GGP_ROSTER_SYNC_SETT "gg-synchronized"
 #define GGP_ROSTER_DEBUG 0

--- a/libpurple/protocols/gg/servconn.c	Wed Sep 05 04:26:46 2012 -0400
+++ b/libpurple/protocols/gg/servconn.c	Fri Sep 07 22:50:29 2012 -0400
@@ -32,6 +32,7 @@
 #include "utils.h"
 
 #include <debug.h>
+#include <glibcompat.h>
 
 #define GGP_SERVCONN_HISTORY_PREF "/plugins/prpl/gg/server_history"
 #define GGP_SERVCONN_HISTORY_MAXLEN 15

--- a/libpurple/protocols/gg/status.c	Wed Sep 05 04:26:46 2012 -0400
+++ b/libpurple/protocols/gg/status.c	Fri Sep 07 22:50:29 2012 -0400
@@ -132,6 +132,7 @@
 	if (status_message)
 	{
 		gchar *stripped = purple_markup_strip_html(status_message);
+		g_strstrip(stripped);
 		*message = ggp_status_validate_description(stripped);
 		g_free(stripped);
 	}
@@ -405,11 +406,16 @@
 	PurpleBuddy *buddy = purple_find_buddy(account, ggp_uin_to_str(uin));
 	const gchar *purple_status = ggp_status_to_purplestatus(status);
 	gchar *status_message = NULL;
+	gboolean is_own;
+	
+	is_own = 0 == g_strcmp0(ggp_uin_to_str(uin), purple_account_get_username(account));
 	
 	if (!buddy)
 	{
-		purple_debug_warning("gg", "ggp_status_got_others_buddy: "
-			"buddy %u not found\n", uin);
+		if (!is_own)
+			purple_debug_warning("gg",
+				"ggp_status_got_others_buddy: "
+				"buddy %u not found\n", uin);
 		return;
 	}
 	ggp_buddy_get_data(buddy)->blocked = (status == GG_STATUS_BLOCKED);

--- a/pidgin/themes/Contents/Resources/main.css	Wed Sep 05 04:26:46 2012 -0400
+++ b/pidgin/themes/Contents/Resources/main.css	Fri Sep 07 22:50:29 2012 -0400
@@ -10,8 +10,11 @@
 .x-container,
 .x-status_container
 {
+	clear: left;
 	line-height: 1.3em;
 	margin-bottom: 4px;
+	height: 100%;
+	overflow: hidden;
 }
 
 .x-container .x-time,
@@ -23,14 +26,18 @@
 
 .x-container .x-sender
 {
-	display: inline;
 	font-weight: bold;
 }
 
-.x-container .x-message,
-.x-status_container .x-message
+.x-time, .x-sender
 {
-	display: inline;
+	float: left;
+	margin-right: 4px;
+}
+
+.x-message p
+{
+	margin: 0;
 }
 
 /* Colour-ify things */