/pidgin/main: 2b5a26ddbb69: Merge release-2.x.y

[Tomasz Wasilczyk]

Changeset: 2b5a26ddbb69211f03f045c050df1bfb62334631
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-05-06 18:27 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/2b5a26ddbb69

Description:

Merge release-2.x.y

diffstat:

 Makefile.am                             |  4 ++--
 finch/libfinch.c                        |  1 -
 libpurple/protocols/oscar/family_auth.c |  2 +-
 libpurple/protocols/oscar/oscar.c       |  6 +++---
 pidgin/gtkconv.c                        |  5 ++++-
 pidgin/gtkrequest.c                     |  3 +--
 6 files changed, 11 insertions(+), 10 deletions(-)

diffs (111 lines):

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -125,10 +125,10 @@ package_revision_raw.txt: .FORCE
 	fi
 package_revision.h: package_revision_raw.txt
 	$(AM_V_GEN)if test -f $<; then \
-	  echo "#define REVISION \"`cat $<`\"" > $@; \
+		echo "#define REVISION \"`cat $<`\"" > $@; \
 	fi
 	$(AM_V_at)if test ! -f $@ -a -f $(srcdir)/$@; then \
-	  cp $(srcdir)/$@ $@; \
+		cp $(srcdir)/$@ $@; \
 	fi
 	$(AM_V_at)test -f $@ || echo "#define REVISION \"unknown\"" > $@
 
diff --git a/finch/libfinch.c b/finch/libfinch.c
--- a/finch/libfinch.c
+++ b/finch/libfinch.c
@@ -417,4 +417,3 @@ gboolean finch_start(int *argc, char ***
 	purple_blist_show();
 	return TRUE;
 }
-
diff --git a/libpurple/protocols/oscar/family_auth.c b/libpurple/protocols/oscar/family_auth.c
--- a/libpurple/protocols/oscar/family_auth.c
+++ b/libpurple/protocols/oscar/family_auth.c
@@ -589,7 +589,7 @@ aim_auth_securid_send(OscarData *od, con
 
 	frame = flap_frame_new(od, 0x02, 10+2+len);
 
-	/* aim_snacid_t snacid = */aim_cachesnac(od, SNAC_FAMILY_AUTH, SNAC_SUBTYPE_AUTH_SECURID_RESPONSE, 0x0000, NULL, 0);
+	/* aim_snacid_t snacid = */ aim_cachesnac(od, SNAC_FAMILY_AUTH, SNAC_SUBTYPE_AUTH_SECURID_RESPONSE, 0x0000, NULL, 0);
 	aim_putsnac(&frame->data, SNAC_FAMILY_AUTH, SNAC_SUBTYPE_AUTH_SECURID_RESPONSE, 0);
 
 	byte_stream_put16(&frame->data, len);
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -1663,8 +1663,8 @@ incomingim_chan4(OscarData *od, FlapConn
 		return 1;
 
 	purple_debug_info("oscar",
-					"Received a channel 4 message of type 0x%02hx.\n",
-					(guint16)args->type);
+		"Received a channel 4 message of type 0x%02hx.",
+		(guint16)args->type);
 
 	/*
 	 * Split up the message at the delimeter character, then convert each
@@ -2461,7 +2461,7 @@ static int purple_icon_parseicon(OscarDa
 
 	va_start(ap, fr);
 	bn = va_arg(ap, char *);
-	va_arg(ap, int); /* iconcsumtype */
+	va_arg(ap, int); /* iconsumtype */
 	iconcsum = va_arg(ap, guint8 *);
 	iconcsumlen = va_arg(ap, int);
 	icon = va_arg(ap, guint8 *);
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -6888,7 +6888,6 @@ pidgin_conv_write_conv(PurpleConversatio
 		/* The initial offset is to deal with
 		 * escaped entities making the string longer */
 		int tag_start_offset = 0;
-		int tag_end_offset = 0;
 		const char *tagname = NULL;
 
 		/* Enforce direction on alias */
@@ -6906,7 +6905,9 @@ pidgin_conv_write_conv(PurpleConversatio
 			else {
 				g_snprintf(str, 1024, "*%s*:", alias_escaped);
 				tag_start_offset += 1;
+#if 0
 				tag_end_offset = 2;
+#endif
 				tagname = "whisper-name";
 			}
 		} else {
@@ -6929,7 +6930,9 @@ pidgin_conv_write_conv(PurpleConversatio
 					tag_start_offset += strlen(AUTO_RESPONSE) - 6 + 1;
 				} else {
 					g_snprintf(str, 1024, "%s:", alias_escaped);
+#if 0
 					tag_end_offset = 1;
+#endif
 				}
 
 				if (flags & PURPLE_MESSAGE_NICK) {
diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c
--- a/pidgin/gtkrequest.c
+++ b/pidgin/gtkrequest.c
@@ -2538,7 +2538,6 @@ pidgin_request_file(const char *title, c
 	}
 
 #ifdef _WIN32
-
 	if (savedialog) {
 		current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_save_folder");
 	} else {
@@ -2560,8 +2559,8 @@ pidgin_request_file(const char *title, c
 			g_free(my_documents);
 		}
 	}
-
 #endif
+
 	g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(filesel)), "response",
 					 G_CALLBACK(file_ok_check_if_exists_cb), data);