diff -ur gaim-galago-0.5.1.gaim/configure.ac gaim-galago-0.5.1.purple/configure.ac --- gaim-galago-0.5.1.gaim/configure.ac 2006-10-07 17:09:00.000000000 +0100 +++ gaim-galago-0.5.1.purple/configure.ac 2007-05-18 20:08:25.000000000 +0100 @@ -3,7 +3,7 @@ dnl ################################################################ dnl # Initialize autoconf dnl ################################################################ -AC_INIT(gaim-galago, 0.5.1, chipx86@chipx86.com) +AC_INIT(purple-galago, 0.5.1, chipx86@chipx86.com) AC_PREREQ(2.50) AC_CONFIG_SRCDIR(config.h.in) AC_COPYRIGHT([Copyright 2004-2006 Christian Hammond]) @@ -37,7 +37,7 @@ dnl # Initialize automake dnl ################################################################ VERSION=$GAIM_GALAGO_VERSION -PACKAGE=gaim-galago +PACKAGE=purple-galago AM_INIT_AUTOMAKE($PACKAGE, $VERSION) @@ -67,7 +67,7 @@ AM_GNU_GETTEXT -pkg_modules="glib-2.0 >= 2.2.2, libgalago >= 0.5.2, gaim" +pkg_modules="glib-2.0 >= 2.2.2, libgalago >= 0.5.2, purple >= 2.0" PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) AC_SUBST(PACKAGE_CFLAGS) AC_SUBST(PACKAGE_LIBS) diff -ur gaim-galago-0.5.1.gaim/src/gaim-galago.c gaim-galago-0.5.1.purple/src/gaim-galago.c --- gaim-galago-0.5.1.gaim/src/gaim-galago.c 2006-07-12 03:43:08.000000000 +0100 +++ gaim-galago-0.5.1.purple/src/gaim-galago.c 2007-05-18 20:07:57.000000000 +0100 @@ -1,5 +1,5 @@ /** - * @file gaim-galago.c Gaim Galago plugin + * @file gaim-galago.c Purple Galago plugin * * Copyright (C) 2004-2006 Christian Hammond. * @@ -18,7 +18,7 @@ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA */ -#define GAIM_PLUGINS +#define PURPLE_PLUGINS #ifdef HAVE_CONFIG_H # include "config.h" @@ -32,7 +32,7 @@ #include "util.h" #include "version.h" -#if GAIM_VERSION_CHECK(2,0,0) +#if PURPLE_VERSION_CHECK(2,0,0) # include "status.h" #endif @@ -86,14 +86,14 @@ } static GalagoService * -get_galago_service(GaimAccount *account) +get_galago_service(PurpleAccount *account) { const char *username, *protocol_id, *service_id; g_return_val_if_fail(account != NULL, NULL); - username = gaim_account_get_username(account); - protocol_id = gaim_account_get_protocol_id(account); + username = purple_account_get_username(account); + protocol_id = purple_account_get_protocol_id(account); service_id = get_service_for_prpl_id(protocol_id, username); @@ -101,7 +101,7 @@ } static GalagoAccount * -get_my_galago_account(GaimAccount *account) +get_my_galago_account(PurpleAccount *account) { GalagoService *service; const char *username; @@ -111,24 +111,24 @@ if (service == NULL) return NULL; - username = gaim_account_get_username(account); + username = purple_account_get_username(account); return galago_service_create_account(service, me, username); } static void -update_avatar(GaimBuddy *buddy, GalagoAccount *gaccount) +update_avatar(PurpleBuddy *buddy, GalagoAccount *gaccount) { - GaimBuddyIcon *buddy_icon; + PurpleBuddyIcon *buddy_icon; GalagoImage *avatar; const unsigned char *data; unsigned char *old_data = NULL; size_t len, old_len = 0; - if ((buddy_icon = gaim_buddy_get_icon(buddy)) == NULL) + if ((buddy_icon = purple_buddy_get_icon(buddy)) == NULL) return; - data = gaim_buddy_icon_get_data(buddy_icon, &len); + data = purple_buddy_icon_get_data(buddy_icon, &len); avatar = galago_account_get_avatar(gaccount, FALSE); if (avatar != NULL) @@ -138,9 +138,9 @@ { GalagoService *service = galago_account_get_service(gaccount); - gaim_debug_info("galago", + purple_debug_info("galago", "Setting avatar for %s on account %s on %s\n", - buddy->name, gaim_account_get_username(buddy->account), + buddy->name, purple_account_get_username(buddy->account), galago_service_get_id(service)); galago_account_set_avatar(gaccount, galago_image_new_from_data(data, len)); @@ -148,10 +148,10 @@ } static void -#if GAIM_VERSION_CHECK(2,0,0) /* more ugly preproc */ -buddy_idle_changed_cb(GaimBuddy *buddy, gboolean old_idle, gboolean new_idle) +#if PURPLE_VERSION_CHECK(2,0,0) /* more ugly preproc */ +buddy_idle_changed_cb(PurpleBuddy *buddy, gboolean old_idle, gboolean new_idle) #else -buddy_idle_changed_cb(GaimBuddy *buddy) +buddy_idle_changed_cb(PurpleBuddy *buddy) #endif /* end of more ugly preproc */ { GalagoPresence *presence; @@ -176,15 +176,15 @@ if (presence == NULL) return; -#if GAIM_VERSION_CHECK(2,0,0) +#if PURPLE_VERSION_CHECK(2,0,0) { - GaimPresence *bpresence; + PurplePresence *bpresence; - bpresence = gaim_buddy_get_presence(buddy); + bpresence = purple_buddy_get_presence(buddy); - if((idle = gaim_presence_is_idle(bpresence))) + if((idle = purple_presence_is_idle(bpresence))) idle_start_time = time(NULL) - - gaim_presence_get_idle_time(bpresence); + purple_presence_get_idle_time(bpresence); } #else idle = (buddy->idle > 0); @@ -198,15 +198,15 @@ } static void -#if GAIM_VERSION_CHECK(2,0,0) /* yes this is ugly... */ -buddy_status_changed_cb(GaimBuddy *buddy, GaimStatus *old_status, - GaimStatus *new_status) +#if PURPLE_VERSION_CHECK(2,0,0) /* yes this is ugly... */ +buddy_status_changed_cb(PurpleBuddy *buddy, PurpleStatus *old_status, + PurpleStatus *new_status) #else -buddy_status_changed_cb(GaimBuddy *buddy) +buddy_status_changed_cb(PurpleBuddy *buddy) #endif /* end of ugly preproc... */ { - GaimPlugin *prpl; - GaimPluginProtocolInfo *prpl_info = NULL; + PurplePlugin *prpl; + PurplePluginProtocolInfo *prpl_info = NULL; GalagoPresence *presence; GalagoService *service; GalagoAccount *my_gaccount, *gaccount; @@ -220,14 +220,14 @@ gaccount = galago_service_get_account(service, buddy->name, FALSE); - if (gaim_account_is_connected(buddy->account)) + if (purple_account_is_connected(buddy->account)) { if (gaccount == NULL) { GalagoPerson *person; - GaimContact *contact; + PurpleContact *contact; - contact = (GaimContact *)((GaimBlistNode *)buddy)->parent; + contact = (PurpleContact *)((PurpleBlistNode *)buddy)->parent; person = g_hash_table_lookup(person_table, contact); @@ -240,7 +240,7 @@ gaccount = galago_service_create_account(service, person, buddy->name); galago_account_set_display_name(gaccount, - gaim_buddy_get_alias(buddy)); + purple_buddy_get_alias(buddy)); galago_account_add_contact(my_gaccount, gaccount); } } @@ -252,7 +252,7 @@ return; } - if (!GAIM_BUDDY_IS_ONLINE(buddy)) + if (!PURPLE_BUDDY_IS_ONLINE(buddy)) { galago_account_set_connected(gaccount, FALSE); @@ -264,41 +264,41 @@ presence = galago_account_create_presence(gaccount); - gaim_debug_info("galago", + purple_debug_info("galago", "Adding presence for %s on account %s on %s\n", - buddy->name, gaim_account_get_username(buddy->account), + buddy->name, purple_account_get_username(buddy->account), galago_service_get_id(service)); -#if GAIM_VERSION_CHECK(2,0,0) +#if PURPLE_VERSION_CHECK(2,0,0) { - GaimPresence *bpresence = NULL; - GaimStatus *bstatus = NULL; - GaimStatusType *bstatus_type = NULL; - - bpresence = gaim_buddy_get_presence(buddy); - bstatus = gaim_presence_get_active_status(bpresence); - bstatus_type = gaim_status_get_type(bstatus); + PurplePresence *bpresence = NULL; + PurpleStatus *bstatus = NULL; + PurpleStatusType *bstatus_type = NULL; + + bpresence = purple_buddy_get_presence(buddy); + bstatus = purple_presence_get_active_status(bpresence); + bstatus_type = purple_status_get_type(bstatus); - switch(gaim_status_type_get_primitive(bstatus_type)) { - case GAIM_STATUS_AVAILABLE: + switch(purple_status_type_get_primitive(bstatus_type)) { + case PURPLE_STATUS_AVAILABLE: status_type = GALAGO_STATUS_AVAILABLE; status_id = GALAGO_STATUS_ID_AVAILABLE; break; - case GAIM_STATUS_UNAVAILABLE: - case GAIM_STATUS_AWAY: + case PURPLE_STATUS_UNAVAILABLE: + case PURPLE_STATUS_AWAY: status_type = GALAGO_STATUS_AWAY; status_id = GALAGO_STATUS_ID_AWAY; break; - case GAIM_STATUS_INVISIBLE: + case PURPLE_STATUS_INVISIBLE: status_type = GALAGO_STATUS_HIDDEN; status_id = GALAGO_STATUS_ID_HIDDEN; break; - case GAIM_STATUS_EXTENDED_AWAY: + case PURPLE_STATUS_EXTENDED_AWAY: status_type = GALAGO_STATUS_EXTENDED_AWAY; status_id = GALAGO_STATUS_ID_EXTENDED_AWAY; break; - case GAIM_STATUS_UNSET: - case GAIM_STATUS_OFFLINE: + case PURPLE_STATUS_UNSET: + case PURPLE_STATUS_OFFLINE: default: status_type = GALAGO_STATUS_OFFLINE; status_id = GALAGO_STATUS_ID_OFFLINE; @@ -318,10 +318,10 @@ } #endif - prpl = gaim_find_prpl(gaim_account_get_protocol_id(buddy->account)); + prpl = purple_find_prpl(purple_account_get_protocol_id(buddy->account)); if (prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); if (prpl != NULL && prpl_info->status_text != NULL) { @@ -365,38 +365,38 @@ } static void -signed_on_cb(GaimConnection *gc) +signed_on_cb(PurpleConnection *gc) { - GaimBlistNode *bnode, *cnode, *group; - GaimAccount *account; + PurpleBlistNode *bnode, *cnode, *group; + PurpleAccount *account; GalagoPerson *me; GalagoAccount *my_gaccount; me = galago_get_me(TRUE, FALSE); - account = gaim_connection_get_account(gc); + account = purple_connection_get_account(gc); my_gaccount = get_my_galago_account(account); galago_account_set_connected(my_gaccount, TRUE); - for (group = gaim_get_blist()->root; group != NULL; group = group->next) + for (group = purple_get_blist()->root; group != NULL; group = group->next) { for (cnode = group->child; cnode != NULL; cnode = cnode->next) { - if (GAIM_BLIST_NODE_IS_CONTACT(cnode)) + if (PURPLE_BLIST_NODE_IS_CONTACT(cnode)) { for (bnode = cnode->child; bnode != NULL; bnode = bnode->next) { - GaimBuddy *buddy = (GaimBuddy *)bnode; + PurpleBuddy *buddy = (PurpleBuddy *)bnode; if (account == buddy->account) { -#if GAIM_VERSION_CHECK(2,0,0) - GaimPresence *presence; - GaimStatus *status; +#if PURPLE_VERSION_CHECK(2,0,0) + PurplePresence *presence; + PurpleStatus *status; - presence = gaim_buddy_get_presence(buddy); - status = gaim_presence_get_active_status(presence); + presence = purple_buddy_get_presence(buddy); + status = purple_presence_get_active_status(presence); buddy_status_changed_cb(buddy, status, status); #else buddy_status_changed_cb(buddy); @@ -410,16 +410,16 @@ } static void -signed_off_cb(GaimConnection *gc) +signed_off_cb(PurpleConnection *gc) { - GaimAccount *account; + PurpleAccount *account; GalagoAccount *my_gaccount; GalagoPerson *me; GalagoPresence *presence; me = galago_get_me(TRUE, FALSE); - account = gaim_connection_get_account(gc); + account = purple_connection_get_account(gc); my_gaccount = get_my_galago_account(account); galago_account_set_connected(my_gaccount, FALSE); @@ -436,10 +436,9 @@ } } -#if GAIM_VERSION_CHECK(2,0,0) +#if PURPLE_VERSION_CHECK(2,0,0) static void -buddy_icon_changed_cb(GaimBuddyIcon *icon, GaimBuddy *buddy, - const gchar *filename, const gchar *oldfilename) +buddy_icon_changed_cb(PurpleBuddy *buddy) { GalagoAccount *my_gaccount, *gaccount; GalagoService *service; @@ -465,43 +464,43 @@ me = galago_get_me(GALAGO_LOCAL, FALSE); - for (l = gaim_accounts_get_all(); l != NULL; l = l->next) + for (l = purple_accounts_get_all(); l != NULL; l = l->next) { - GaimAccount *account = (GaimAccount *)l->data; + PurpleAccount *account = (PurpleAccount *)l->data; GalagoAccount *my_gaccount; my_gaccount = get_my_galago_account(account); galago_account_set_connected(my_gaccount, - gaim_account_is_connected(account)); + purple_account_is_connected(account)); } } static void scan_presences(void) { - GaimBlistNode *bnode, *cnode, *group; + PurpleBlistNode *bnode, *cnode, *group; - if (gaim_get_blist() == NULL) + if (purple_get_blist() == NULL) return; - for (group = gaim_get_blist()->root; group != NULL; group = group->next) + for (group = purple_get_blist()->root; group != NULL; group = group->next) { for (cnode = group->child; cnode != NULL; cnode = cnode->next) { - if (GAIM_BLIST_NODE_IS_CONTACT(cnode)) + if (PURPLE_BLIST_NODE_IS_CONTACT(cnode)) { for (bnode = cnode->child; bnode != NULL; bnode = bnode->next) { - GaimBuddy *buddy = (GaimBuddy *)bnode; + PurpleBuddy *buddy = (PurpleBuddy *)bnode; - if (gaim_account_is_connected(buddy->account)) { -#if GAIM_VERSION_CHECK(2,0,0) - GaimPresence *presence; - GaimStatus *status; + if (purple_account_is_connected(buddy->account)) { +#if PURPLE_VERSION_CHECK(2,0,0) + PurplePresence *presence; + PurpleStatus *status; - presence = gaim_buddy_get_presence(buddy); - status = gaim_presence_get_active_status(presence); + presence = purple_buddy_get_presence(buddy); + status = purple_presence_get_active_status(presence); buddy_status_changed_cb(buddy, status, status); #else buddy_status_changed_cb(buddy); @@ -520,39 +519,39 @@ log_handler(const gchar *domain, GLogLevelFlags flags, const gchar *msg, gpointer user_data) { - GaimDebugLevel level; + PurpleDebugLevel level; char *new_msg = NULL; char *new_domain = NULL; if ((flags & G_LOG_LEVEL_ERROR) == G_LOG_LEVEL_ERROR) - level = GAIM_DEBUG_ERROR; + level = PURPLE_DEBUG_ERROR; else if ((flags & G_LOG_LEVEL_CRITICAL) == G_LOG_LEVEL_CRITICAL) - level = GAIM_DEBUG_FATAL; + level = PURPLE_DEBUG_FATAL; else if ((flags & G_LOG_LEVEL_WARNING) == G_LOG_LEVEL_WARNING) - level = GAIM_DEBUG_WARNING; + level = PURPLE_DEBUG_WARNING; else if ((flags & G_LOG_LEVEL_MESSAGE) == G_LOG_LEVEL_MESSAGE) - level = GAIM_DEBUG_INFO; + level = PURPLE_DEBUG_INFO; else if ((flags & G_LOG_LEVEL_INFO) == G_LOG_LEVEL_INFO) - level = GAIM_DEBUG_INFO; + level = PURPLE_DEBUG_INFO; else if ((flags & G_LOG_LEVEL_DEBUG) == G_LOG_LEVEL_DEBUG) - level = GAIM_DEBUG_MISC; + level = PURPLE_DEBUG_MISC; else { - gaim_debug_warning("Galago", + purple_debug_warning("Galago", "Unknown glib logging level in %d\n", flags); - level = GAIM_DEBUG_MISC; /* This will never happen. */ + level = PURPLE_DEBUG_MISC; /* This will never happen. */ } if (msg != NULL) - new_msg = gaim_utf8_try_convert(msg); + new_msg = purple_utf8_try_convert(msg); if (domain != NULL) - new_domain = gaim_utf8_try_convert(domain); + new_domain = purple_utf8_try_convert(domain); if (new_msg != NULL) { - gaim_debug(level, (new_domain != NULL ? new_domain : "g_log"), + purple_debug(level, (new_domain != NULL ? new_domain : "g_log"), "%s\n", new_msg); g_free(new_msg); @@ -563,7 +562,7 @@ } static gboolean -plugin_load(GaimPlugin *plugin) +plugin_load(PurplePlugin *plugin) { void *blist_handle = NULL; @@ -572,12 +571,12 @@ G_LOG_FLAG_RECURSION, log_handler, NULL); - if (!galago_init("gaim", GALAGO_INIT_FEED)) + if (!galago_init("libpurple", GALAGO_INIT_FEED)) return FALSE; if (!galago_is_connected()) { - gaim_debug(GAIM_DEBUG_ERROR, "gaim-galago", + purple_debug(PURPLE_DEBUG_ERROR, "galago", "Unable to connect to Galago service\n"); return FALSE; @@ -585,7 +584,7 @@ if (!galago_is_registered()) { - gaim_debug(GAIM_DEBUG_ERROR, "gaim-galago", + purple_debug(PURPLE_DEBUG_ERROR, "galago", "Unable to register with the Galago service\n"); return FALSE; @@ -594,38 +593,38 @@ person_table = g_hash_table_new(NULL, NULL); /* Connect the signals */ - blist_handle = gaim_blist_get_handle(); + blist_handle = purple_blist_get_handle(); - gaim_signal_connect(blist_handle, "buddy-signed-on", - plugin, GAIM_CALLBACK(buddy_status_changed_cb), NULL); - gaim_signal_connect(blist_handle, "buddy-signed-off", - plugin, GAIM_CALLBACK(buddy_status_changed_cb), NULL); - -#if !GAIM_VERSION_CHECK(2,0,0) - gaim_signal_connect(blist_handle, "buddy-away", - plugin, GAIM_CALLBACK(buddy_status_changed_cb), NULL); - gaim_signal_connect(blist_handle, "buddy-back", - plugin, GAIM_CALLBACK(buddy_status_changed_cb), NULL); - gaim_signal_connect(blist_handle, "buddy-idle", - plugin, GAIM_CALLBACK(buddy_idle_changed_cb), NULL); - gaim_signal_connect(blist_handle, "buddy-unidle", - plugin, GAIM_CALLBACK(buddy_idle_changed_cb), NULL); - gaim_signal_connect(blist_handle, "buddy-idle-updated", - plugin, GAIM_CALLBACK(buddy_idle_changed_cb), NULL); + purple_signal_connect(blist_handle, "buddy-signed-on", + plugin, PURPLE_CALLBACK(buddy_status_changed_cb), NULL); + purple_signal_connect(blist_handle, "buddy-signed-off", + plugin, PURPLE_CALLBACK(buddy_status_changed_cb), NULL); + +#if !PURPLE_VERSION_CHECK(2,0,0) + purple_signal_connect(blist_handle, "buddy-away", + plugin, PURPLE_CALLBACK(buddy_status_changed_cb), NULL); + purple_signal_connect(blist_handle, "buddy-back", + plugin, PURPLE_CALLBACK(buddy_status_changed_cb), NULL); + purple_signal_connect(blist_handle, "buddy-idle", + plugin, PURPLE_CALLBACK(buddy_idle_changed_cb), NULL); + purple_signal_connect(blist_handle, "buddy-unidle", + plugin, PURPLE_CALLBACK(buddy_idle_changed_cb), NULL); + purple_signal_connect(blist_handle, "buddy-idle-updated", + plugin, PURPLE_CALLBACK(buddy_idle_changed_cb), NULL); #else /* gaim 2.0.0 and above... */ - gaim_signal_connect(blist_handle, "buddy-status-changed", - plugin, GAIM_CALLBACK(buddy_status_changed_cb), NULL); - gaim_signal_connect(blist_handle, "buddy-idle-changed", - plugin, GAIM_CALLBACK(buddy_idle_changed_cb), NULL); - gaim_signal_connect(gaim_buddy_icons_get_handle(), "buddy-icon-changed", - plugin, GAIM_CALLBACK(buddy_icon_changed_cb), NULL); + purple_signal_connect(blist_handle, "buddy-status-changed", + plugin, PURPLE_CALLBACK(buddy_status_changed_cb), NULL); + purple_signal_connect(blist_handle, "buddy-idle-changed", + plugin, PURPLE_CALLBACK(buddy_idle_changed_cb), NULL); + purple_signal_connect(blist_handle, "buddy-icon-changed", + plugin, PURPLE_CALLBACK(buddy_icon_changed_cb), NULL); #endif - gaim_signal_connect(gaim_connections_get_handle(), "signed-on", - plugin, GAIM_CALLBACK(signed_on_cb), NULL); - gaim_signal_connect(gaim_connections_get_handle(), "signed-off", - plugin, GAIM_CALLBACK(signed_off_cb), NULL); + purple_signal_connect(purple_connections_get_handle(), "signed-on", + plugin, PURPLE_CALLBACK(signed_on_cb), NULL); + purple_signal_connect(purple_connections_get_handle(), "signed-off", + plugin, PURPLE_CALLBACK(signed_off_cb), NULL); setup_accounts(); scan_presences(); @@ -634,34 +633,33 @@ } static gboolean -plugin_unload(GaimPlugin *plugin) +plugin_unload(PurplePlugin *plugin) { galago_uninit(); g_hash_table_destroy(person_table); - person_table = NULL; 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 */ NULL, /**< ui_requirement */ 0, /**< flags */ NULL, /**< dependencies */ - GAIM_PRIORITY_DEFAULT, /**< priority */ + PURPLE_PRIORITY_DEFAULT, /**< priority */ "core-chipx86-galago", /**< id */ "Galago", /**< name */ VERSION, /**< version */ /** summary */ - N_("Turns gaim into a feed for Galago."), + N_("Turns libpurple into a feed for Galago."), /** description */ - N_("Turns gaim into a feed for Galago."), + N_("Turns libpurple into a feed for Galago."), "Christian Hammmond ", /**< author */ "http://galago.sourceforge.net/", /**< homepage */ @@ -674,8 +672,8 @@ }; static void -init_plugin(GaimPlugin *plugin) +init_plugin(PurplePlugin *plugin) { } -GAIM_INIT_PLUGIN(galago, init_plugin, info) +PURPLE_INIT_PLUGIN(galago, init_plugin, info) diff -ur gaim-galago-0.5.1.gaim/src/Makefile.am gaim-galago-0.5.1.purple/src/Makefile.am --- gaim-galago-0.5.1.gaim/src/Makefile.am 2005-11-10 10:28:40.000000000 +0000 +++ gaim-galago-0.5.1.purple/src/Makefile.am 2007-05-18 20:08:08.000000000 +0100 @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gaim +plugindir = $(libdir)/purple-2 plugin_LTLIBRARIES = gaim-galago.la