pidgin/pidgin

Merged in fbellet/pidgin/port-changes-from-branch-2.x.y-to-default (pull request #632)

Port changes from branch 2.x.y to default

Approved-by: Eion Robb
Approved-by: John Bailey
Approved-by: Gary Kramlich
#define PIDGIN_ICON 104
#define PIDGIN_TRAY_AVAILABLE_4BIT 105
#define PIDGIN_TRAY_AWAY_4BIT 106
#define PIDGIN_TRAY_BUSY_4BIT 107
#define PIDGIN_TRAY_XA_4BIT 108
#define PIDGIN_TRAY_OFFLINE_4BIT 109
#define PIDGIN_TRAY_CONNECTING_4BIT 110
#define PIDGIN_TRAY_PENDING_4BIT 111
#define PIDGIN_TRAY_INVISIBLE_4BIT 112