diff options
| author | Luke Schierer <lschiere@pidgin.im> | 2007-10-21 04:59:23 +0000 |
|---|---|---|
| committer | Luke Schierer <lschiere@pidgin.im> | 2007-10-21 04:59:23 +0000 |
| commit | f2caddbaac52fe164b51a3a08226a1ebd836c70a (patch) | |
| tree | 714d17d48b1c3ee13732a4a26afcbcac3d43716c | |
| parent | ebb6d4ba1e83fc05eb0ea8363e17fb0c2fa09da7 (diff) | |
| download | pidgin-f2caddbaac52fe164b51a3a08226a1ebd836c70a.tar.gz | |
applied changes from c6a89223516b0abb6cbb399c2066e3b6a7b69d19
through 63a37bce425022f4c52fab82e7169ed73f50a49e
applied changes from 63a37bce425022f4c52fab82e7169ed73f50a49e
through 8d61a119c53ac77e595d5ec300d30482b914bdf7
applied changes from 8d61a119c53ac77e595d5ec300d30482b914bdf7
through 300feed94260af48cd2026be3fd424eeb742fb77
applied changes from 300feed94260af48cd2026be3fd424eeb742fb77
through 39954083d38f554f75dac0d4fe8b2f7bac3cd0c8
| -rw-r--r-- | libpurple/dbus-server.c | 10 | ||||
| -rw-r--r-- | libpurple/protocols/oscar/oscar.c | 1 | ||||
| -rw-r--r-- | libpurple/protocols/oscar/util.c | 4 | ||||
| -rw-r--r-- | libpurple/util.c | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/libpurple/dbus-server.c b/libpurple/dbus-server.c index 974aae45dc..0b84a98e5a 100644 --- a/libpurple/dbus-server.c +++ b/libpurple/dbus-server.c @@ -674,6 +674,8 @@ purple_dbus_message_append_purple_values(DBusMessageIter *iter, 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(DBusMessageIter *iter, 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); diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c index 9ca65a76ae..328efea541 100644 --- a/libpurple/protocols/oscar/oscar.c +++ b/libpurple/protocols/oscar/oscar.c @@ -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)))) { diff --git a/libpurple/protocols/oscar/util.c b/libpurple/protocols/oscar/util.c index 973c37e9fa..6875f68887 100644 --- a/libpurple/protocols/oscar/util.c +++ b/libpurple/protocols/oscar/util.c @@ -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; } diff --git a/libpurple/util.c b/libpurple/util.c index f205efeb24..46c573dd23 100644 --- a/libpurple/util.c +++ b/libpurple/util.c @@ -1532,8 +1532,8 @@ purple_markup_html_to_xhtml(const char *html, char **xhtml_out, 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; } |