/pidgin/main: 52cc04429e2c: Gadu-Gadu: small bugfixes

[Tomasz Wasilczyk]

Changeset: 52cc04429e2c6f58f20f810192ddd7a0595cc908
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2012-09-04 01:49 +0200
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/52cc04429e2c

Description:

Gadu-Gadu: small bugfixes

diffstat:

 libpurple/protocols/gg/gg.c     |   7 +++++--
 libpurple/protocols/gg/status.c |  10 ++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diffs (47 lines):

diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -696,8 +696,11 @@ static void ggp_async_login_handler(gpoi
 			}
 			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) {
diff --git a/libpurple/protocols/gg/status.c b/libpurple/protocols/gg/status.c
--- a/libpurple/protocols/gg/status.c
+++ b/libpurple/protocols/gg/status.c
@@ -132,6 +132,7 @@ int ggp_status_from_purplestatus(PurpleS
 	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 @@ void ggp_status_got_others_buddy(PurpleC
 	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);