← Back to branch summary

~prateek.karandikar/ubuntu/precise/pidgin/add_quicklist

« back to all changes in this revision

Viewing changes to .pc/05_default_to_irc_ubuntu_com.patch/libpurple/protocols/irc/irc.h

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2011-04-11 03:27:22 UTC
  • mfrom: (2.3.17 sid)
  • Revision ID: james.westby@ubuntu.com-20110411032722-farsw08i6ouj5dnd
Tags: 1:2.7.11-1ubuntu1
https://launchpad.net/bugs/757146
* Merge from Debian unstable (LP: #757146), remaining changes:
  + debian/control:
    - Add libtool and liblaunchpad-integration-dev build depends
    - Bump standards version
    - Relax binary depends on pidgin versions
    - Add pidgin-libnotify as Recommends for pidgin binary
    - Fix description of pidgin binary
    - Don't have libpurple-bin depend on libpurple0
  + debian/libpurple0.symbols: add epoch to appropriate symbols
  + Add debian/patches:
    - 02_lpi.patch
    - 04_let_crasher_for_apport.patch
    - 05_default_to_irc_ubuntu_com.patch
    - 10_docklet_default_off.patch
    - 11_buddy_list_really_show.patch
    - 13_sounds_and_timers.patch
    - 60_1024x600_gtkpounce.c.patch
    - 60_1024x600_gtkprefs.c.patch
  + debian/prefs.xml: add notification prefs
  + debian/rules:
    - Add translation domain to desktop file with gettext
    - Add the launcher for pidgin

* Add configure check for launchpad integration attached to the gtk check since 
  upstream dropped the startup notification check which is where this check was 
  previously
  - update debian/patches/02_lpi.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/05_default_to_irc_ubuntu_com.patch/libpurple/protocols/irc/irc.h
58
58
        GHashTable *buddies;
59
59
 
60
60
        gboolean ison_outstanding;
 
61
        GList *buddies_outstanding;
61
62
 
62
63
        char *inbuf;
63
64
        int inbuflen;
97
98
        char *name;
98
99
        gboolean online;
99
100
        gboolean flag;
 
101
        gboolean new_online_status;
100
102
        int ref;
101
103
};
102
104
 
104
106
 
105
107
int irc_send(struct irc_conn *irc, const char *buf);
106
108
gboolean irc_blist_timeout(struct irc_conn *irc);
 
109
void irc_buddy_query(struct irc_conn *irc);
107
110
 
108
111
char *irc_escape_privmsg(const char *text, gssize length);
109
112