/pidgin/main: 017310ea69c0: Merge with release-2.x.y (with a num...
Daniel Atallah <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 017310ea69c0527dd51a442449e9fdaec1d9ce32 Author: Daniel Atallah <[email protected]> Date: 2014-11-23 23:20 -0500 Branch: default URL: https://hg.pidgin.im/pidgin/main/rev/017310ea69c0 Description: Merge with release-2.x.y (with a number of conflicts) * Lots of po files conflicted and I just chose the files from default. diffstat: .hgtags | 1 + ChangeLog | 8 +- ChangeLog.API | 6 + libpurple/media/enum-types.c | 2 +- libpurple/mediamanager.c | 11 +- libpurple/plugins/ssl/Makefile.mingw | 2 +- libpurple/protocols/gg/lib/network.h | 4 + libpurple/protocols/gg/libgaduw.c | 8 + libpurple/protocols/irc/irc.c | 6 +- libpurple/protocols/msn/contact.c | 3 +- libpurple/protocols/msn/contact.h | 2 +- libpurple/protocols/msn/msn.c | 3 +- libpurple/protocols/msn/notification.c | 9 + libpurple/protocols/msn/session.c | 2 +- pidgin/win32/nsis/pidgin-installer.nsi | 2 + po/ku_IQ.po | 7257 +++---------------------------- 16 files changed, 902 insertions(+), 6424 deletions(-) diffs (truncated from 20692 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -90,3 +90,4 @@ ad7e7fb98db3bbd7bf9ab49072fd34cd4fa25dd9 5010e6877abce3bfc2a4912e6b38fed7d6d3df19 v2.10.8 9438f4b2904d9574b9e6ffba463d354b3661139f v2.10.9 b7fedd2a570b760f252cf8a65a584137ab0af2cb v2.10.10 +e38a9aa5b1f8d25c58a0a7da05b386f265cba6e3 v2.10.11 diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -75,7 +75,7 @@ version 3.0.0 (??/??/????): * The Offline Message Emulation plugin now adds a note that the message was an offline message. (Flavius Anton) (#2497) -version 2.10.11 (?/?/?): +version 2.10.11 (11/23/14): General: * Fix handling of Self-Signed SSL/TLS Certificates when using the NSS plugin (#16412) @@ -86,6 +86,12 @@ version 2.10.11 (?/?/?): Gadu-Gadu: * Fix a bug that prevented plugin to load when compiled without GnuTLS. (mancha) (#16431) + * Fix build for platforms without AF_LOCAL definition. (#16404) + + MSN: + * Fix broken login due to server change (dx, TReKiE). (#16451, #16455) + * Fail early when buddy list is unavailable instead of wasting bandwidth + endlessly re-trying. version 2.10.10 (10/22/14): General: diff --git a/ChangeLog.API b/ChangeLog.API --- a/ChangeLog.API +++ b/ChangeLog.API @@ -512,6 +512,12 @@ version 3.0.0 (??/??/????): * _GntTreeColumnFlag * _GntWidgetFlags +version 2.10.12: + * No changes + +version 2.10.11: + * No changes + version 2.10.10: * No changes diff --git a/libpurple/media/enum-types.c b/libpurple/media/enum-types.c --- a/libpurple/media/enum-types.c +++ b/libpurple/media/enum-types.c @@ -170,7 +170,7 @@ purple_media_session_type_get_type() { PURPLE_MEDIA_RECV_VIDEO, "PURPLE_MEDIA_RECV_VIDEO", "recv-video" }, { PURPLE_MEDIA_SEND_VIDEO, - "PURPLE_MEDIA_SEND_VIDEO", "send-audio" }, + "PURPLE_MEDIA_SEND_VIDEO", "send-video" }, { PURPLE_MEDIA_AUDIO, "PURPLE_MEDIA_AUDIO", "audio" }, { PURPLE_MEDIA_VIDEO, diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c --- a/libpurple/mediamanager.c +++ b/libpurple/mediamanager.c @@ -441,7 +441,11 @@ purple_media_manager_set_video_caps(Purp if (src) { GstElement *capsfilter = gst_bin_get_by_name(GST_BIN(src), "prpl_video_caps"); - g_object_set(G_OBJECT(capsfilter), "caps", caps, NULL); + if (capsfilter) { + g_object_set(G_OBJECT(capsfilter), "caps", caps, NULL); + gst_object_unref (capsfilter); + } + gst_object_unref (src); } g_free(id); @@ -556,6 +560,11 @@ purple_media_manager_get_element(PurpleM } else { ret = purple_media_element_info_call_create(info, media, session_id, participant); + if (element_type & PURPLE_MEDIA_ELEMENT_SRC) { + gst_object_ref(ret); + gst_bin_add(GST_BIN(purple_media_manager_get_pipeline(manager)), + ret); + } } if (ret == NULL) diff --git a/libpurple/plugins/ssl/Makefile.mingw b/libpurple/plugins/ssl/Makefile.mingw --- a/libpurple/plugins/ssl/Makefile.mingw +++ b/libpurple/plugins/ssl/Makefile.mingw @@ -13,7 +13,7 @@ include $(PIDGIN_TREE_TOP)/libpurple/win TARGET = ssl TARGET_NSS = ssl-nss TARGET_GNUTLS = ssl-gnutls -TARGET_NSSPREEFS = nss-prefs +TARGET_NSSPREFS = nss-prefs ## ## INCLUDE PATHS diff --git a/libpurple/protocols/gg/lib/network.h b/libpurple/protocols/gg/lib/network.h --- a/libpurple/protocols/gg/lib/network.h +++ b/libpurple/protocols/gg/lib/network.h @@ -105,6 +105,10 @@ static inline void gg_win32_init_network # define INADDR_NONE ((in_addr_t) 0xffffffff) #endif +#ifndef AF_LOCAL +# define AF_LOCAL AF_UNIX +#endif + static inline int gg_fd_set_nonblocking(int fd) { int success; diff --git a/libpurple/protocols/gg/libgaduw.c b/libpurple/protocols/gg/libgaduw.c --- a/libpurple/protocols/gg/libgaduw.c +++ b/libpurple/protocols/gg/libgaduw.c @@ -87,6 +87,14 @@ static void ggp_libgaduw_debug_handler(i msg = g_strdup_vprintf(format, args); + if (!msg) { + purple_debug_fatal("gg", + "failed to vprintf the following message: %s", + format ? format : "(null)\n"); + + return; + } + if (level & GG_DEBUG_ERROR) purple_level = PURPLE_DEBUG_ERROR; else if (level & GG_DEBUG_WARNING) diff --git a/libpurple/protocols/irc/irc.c b/libpurple/protocols/irc/irc.c --- a/libpurple/protocols/irc/irc.c +++ b/libpurple/protocols/irc/irc.c @@ -66,7 +66,7 @@ static void irc_view_motd(PurplePluginAc { PurpleConnection *gc = (PurpleConnection *) action->context; struct irc_conn *irc; - char *title; + char *title, *body; if (gc == NULL || purple_connection_get_protocol_data(gc) == NULL) { purple_debug(PURPLE_DEBUG_ERROR, "irc", "got MOTD request for NULL gc\n"); @@ -81,8 +81,10 @@ static void irc_view_motd(PurplePluginAc return; } title = g_strdup_printf(_("MOTD for %s"), irc->server); - purple_notify_formatted(gc, title, title, NULL, irc->motd->str, NULL, NULL); + body = g_strdup_printf("<span style=\"font-family: monospace;\">%s</span>", irc->motd->str); + purple_notify_formatted(gc, title, title, NULL, body, NULL, NULL); g_free(title); + g_free(body); } static int do_send(struct irc_conn *irc, const char *buf, gsize len) diff --git a/libpurple/protocols/msn/contact.c b/libpurple/protocols/msn/contact.c --- a/libpurple/protocols/msn/contact.c +++ b/libpurple/protocols/msn/contact.c @@ -96,7 +96,8 @@ msn_callback_state_free(MsnCallbackState g_free(state->old_group_name); g_free(state->new_group_name); g_free(state->guid); - purple_xmlnode_free(state->body); + if (state->body) + purple_xmlnode_free(state->body); g_free(state); } diff --git a/libpurple/protocols/msn/contact.h b/libpurple/protocols/msn/contact.h --- a/libpurple/protocols/msn/contact.h +++ b/libpurple/protocols/msn/contact.h @@ -61,7 +61,7 @@ typedef enum #include "soap.h" /* Thanks to TReKiE on the #pidgin channel for this new ID. */ -#define MSN_APPLICATION_ID "484AAC02-7F59-41B7-9601-772045DCC569" +#define MSN_APPLICATION_ID "F6D2794D-501F-443A-ADBE-8F1490FF30FD" #define MSN_CONTACT_SERVER "local-bay.contacts.msn.com" diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c --- a/libpurple/protocols/msn/msn.c +++ b/libpurple/protocols/msn/msn.c @@ -1594,7 +1594,6 @@ msn_send_im(PurpleConnection *gc, Purple g_free(msgformat); g_free(msgtext); - purple_debug_info("msn", "prepare to send online Message\n"); if (g_ascii_strcasecmp(rcpt, username)) { if (flags & PURPLE_MESSAGE_AUTO_RESP) { @@ -1603,7 +1602,7 @@ msn_send_im(PurpleConnection *gc, Purple if (msn_user_is_yahoo(account, rcpt) || !(msn_user_is_online(account, rcpt) || swboard != NULL)) { /*we send the online and offline Message to Yahoo User via UBM*/ - purple_debug_info("msn", "send to Yahoo User\n"); + purple_debug_info("msn", "send to offline or Yahoo user\n"); msn_notification_send_uum(session, msg); } else { purple_debug_info("msn", "send via switchboard\n"); diff --git a/libpurple/protocols/msn/notification.c b/libpurple/protocols/msn/notification.c --- a/libpurple/protocols/msn/notification.c +++ b/libpurple/protocols/msn/notification.c @@ -628,6 +628,15 @@ msn_notification_dump_contact(MsnSession } if (user->networkid != MSN_NETWORK_UNKNOWN) { + if ((user->list_op & (MSN_LIST_OP_MASK | MSN_LIST_PL_OP)) == MSN_LIST_FL_OP) { + purple_debug_warning("msn", + "User %s is on neither Allow nor Block list, " + "and not Pending addition; " + "adding to Allow list.\n", + user->passport); + msn_user_set_op(user, MSN_LIST_AL_OP); + } + msn_add_contact_xml(adl_node, user->passport, user->list_op & MSN_LIST_OP_MASK, user->networkid); diff --git a/libpurple/protocols/msn/session.c b/libpurple/protocols/msn/session.c --- a/libpurple/protocols/msn/session.c +++ b/libpurple/protocols/msn/session.c @@ -408,7 +408,7 @@ msn_session_set_error(MsnSession *sessio reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR; msg = g_strdup_printf(_("Your MSN buddy list is temporarily " "unavailable: %s"), - (info == NULL) ? _("Unknorn error") : info); + (info == NULL) ? _("Unknown error") : info); break; default: reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR; diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi --- a/pidgin/win32/nsis/pidgin-installer.nsi +++ b/pidgin/win32/nsis/pidgin-installer.nsi @@ -338,6 +338,8 @@ Section $(PIDGINSECTIONTITLE) SecPidgin ;Delete old liboscar and libjabber since they tend to be problematic Delete "$INSTDIR\plugins\liboscar.dll" Delete "$INSTDIR\plugins\libjabber.dll" + ;Delete misnamed nss-prefs plugin from 2.10.11 + Delete "$INSTDIR\plugins\.dll" File /r /x locale /x Gtk ..\..\..\${PIDGIN_INSTALL_DIR}\*.* diff --git a/po/ku_IQ.po b/po/ku_IQ.po --- a/po/ku_IQ.po +++ b/po/ku_IQ.po @@ -1,35 +1,33 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: +# Haval Abdulkarim <[email protected]>, 2014 msgid "" msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-02 09:57-0600\n" -"PO-Revision-Date: 2012-02-20 18:15+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/pidgin/language/ku_IQ/)\n" +"POT-Creation-Date: 2014-11-22 10:22-0800\n" +"PO-Revision-Date: 2014-11-22 05:36+0000\n" +"Last-Translator: Haval Abdulkarim <[email protected]>\n" +"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/pidgin/" +"language/ku_IQ/)\n" +"Language: ku_IQ\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ku_IQ\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Translators may want to transliterate the name. #. It is not to be translated. -#: ../finch/finch.c:66 ../finch/finch.c:335 ../finch/finch.c:364 -#: ../finch/finch.c:459 msgid "Finch" msgstr "" -#: ../finch/finch.c:247 #, c-format msgid "%s. Try `%s -h' for more information.\n" msgstr "" -#: ../finch/finch.c:249 #, c-format msgid "" "%s\n" @@ -42,7 +40,6 @@ msgid "" " -v, --version display the current version and exit\n" msgstr "" -#: ../finch/finch.c:362 ../pidgin/gtkmain.c:776 #, c-format msgid "" "%s encountered errors migrating your settings from %s to %s. Please "