im.pidgin.pidgin.2.2.2: 23219c685c675f8ac74e431a92e0debc62171dcf

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: 23219c685c675f8ac74e431a92e0debc62171dcf
Ancestor: 04bfad6a6a1f6eae2036aa19521fd33933911a2f
Author: lschiere at pidgin.im
Date: 2007-10-21T04:59:23
Branch: im.pidgin.pidgin.2.2.2

Modified files:
        libpurple/dbus-server.c libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/util.c libpurple/util.c

ChangeLog: 

applied changes from c6a89223516b0abb6cbb399c2066e3b6a7b69d19
             through 63a37bce425022f4c52fab82e7169ed73f50a49e

applied changes from 63a37bce425022f4c52fab82e7169ed73f50a49e
             through 8d61a119c53ac77e595d5ec300d30482b914bdf7

applied changes from 8d61a119c53ac77e595d5ec300d30482b914bdf7
             through 300feed94260af48cd2026be3fd424eeb742fb77

applied changes from 300feed94260af48cd2026be3fd424eeb742fb77
             through 39954083d38f554f75dac0d4fe8b2f7bac3cd0c8

-------------- next part --------------
============================================================
--- libpurple/dbus-server.c	d95604bc588db428fb05bff965a1bdce89dd6c3b
+++ libpurple/dbus-server.c	6452b12fec6bcb52b434ae76bc1dd199b6dd96fd
@@ -674,6 +674,8 @@ purple_dbus_message_append_purple_values
 		int id;
 		gint xint;
 		guint xuint;
+		gint64 xint64;
+		guint64 xuint64;
 		gboolean xboolean;
 		gpointer ptr = NULL;
 		gpointer val;
@@ -694,6 +696,14 @@ purple_dbus_message_append_purple_values
 			xuint = my_arg(guint);
 			dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &xuint);
 			break;
+		case PURPLE_TYPE_INT64:
+			xint = my_arg(gint64);
+			dbus_message_iter_append_basic(iter, DBUS_TYPE_INT64, &xint);
+			break;
+		case PURPLE_TYPE_UINT64:
+			xuint = my_arg(guint64);
+			dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT64, &xuint);
+			break;
 		case PURPLE_TYPE_BOOLEAN:
 			xboolean = my_arg(gboolean);
 			dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &xboolean);
============================================================
--- libpurple/protocols/oscar/oscar.c	6f4eb1209665fcba2b468360230a6213277e6dd6
+++ libpurple/protocols/oscar/oscar.c	c9c6bf1e13ed01716383124adcda1d4d99446f92
@@ -1263,6 +1263,7 @@ oscar_login(PurpleAccount *account)
 		gc->wants_to_die = TRUE;
 		purple_connection_error(gc, buf);
 		g_free(buf);
+		return;
 	}
 
 	if (aim_snvalid_icq((purple_account_get_username(account)))) {
============================================================
--- libpurple/protocols/oscar/util.c	a56d12ae5b78ab7368a357a88a50f00a29f53c26
+++ libpurple/protocols/oscar/util.c	0345c42bf7ea1402a21aedc275a827883c07f4f7
@@ -156,9 +156,7 @@ aim_snvalid_aim(const char *sn)
 		return FALSE;
 
 	for (i = 0; sn[i] != '\0'; i++) {
-		if (!isalnum(sn[i]) && (sn[i] != ' ') &&
-			(sn[i] != '.') &&
-			(sn[i] != '_') && (sn[i] != '-'))
+		if (!isalnum(sn[i]) && (sn[i] != ' '))
 			return FALSE;
 	}
 
============================================================
--- libpurple/util.c	9420c927f92bd71eb0b20230bbcb3be416f3ffcf
+++ libpurple/util.c	35cf28aad624d0bb6301b48212d39640d04564c6
@@ -1532,8 +1532,8 @@ purple_markup_html_to_xhtml(const char *
 							plain = g_string_append(plain, alt->str);
 						if(!src && xhtml)
 							xhtml = g_string_append(xhtml, alt->str);
+						g_string_free(alt, TRUE);
 					}
-					g_string_free(alt, TRUE);
 					g_string_free(src, TRUE);
 					continue;
 				}