Mercurial > pidgin.yaz
changeset 21943:0981db925997
merge of 'c0a74e417ec8993798705c2cbfca7b7d8b0bc514'
and 'edf0d391d778af94bc536403190c19eafedd6142'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 26 Dec 2007 02:49:24 +0000 |
| parents | c0f6a658ad6b (diff) 94dad52b61b4 (current diff) |
| children | c2c66ffcdfa7 |
| files | |
| diffstat | 6 files changed, 11 insertions(+), 51 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue Dec 25 08:49:35 2007 +0000 +++ b/configure.ac Wed Dec 26 02:49:24 2007 +0000 @@ -678,7 +678,6 @@ PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [ have_meanwhile="yes" ], [ - AC_MSG_RESULT(no) have_meanwhile="no" ]) AC_SUBST(MEANWHILE_CFLAGS) @@ -697,7 +696,6 @@ avahiincludes="yes" avahilibs="yes" ], [ - AC_MSG_RESULT(no) avahiincludes="no" avahilibs="no" ]) @@ -742,7 +740,6 @@ silcincludes="yes" silcclient="yes" ], [ - AC_MSG_RESULT(no) have_silc="no" ]) if test "x$have_silc" = "xno"; then @@ -751,7 +748,6 @@ silc10includes="yes" silc10client="yes" ], [ - AC_MSG_RESULT(no) have_silc="no" ]) dnl If silcclient.pc wasn't found, check for just silc.pc @@ -761,7 +757,6 @@ silc10includes="yes" silc10client="yes" ], [ - AC_MSG_RESULT(no) have_silc="no" ]) fi @@ -1154,7 +1149,6 @@ AC_SUBST(DBUS_LIBS) enable_dbus=yes ], [ - AC_MSG_RESULT(no) enable_dbus=no ])
--- a/libpurple/account.c Tue Dec 25 08:49:35 2007 +0000 +++ b/libpurple/account.c Wed Dec 26 02:49:24 2007 +0000 @@ -1645,7 +1645,7 @@ if (status == NULL) { purple_debug_error("account", - "Invalid status ID %s for account %s (%s)\n", + "Invalid status ID '%s' for account %s (%s)\n", status_id, purple_account_get_username(account), purple_account_get_protocol_id(account)); return;
--- a/libpurple/prefs.c Tue Dec 25 08:49:35 2007 +0000 +++ b/libpurple/prefs.c Wed Dec 26 02:49:24 2007 +0000 @@ -438,19 +438,6 @@ g_free(filename); prefs_loaded = TRUE; - /* I introduced a bug in 2.0.0beta2. This fixes the broken - * scores on upgrade. This can be removed sometime shortly - * after 2.0.0 final is released. -- rlaager */ - if (purple_prefs_get_int("/purple/status/scores/offline") == -500 && - purple_prefs_get_int("/purple/status/scores/available") == 100 && - purple_prefs_get_int("/purple/status/scores/invisible") == -50 && - purple_prefs_get_int("/purple/status/scores/away") == -100 && - purple_prefs_get_int("/purple/status/scores/extended_away") == -200 && - purple_prefs_get_int("/purple/status/scores/idle") == -400) - { - purple_prefs_set_int("/purple/status/scores/idle", -10); - } - return TRUE; }
--- a/libpurple/protocols/msn/soap2.c Tue Dec 25 08:49:35 2007 +0000 +++ b/libpurple/protocols/msn/soap2.c Wed Dec 26 02:49:24 2007 +0000 @@ -170,6 +170,9 @@ { MsnSoapConnection *conn = data; + /* sslconn already frees the connection in case of error */ + conn->ssl = NULL; + g_hash_table_remove(conn->session->soap_table, conn->host); }
--- a/libpurple/protocols/qq/group_opt.c Tue Dec 25 08:49:35 2007 +0000 +++ b/libpurple/protocols/qq/group_opt.c Wed Dec 26 02:49:24 2007 +0000 @@ -39,37 +39,12 @@ #include "packet_parse.h" #include "utils.h" -/* TODO: can't we use qsort here? */ -/* This implement quick sort algorithm (low->high) */ -static void _quick_sort(gint *numbers, gint left, gint right) +static int _compare_guint32(const void *a, + const void *b) { - gint pivot, l_hold, r_hold; - - l_hold = left; - r_hold = right; - pivot = numbers[left]; - while (left < right) { - while ((numbers[right] >= pivot) && (left < right)) - right--; - if (left != right) { - numbers[left] = numbers[right]; - left++; - } - while ((numbers[left] <= pivot) && (left < right)) - left++; - if (left != right) { - numbers[right] = numbers[left]; - right--; - } - } - numbers[left] = pivot; - pivot = left; - left = l_hold; - right = r_hold; - if (left < pivot) - _quick_sort(numbers, left, pivot - 1); - if (right > pivot) - _quick_sort(numbers, pivot + 1, right); + const guint32 *x = a; + const guint32 *y = b; + return (*x - *y); } static void _sort(guint32 *list) @@ -77,7 +52,7 @@ gint i; for (i = 0; list[i] < 0xffffffff; i++) {; } - _quick_sort((gint *) list, 0, i - 1); + qsort (list, i, sizeof (guint32), _compare_guint32); } static void _qq_group_member_opt(PurpleConnection *gc, qq_group *group, gint operation, guint32 *members)