← Back to branch summary

~micahg/ubuntu/natty/pidgin/2.7.9-2

« back to all changes in this revision

Viewing changes to libpurple/protocols/jabber/auth_cyrus.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-08-11 14:16:15 UTC
  • mfrom: (1.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20100811141615-lsqya0vlqrnu14lo
Tags: 1:2.7.3-1ubuntu1
* Resync on Debian, workaround build issue (lp:#600952) 
* debian/control:
  - Build-Depends on liblaunchpad-integration-dev
  - Drop libpurple0 dependency from libpurple-bin
  - Drop pidgin-data dependency from libpurple0
  - Recommends pidgin-libnotify
* debian/libpurple0.symbols: 
  - add epochs
* debian/patches/02_lpi.patch:
  - launchpad integration
* debian/patches/04_let_crasher_for_apport.patch:
  - stop catching the SIGSEGV signal and let apport handle it
* debian/patches/05_default_to_irc_ubuntu_com.patch:
  - set the default IRC server to irc.ubuntu.com
* debian/patches/10_docklet_default_off.patch:
  - default behavior to have no notification area icon.
* debian/patches/11_buddy_list_really_show.patch:
  - the buddy list tries harder to appear.  This fixes some issues with it
    not appearing.
* debian/patches/ 13_sounds_and_timers.patch:
  - adjusts the time out for sounds to be 15 seconds, 
    which helps get fewer spurious login notifications on slow connections.
* debian/patches/60_1024x600_gtk*.c.patch: 
  - add scrollbars into preferences and pounce dialogs
* debian/prefs.xml: 
  - Update to set the notify plugin prefs /plugins/gtk/X11/notify/*, 
    set /pidgin/plugins/loaded to load the notify plugin and enable 
    the standard logging options by default
* debian/rules:
  - install a launcher in the message indicator
  - set translation domain and update template
  - use simple-patchsys rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/protocols/jabber/auth_cyrus.c
36
36
{
37
37
        purple_connection_error_reason(purple_account_get_connection(account),
38
38
                PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
39
 
                _("Server requires plaintext authentication over an unencrypted stream"));
 
39
                _("Server may require plaintext authentication over an unencrypted stream"));
40
40
}
41
41
 
42
42
static void start_cyrus_wrapper(JabberStream *js)
240
240
                                 * it in plaintext, see if we can turn on
241
241
                                 * plaintext auth
242
242
                                 */
 
243
                                /* XXX Should we just check for PLAIN/LOGIN being offered mechanisms? */
243
244
                                } else if (!plaintext) {
244
 
                                        char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
 
245
                                        char *msg = g_strdup_printf(_("%s may require plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
245
246
                                                        purple_account_get_username(account));
246
247
                                        purple_request_yes_no(js->gc, _("Plaintext Authentication"),
247
248
                                                        _("Plaintext Authentication"),
408
409
        {
409
410
                char *mech_name = xmlnode_get_data(mechnode);
410
411
 
 
412
                /* Ignore blank mechanisms and EXTERNAL.  External isn't
 
413
                 * supported, and Cyrus SASL's mechanism returns
 
414
                 * SASL_NOMECH when the caller (us) doesn't configure it.
 
415
                 * Except SASL_NOMECH is supposed to mean "no concordant
 
416
                 * mechanisms"...  Easiest just to blacklist it (for now).
 
417
                 */
411
418
                if (!mech_name || !*mech_name ||
412
419
                                g_str_equal(mech_name, "EXTERNAL")) {
413
420
                        g_free(mech_name);
419
426
                g_free(mech_name);
420
427
        }
421
428
 
 
429
        /* Strip off the trailing ' ' */
 
430
        if (js->sasl_mechs->len > 1)
 
431
                g_string_truncate(js->sasl_mechs, js->sasl_mechs->len - 1);
 
432
 
422
433
        jabber_sasl_build_callbacks(js);
423
434
        ret = jabber_auth_start_cyrus(js, reply, error);
424
435