Mercurial > pidgin
comparison libpurple/prpl.h @ 19488:ebe2d2e71223
Fixed merge errors stemming from the fact that the main branch and my branch both added something to the prpl struct
| author | Andreas Monitzer <pidgin@monitzer.com> |
|---|---|
| date | Tue, 28 Aug 2007 07:09:48 +0000 |
| parents | 472bcd9d502e |
| children | 481749fc0b6b |
comparison
equal
deleted
inserted
replaced
| 19487:c9de28101e6d | 19488:ebe2d2e71223 |
|---|---|
| 355 | 355 |
| 356 /* Attention API for sending & receiving zaps/nudges/buzzes etc. */ | 356 /* Attention API for sending & receiving zaps/nudges/buzzes etc. */ |
| 357 gboolean (*send_attention)(PurpleConnection *gc, const char *username, guint type); | 357 gboolean (*send_attention)(PurpleConnection *gc, const char *username, guint type); |
| 358 GList *(*attention_types)(PurpleAccount *acct); | 358 GList *(*attention_types)(PurpleAccount *acct); |
| 359 | 359 |
| 360 void (*_purple_reserved3)(void); | 360 void (*_purple_reserved1)(void); |
| 361 }; | 361 }; |
| 362 | 362 |
| 363 #define PURPLE_IS_PROTOCOL_PLUGIN(plugin) \ | 363 #define PURPLE_IS_PROTOCOL_PLUGIN(plugin) \ |
| 364 ((plugin)->info->type == PURPLE_PLUGIN_PROTOCOL) | 364 ((plugin)->info->type == PURPLE_PLUGIN_PROTOCOL) |
| 365 | 365 |