← Back to branch summary

~ubuntu-branches/ubuntu/hardy/pidgin/hardy

« back to all changes in this revision

Viewing changes to libpurple/protocols/bonjour/mdns_howl.c

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2007-12-21 02:48:06 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20071221024806-pd44a5k9tiyh12mp
Tags: 1:2.3.1-2ubuntu1
https://launchpad.net/bugs/177811
* Sync with Debian, remaining Ubuntu changes; (LP: #177811)
  - Set Maintainer to Ubuntu Core Developers.
  - Add build-deps on liblaunchpad-integration-dev, intltool,
    libnm-glib-dev (for --enable-nm) (Ubuntu #112720).
  - 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.
  - Ship compatibility symlinks via debian/gaim.links.
  - 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::.
   - Update debian/prefs.xml to set the notify plugin prefs
    /plugins/gtk/X11/notify/* and set /pidgin/plugins/loaded to load 
    the notify plugin; Ubuntu: #13389.
  - Add LPI integration patch, 02_lpi.
  - Add patch 04_let_crasher_for_apport to stop catching the SIGSEGV signal
    and let apport handle it.
  - Add patch 05_default_to_irc_ubuntu_com to set the default IRC 
    server to irc.ubuntu.com.
  - Add autoconf patch, 70_autoconf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/protocols/bonjour/mdns_howl.c
115
115
{
116
116
        sw_discovery_resolve_id rid;
117
117
        PurpleAccount *account = (PurpleAccount*)extra;
118
 
        PurpleBuddy *gb = NULL;
 
118
        PurpleBuddy *pb = NULL;
119
119
 
120
120
        switch (status)
121
121
        {
148
148
                        break;
149
149
                case SW_DISCOVERY_BROWSE_REMOVE_SERVICE:
150
150
                        purple_debug_info("bonjour", "_browser_reply --> Remove service\n");
151
 
                        gb = purple_find_buddy(account, name);
152
 
                        if (gb != NULL)
153
 
                                purple_blist_remove_buddy(gb);
 
151
                        pb = purple_find_buddy(account, name);
 
152
                        if (pb != NULL) {
 
153
                                purple_account_remove_buddy(account, pb, NULL);
 
154
                                purple_blist_remove_buddy(pb);
 
155
                        }
154
156
                        break;
155
157
                case SW_DISCOVERY_BROWSE_RESOLVED:
156
158
                        purple_debug_info("bonjour", "_browse_reply --> Resolved\n");