← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/pidgin/intrepid-security

« back to all changes in this revision

Viewing changes to libpurple/protocols/msn/switchboard.c

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2008-04-04 02:18:00 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20080404021800-qaa00wom38gd7xus
Tags: 1:2.4.1-1ubuntu1
https://launchpad.net/bugs/211769
* Sync with Debian, remaining Ubuntu changes; (LP: #211769)
  - debian/control:
    + Set Maintainer to Ubuntu Core Developers.
    + Add build-deps on liblaunchpad-integration-dev, intltool,
      libnm-glib-dev (for --enable-nm)
    + Drop build-deps on libsilc-1.1-2-dev | libsilc-dev (>= 1.1.1) as
      this library is in universe.
    + Drop the libpurple0 recommends on libpurple-bin.
    + Add a gaim transitionnal package for upgrades.
    + Moved finch's libx11-6 dependency to Suggests
  - Ship compatibility symlinks via debian/gaim.links
  - debian/rules:
    + Pass --enable-nm to configure to enable NetworkManager support
    + Pass --disable-silc to configure to disable silc support even if
      it's installed in the build environment.
    + Add X-Ubuntu-Gettext-Domain to the desktop file and update the
      translation templates in common-install-impl::.
    + Added necessary arguments to dh_shlibdeps for finch
  - Update debian/prefs.xml to set the notify plugin prefs
    /plugins/gtk/X11/notify/* and set /pidgin/plugins/loaded to load
    the notify plugin
  - debian/patches:
    + 02_lpi for LP integration
    + 04_let_crasher_for_apport to stop catching the SIGSEGV signal
      and let apport handle it
    + 05_default_to_irc_ubuntu_com to set the default IRC
      server to irc.ubuntu.com.
    + 70_autoconf patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/protocols/msn/switchboard.c
1194
1194
 
1195
1195
        swboard = trans->data;
1196
1196
 
1197
 
        purple_debug_info("msn", "xfr_error %i for %s: trans %x, command %s, reason %i\n",
1198
 
                                        error, (swboard->im_user ? swboard->im_user : "(null)"), trans,
1199
 
                                        (trans->command ? trans->command : "(null)"), reason);
 
1197
        purple_debug_info("msn",
 
1198
                "xfr_error %i for %s: trans %p, command %s, reason %i\n",
 
1199
                error, (swboard->im_user ? swboard->im_user : "(null)"), trans,
 
1200
                (trans->command ? trans->command : "(null)"), reason);
1200
1201
 
1201
1202
        swboard_error_helper(swboard, reason, swboard->im_user);
1202
1203
}