Mercurial > pidgin
changeset 21640:ed57eeb486d5
merge of 'a3da14876c865437f0916509629a649308081104'
and 'b1278944ccaa36c30b7f00edf5b79dc38347c931'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Mon, 26 Nov 2007 05:41:09 +0000 |
| parents | fa5d1f426332 (diff) 6636546aeacf (current diff) |
| children | ee7638c696f1 |
| files | |
| diffstat | 13 files changed, 39 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Nov 26 05:39:37 2007 +0000 +++ b/ChangeLog Mon Nov 26 05:41:09 2007 +0000 @@ -1,6 +1,6 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.3.0 (11/20/2007): +version 2.3.0 (11/24/2007): http://developer.pidgin.im/query?status=closed&milestone=2.3.0 NOTE: Some bugs marked fixed in 2.2.1, 2.2.2 or 2.2.3 may not have been fixed until this release (2.3.0).
--- a/ChangeLog.API Mon Nov 26 05:39:37 2007 +0000 +++ b/ChangeLog.API Mon Nov 26 05:41:09 2007 +0000 @@ -1,6 +1,6 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.3.0 (11/20/2007): +version 2.3.0 (11/24/2007): libpurple: Added: * a PurpleConversation field and an alias field in PurpleConvMessage
--- a/ChangeLog.win32 Mon Nov 26 05:39:37 2007 +0000 +++ b/ChangeLog.win32 Mon Nov 26 05:41:09 2007 +0000 @@ -1,4 +1,4 @@ -version 2.3.0 (11/20/2007): +version 2.3.0 (11/24/2007): * Updated GTK+ to 2.12.1 (This was actually included in 2.2.2, but didn't get into the Changelog.) * Upgrade SILC to use the 1.1.5 toolkit
--- a/configure.ac Mon Nov 26 05:39:37 2007 +0000 +++ b/configure.ac Mon Nov 26 05:41:09 2007 +0000 @@ -46,8 +46,8 @@ m4_define([purple_lt_current], [3]) m4_define([purple_major_version], [2]) m4_define([purple_minor_version], [3]) -m4_define([purple_micro_version], [0]) -m4_define([purple_version_suffix], []) +m4_define([purple_micro_version], [1]) +m4_define([purple_version_suffix], [devel]) m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix])) @@ -55,8 +55,8 @@ m4_define([gnt_lt_current], [3]) m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [3]) -m4_define([gnt_micro_version], [0]) -m4_define([gnt_version_suffix], []) +m4_define([gnt_micro_version], [1]) +m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
--- a/finch/libgnt/configure.ac Mon Nov 26 05:39:37 2007 +0000 +++ b/finch/libgnt/configure.ac Mon Nov 26 05:41:09 2007 +0000 @@ -27,8 +27,8 @@ m4_define([gnt_lt_current], [3]) m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [3]) -m4_define([gnt_micro_version], [0]) -m4_define([gnt_version_suffix], []) +m4_define([gnt_micro_version], [1]) +m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
--- a/finch/libgnt/gnt.h Mon Nov 26 05:39:37 2007 +0000 +++ b/finch/libgnt/gnt.h Mon Nov 26 05:41:09 2007 +0000 @@ -30,6 +30,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ +#ifndef GNT_H +#define GNT_H + #include <glib.h> #include "gntwidget.h" #include "gntclipboard.h" @@ -201,3 +204,4 @@ */ gboolean gnt_is_refugee(void); +#endif /* GNT_H */
--- a/libpurple/Makefile.am Mon Nov 26 05:39:37 2007 +0000 +++ b/libpurple/Makefile.am Mon Nov 26 05:41:09 2007 +0000 @@ -156,7 +156,7 @@ dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h buddyicon.h \ connection.h conversation.h core.h ft.h log.h notify.h prefs.h roomlist.h \ - savedstatuses.h status.h server.h util.h xmlnode.h + savedstatuses.h status.h server.h util.h xmlnode.h prpl.h purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders)) \ $(purple_builtheaders)
--- a/libpurple/protocols/jabber/google.c Mon Nov 26 05:39:37 2007 +0000 +++ b/libpurple/protocols/jabber/google.c Mon Nov 26 05:41:09 2007 +0000 @@ -532,6 +532,6 @@ char *jabber_google_presence_outgoing(PurpleStatus *tune) { - char *ret = g_strdup_printf("♫ %s", purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE)); - return ret; + const char *attr = purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE); + return attr ? g_strdup_printf("♫ %s", attr) : g_strdup(""); }
--- a/libpurple/protocols/jabber/libxmpp.c Mon Nov 26 05:39:37 2007 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Mon Nov 26 05:41:09 2007 +0000 @@ -219,33 +219,31 @@ option); option = purple_account_option_bool_new( - _("Allow plaintext auth over unencrypted streams"), - "auth_plain_in_clear", FALSE); + _("Allow plaintext auth over unencrypted streams"), + "auth_plain_in_clear", FALSE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, - option); - + option); + option = purple_account_option_int_new(_("Connect port"), "port", 5222); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, - option); - + option); + option = purple_account_option_string_new(_("Connect server"), - "connect_server", NULL); + "connect_server", NULL); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, - option); - -#if 0 /* TODO: Enable this when we're string unfrozen */ + option); + option = purple_account_option_string_new(_("File transfer proxies"), "ft_proxies", /* TODO: Is this an acceptable default? */ "proxy.jabber.org:7777"); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); -#endif jabber_init_plugin(plugin); - + purple_prefs_remove("/plugins/prpl/jabber"); - + /* XXX - If any other plugin wants SASL this won't be good ... */ #ifdef HAVE_CYRUS_SASL #ifdef _WIN32
--- a/libpurple/protocols/jabber/si.c Mon Nov 26 05:39:37 2007 +0000 +++ b/libpurple/protocols/jabber/si.c Mon Nov 26 05:41:09 2007 +0000 @@ -780,6 +780,9 @@ g_snprintf(port, sizeof(port), "%hu", portnum); + if(g_list_find_custom(jsx->streamhosts, ft_proxy_list[i], jabber_si_compare_jid) != NULL) + continue; + streamhost = xmlnode_new_child(query, "streamhost"); xmlnode_set_attrib(streamhost, "jid", ft_proxy_list[i]); xmlnode_set_attrib(streamhost, "host", ft_proxy_list[i]); @@ -801,7 +804,10 @@ /* TODO: deal with zeroconf proxies */ - if (!(sh->host && sh->port > 0)) + if (!(sh->jid && sh->host && sh->port > 0)) + continue; + + if(g_list_find_custom(jsx->streamhosts, sh->jid, jabber_si_compare_jid) != NULL) continue; streamhost = xmlnode_new_child(query, "streamhost");
--- a/libpurple/protocols/qq/packet_parse.h Mon Nov 26 05:39:37 2007 +0000 +++ b/libpurple/protocols/qq/packet_parse.h Mon Nov 26 05:41:09 2007 +0000 @@ -23,7 +23,7 @@ */ #ifndef _QQ_PACKET_PARSE_H_ -#define _QQ_PACKED_PARSE_H_ +#define _QQ_PACKET_PARSE_H_ #include <glib.h> #include <time.h>
--- a/libpurple/util.c Mon Nov 26 05:39:37 2007 +0000 +++ b/libpurple/util.c Mon Nov 26 05:41:09 2007 +0000 @@ -897,7 +897,7 @@ if (tm != NULL) { - memcpy(tm, &t, sizeof(struct tm)); + *tm = t; tm->tm_isdst = -1; mktime(tm); }
--- a/pidgin/gtkscrollbook.c Mon Nov 26 05:39:37 2007 +0000 +++ b/pidgin/gtkscrollbook.c Mon Nov 26 05:41:09 2007 +0000 @@ -146,15 +146,13 @@ static void pidgin_scroll_book_add(GtkContainer *container, GtkWidget *widget) { - GList *children; PidginScrollBook *scroll_book; g_return_if_fail(GTK_IS_WIDGET (widget)); g_return_if_fail (widget->parent == NULL); scroll_book = PIDGIN_SCROLL_BOOK(container); - children = scroll_book->children; - children = g_list_append(children, widget); + scroll_book->children = g_list_append(scroll_book->children, widget); gtk_widget_show(widget); gtk_notebook_append_page(GTK_NOTEBOOK(PIDGIN_SCROLL_BOOK(container)->notebook), widget, NULL); page_count_change_cb(PIDGIN_SCROLL_BOOK(container)); @@ -176,10 +174,10 @@ child = children->data; if (child == widget) { gtk_widget_unparent (widget); - children = g_list_remove_link (scroll_book->children, children); - g_list_free(children); + scroll_book->children = g_list_delete_link(scroll_book->children, children); break; } + children = children->next; } page = gtk_notebook_page_num(GTK_NOTEBOOK(PIDGIN_SCROLL_BOOK(container)->notebook), widget);