diff -r 969b74a3e27a -r 4de1981757fc pidgin/plugins/gtk-signals-test.c --- a/pidgin/plugins/gtk-signals-test.c Mon Mar 19 06:11:46 2007 +0000 +++ b/pidgin/plugins/gtk-signals-test.c Mon Mar 19 07:01:17 2007 +0000 @@ -35,21 +35,21 @@ * Account subsystem signal callbacks **************************************************************************/ static void -account_modified_cb(GaimAccount *account, void *data) { - gaim_debug_info("gtk-signal-test", "account modified cb\n"); +account_modified_cb(PurpleAccount *account, void *data) { + purple_debug_info("gtk-signal-test", "account modified cb\n"); } /************************************************************************** * Buddy List subsystem signal callbacks **************************************************************************/ static void -blist_created_cb(GaimBuddyList *blist, void *data) { - gaim_debug_info("gtk-signal-test", "buddy list created\n"); +blist_created_cb(PurpleBuddyList *blist, void *data) { + purple_debug_info("gtk-signal-test", "buddy list created\n"); } static void -blist_drawing_tooltip_cb(GaimBlistNode *node, GString *str, gboolean full, void *data) { - gaim_debug_info("gtk-signal-test", "drawing tooltip cb\n"); +blist_drawing_tooltip_cb(PurpleBlistNode *node, GString *str, gboolean full, void *data) { + purple_debug_info("gtk-signal-test", "drawing tooltip cb\n"); } /************************************************************************** @@ -57,104 +57,104 @@ **************************************************************************/ static void conversation_dragging_cb(PidginWindow *source, PidginWindow *destination) { - gaim_debug_info("gtk-signal-test", "conversation dragging cb\n"); + purple_debug_info("gtk-signal-test", "conversation dragging cb\n"); } static gboolean -displaying_im_msg_cb(GaimAccount *account, const char *who, char **buffer, - GaimConversation *conv, GaimMessageFlags flags, void *data) +displaying_im_msg_cb(PurpleAccount *account, const char *who, char **buffer, + PurpleConversation *conv, PurpleMessageFlags flags, void *data) { - gaim_debug_misc("gtk-signals test", "displaying-im-msg (%s, %s)\n", - gaim_conversation_get_name(conv), *buffer); + purple_debug_misc("gtk-signals test", "displaying-im-msg (%s, %s)\n", + purple_conversation_get_name(conv), *buffer); return FALSE; } static void -displayed_im_msg_cb(GaimAccount *account, const char *who, const char *buffer, - GaimConversation *conv, GaimMessageFlags flags, void *data) +displayed_im_msg_cb(PurpleAccount *account, const char *who, const char *buffer, + PurpleConversation *conv, PurpleMessageFlags flags, void *data) { - gaim_debug_misc("gtk-signals test", "displayed-im-msg (%s, %s)\n", - gaim_conversation_get_name(conv), buffer); + purple_debug_misc("gtk-signals test", "displayed-im-msg (%s, %s)\n", + purple_conversation_get_name(conv), buffer); } static gboolean -displaying_chat_msg_cb(GaimAccount *account, const char *who, char **buffer, - GaimConversation *conv, GaimMessageFlags flags, void *data) +displaying_chat_msg_cb(PurpleAccount *account, const char *who, char **buffer, + PurpleConversation *conv, PurpleMessageFlags flags, void *data) { - gaim_debug_misc("gtk-signals test", "displaying-chat-msg (%s, %s)\n", - gaim_conversation_get_name(conv), *buffer); + purple_debug_misc("gtk-signals test", "displaying-chat-msg (%s, %s)\n", + purple_conversation_get_name(conv), *buffer); return FALSE; } static void -displayed_chat_msg_cb(GaimAccount *account, const char *who, const char *buffer, - GaimConversation *conv, GaimMessageFlags flags, void *data) +displayed_chat_msg_cb(PurpleAccount *account, const char *who, const char *buffer, + PurpleConversation *conv, PurpleMessageFlags flags, void *data) { - gaim_debug_misc("gtk-signals test", "displayed-chat-msg (%s, %s)\n", - gaim_conversation_get_name(conv), buffer); + purple_debug_misc("gtk-signals test", "displayed-chat-msg (%s, %s)\n", + purple_conversation_get_name(conv), buffer); } static void -conversation_switched_cb(GaimConversation *conv, void *data) +conversation_switched_cb(PurpleConversation *conv, void *data) { - gaim_debug_misc("gtk-signals test", "conversation-switched (%s)\n", - gaim_conversation_get_name(conv)); + purple_debug_misc("gtk-signals test", "conversation-switched (%s)\n", + purple_conversation_get_name(conv)); } /************************************************************************** * Plugin stuff **************************************************************************/ static gboolean -plugin_load(GaimPlugin *plugin) +plugin_load(PurplePlugin *plugin) { void *accounts_handle = pidgin_account_get_handle(); void *blist_handle = pidgin_blist_get_handle(); void *conv_handle = pidgin_conversations_get_handle(); /* Accounts subsystem signals */ - gaim_signal_connect(accounts_handle, "account-modified", - plugin, GAIM_CALLBACK(account_modified_cb), NULL); + purple_signal_connect(accounts_handle, "account-modified", + plugin, PURPLE_CALLBACK(account_modified_cb), NULL); /* Buddy List subsystem signals */ - gaim_signal_connect(blist_handle, "gtkblist-created", - plugin, GAIM_CALLBACK(blist_created_cb), NULL); - gaim_signal_connect(blist_handle, "drawing-tooltip", - plugin, GAIM_CALLBACK(blist_drawing_tooltip_cb), NULL); + purple_signal_connect(blist_handle, "gtkblist-created", + plugin, PURPLE_CALLBACK(blist_created_cb), NULL); + purple_signal_connect(blist_handle, "drawing-tooltip", + plugin, PURPLE_CALLBACK(blist_drawing_tooltip_cb), NULL); /* Conversations subsystem signals */ - gaim_signal_connect(conv_handle, "conversation-dragging", - plugin, GAIM_CALLBACK(conversation_dragging_cb), NULL); - gaim_signal_connect(conv_handle, "displaying-im-msg", - plugin, GAIM_CALLBACK(displaying_im_msg_cb), NULL); - gaim_signal_connect(conv_handle, "displayed-im-msg", - plugin, GAIM_CALLBACK(displayed_im_msg_cb), NULL); - gaim_signal_connect(conv_handle, "displaying-chat-msg", - plugin, GAIM_CALLBACK(displaying_chat_msg_cb), NULL); - gaim_signal_connect(conv_handle, "displayed-chat-msg", - plugin, GAIM_CALLBACK(displayed_chat_msg_cb), NULL); - gaim_signal_connect(conv_handle, "conversation-switched", - plugin, GAIM_CALLBACK(conversation_switched_cb), NULL); + purple_signal_connect(conv_handle, "conversation-dragging", + plugin, PURPLE_CALLBACK(conversation_dragging_cb), NULL); + purple_signal_connect(conv_handle, "displaying-im-msg", + plugin, PURPLE_CALLBACK(displaying_im_msg_cb), NULL); + purple_signal_connect(conv_handle, "displayed-im-msg", + plugin, PURPLE_CALLBACK(displayed_im_msg_cb), NULL); + purple_signal_connect(conv_handle, "displaying-chat-msg", + plugin, PURPLE_CALLBACK(displaying_chat_msg_cb), NULL); + purple_signal_connect(conv_handle, "displayed-chat-msg", + plugin, PURPLE_CALLBACK(displayed_chat_msg_cb), NULL); + purple_signal_connect(conv_handle, "conversation-switched", + plugin, PURPLE_CALLBACK(conversation_switched_cb), NULL); return TRUE; } static gboolean -plugin_unload(GaimPlugin *plugin) { +plugin_unload(PurplePlugin *plugin) { return TRUE; } -static GaimPluginInfo info = +static PurplePluginInfo info = { - GAIM_PLUGIN_MAGIC, - GAIM_MAJOR_VERSION, - GAIM_MINOR_VERSION, - GAIM_PLUGIN_STANDARD, /**< type */ + PURPLE_PLUGIN_MAGIC, + PURPLE_MAJOR_VERSION, + PURPLE_MINOR_VERSION, + PURPLE_PLUGIN_STANDARD, /**< type */ PIDGIN_PLUGIN_TYPE, /**< ui_requirement */ 0, /**< flags */ NULL, /**< dependencies */ - GAIM_PRIORITY_DEFAULT, /**< priority */ + PURPLE_PRIORITY_DEFAULT, /**< priority */ GTK_SIGNAL_TEST_PLUGIN_ID, /**< id */ N_("GTK Signals Test"), /**< name */ @@ -164,7 +164,7 @@ /** description */ N_("Test to see that all ui signals are working properly."), "Gary Kramlich ", /**< author */ - GAIM_WEBSITE, /**< homepage */ + PURPLE_WEBSITE, /**< homepage */ plugin_load, /**< load */ plugin_unload, /**< unload */ @@ -177,8 +177,8 @@ }; static void -init_plugin(GaimPlugin *plugin) +init_plugin(PurplePlugin *plugin) { } -GAIM_INIT_PLUGIN(gtksignalstest, init_plugin, info) +PURPLE_INIT_PLUGIN(gtksignalstest, init_plugin, info)