Mercurial > pidgin
diff libpurple/protocols/myspace/myspace.h @ 22101:0b823f16162c
merge of '15b495a6774e316e3d7962181284bcf13b9ccffa'
and 'faa1a78074f2f15f483ea8a41a79c2b0bcfe3279'
| author | Jeffrey Connelly <jaconnel@calpoly.edu> |
|---|---|
| date | Mon, 14 Jan 2008 02:10:26 +0000 |
| parents | 1226083ed7e2 eab7d03edfcb |
| children | b8bfd13ec479 |
line wrap: on
line diff
--- a/libpurple/protocols/myspace/myspace.h Mon Jan 14 02:06:47 2008 +0000 +++ b/libpurple/protocols/myspace/myspace.h Mon Jan 14 02:10:26 2008 +0000 @@ -180,8 +180,6 @@ #define MSIM_CONTACT_LIST_IMPORT_ALL_FRIENDS 1 #define MSIM_CONTACT_LIST_IMPORT_TOP_FRIENDS 2 -#define MsimAttentionType PurpleAttentionType - /* Functions */ gboolean msim_load(PurplePlugin *plugin); GList *msim_status_types(PurpleAccount *acct);