gobjectification: 91198a44: Update the pidgin plugins to compile wit...
sadrul at pidgin.im
sadrul at pidgin.im
Thu Mar 13 05:55:48 EDT 2008
-----------------------------------------------------------------
Revision: 91198a44e930739d740ed2806c03f8764f8d1e88
Ancestor: 92c3c6eeeeee13fa192ddf945cd091de6595aaa9
Author: sadrul at pidgin.im
Date: 2008-03-13T09:07:11
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/91198a44e930739d740ed2806c03f8764f8d1e88
Modified files:
pidgin/plugins/cap/cap.c
pidgin/plugins/gevolution/gevo-util.c
pidgin/plugins/gevolution/gevolution.c
pidgin/plugins/mailchk.c pidgin/plugins/pidgininc.c
pidgin/plugins/raw.c pidgin/plugins/relnot.c
pidgin/plugins/ticker/ticker.c pidgin/plugins/xmppconsole.c
ChangeLog:
Update the pidgin plugins to compile with the gobjectified PurpleConnection.
-------------- next part --------------
============================================================
--- pidgin/plugins/cap/cap.c ab897523fda373afe352cc2d86778ad496c98f50
+++ pidgin/plugins/cap/cap.c f76a50f4b5463eff414b48d28b42df83ec995dc5
@@ -688,10 +688,10 @@ static void add_plugin_functionality(Pur
purple_signal_connect(pidgin_blist_get_handle(), "drawing-tooltip", plugin,
PURPLE_CALLBACK(drawing_tooltip), NULL);
- purple_signal_connect(purple_connections_get_handle(), "signed-on", plugin,
+ purple_signal_connect(NULL, "signed-on", plugin,
PURPLE_CALLBACK(signed_on), NULL);
- purple_signal_connect(purple_connections_get_handle(), "signed-off", plugin,
+ purple_signal_connect(NULL, "signed-off", plugin,
PURPLE_CALLBACK(signed_off), NULL);
_signals_connected = TRUE;
@@ -733,10 +733,10 @@ static void remove_plugin_functionality(
purple_signal_disconnect(pidgin_blist_get_handle(), "drawing-tooltip", plugin,
PURPLE_CALLBACK(drawing_tooltip));
- purple_signal_disconnect(purple_connections_get_handle(), "signed-on", plugin,
+ purple_signal_disconnect(NULL, "signed-on", plugin,
PURPLE_CALLBACK(signed_on));
- purple_signal_disconnect(purple_connections_get_handle(), "signed-off", plugin,
+ purple_signal_disconnect(NULL, "signed-off", plugin,
PURPLE_CALLBACK(signed_off));
_signals_connected = FALSE;
============================================================
--- pidgin/plugins/gevolution/gevo-util.c bc7505b7307489559ecc6698ad6ab847d67883cd
+++ pidgin/plugins/gevolution/gevo-util.c 7d4d8c385717209a291af6c40ebf0db04392eb7f
@@ -100,7 +100,7 @@ gevo_prpl_get_field(PurpleAccount *accou
gc = purple_account_get_connection(account);
- prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
+ prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc));
if (!strcmp("aim", prpl_info->list_icon(account, buddy)))
{
============================================================
--- pidgin/plugins/gevolution/gevolution.c c70047d8abf00cb09cf1b6e22975cecaa3e480b9
+++ pidgin/plugins/gevolution/gevolution.c aa616b55a4cdb02ad89872e0ad4feed68ee0bfb5
@@ -328,7 +328,7 @@ plugin_load(PurplePlugin *plugin)
purple_blist_set_ui_ops(blist_ui_ops);
- purple_signal_connect(purple_connections_get_handle(), "signed-on",
+ purple_signal_connect(NULL, "signed-on",
plugin, PURPLE_CALLBACK(signed_on_cb), NULL);
timer = g_timeout_add(1, load_timeout, plugin);
============================================================
--- pidgin/plugins/mailchk.c 6ae526cbe9e9ab03f0584bca32628db8d0189ef9
+++ pidgin/plugins/mailchk.c a67e578adcfe08888873012fa6bd2869db62ae89
@@ -115,7 +115,7 @@ plugin_load(PurplePlugin *plugin)
plugin_load(PurplePlugin *plugin)
{
PurpleBuddyList *list = purple_get_blist();
- void *conn_handle = purple_connections_get_handle();
+ void *conn_handle = NULL;
if (!check_timeout(NULL)) {
purple_debug_warning("mailchk", "Could not read $MAIL or /var/spool/mail/$USER\n");
============================================================
--- pidgin/plugins/pidgininc.c 1d5b9484c26f280ecc51cf70ea1cf80babeaf703
+++ pidgin/plugins/pidgininc.c 044732ce149922acca04b9152d7bdcc6ddcbda2b
@@ -62,7 +62,7 @@ plugin_load(PurplePlugin *plugin)
plugin_load(PurplePlugin *plugin)
{
/* this is for doing something fun when we sign on */
- purple_signal_connect(purple_connections_get_handle(), "signed-on",
+ purple_signal_connect(NULL, "signed-on",
plugin, PURPLE_CALLBACK(echo_hi), NULL);
/* this is for doing something fun when we get a message */
============================================================
--- pidgin/plugins/raw.c 03a96a49c27c5d9311400fb6b49c5e1ce77807c1
+++ pidgin/plugins/raw.c ae1379c3bb9aa95fc2ef81e9a46ea865d764a838
@@ -73,7 +73,7 @@ text_sent_cb(GtkEntry *entry)
purple_debug_misc("raw", "prpl_id = %s\n", prpl_id);
if (strcmp(prpl_id, "prpl-toc") == 0) {
- int *a = (int *)gc->proto_data;
+ int *a = (int *)purple_connection_get_protocol_data(gc);
unsigned short seqno = htons(a[1]++ & 0xffff);
unsigned short len = htons(strlen(txt) + 1);
write(*a, "*\002", 2);
@@ -83,7 +83,7 @@ text_sent_cb(GtkEntry *entry)
purple_debug(PURPLE_DEBUG_MISC, "raw", "TOC C: %s\n", txt);
} else if (strcmp(prpl_id, "prpl-msn") == 0) {
- MsnSession *session = gc->proto_data;
+ MsnSession *session = purple_connection_get_protocol_data(gc);
char buf[strlen(txt) + 3];
g_snprintf(buf, sizeof(buf), "%s\r\n", txt);
============================================================
--- pidgin/plugins/relnot.c 31d71931c37815bfd8c12d95d1b21b9bc778a864
+++ pidgin/plugins/relnot.c 6bd346ac9a1078623d5445cdce15e092e7d0f568
@@ -118,7 +118,7 @@ plugin_load(PurplePlugin *plugin)
static gboolean
plugin_load(PurplePlugin *plugin)
{
- purple_signal_connect(purple_connections_get_handle(), "signed-on",
+ purple_signal_connect(NULL, "signed-on",
plugin, PURPLE_CALLBACK(signed_on_cb), NULL);
/* we don't check if we're offline */
============================================================
--- pidgin/plugins/ticker/ticker.c 1195ddee375ef7f44ec0ec1875882c4e24870e30
+++ pidgin/plugins/ticker/ticker.c 8deaf2d975bfcbc8a6c8e320d02500df47edee1e
@@ -305,7 +305,7 @@ plugin_load(PurplePlugin *plugin)
{
void *blist_handle = purple_blist_get_handle();
- purple_signal_connect(purple_connections_get_handle(), "signed-off",
+ purple_signal_connect(NULL, "signed-off",
plugin, PURPLE_CALLBACK(signoff_cb), NULL);
purple_signal_connect(blist_handle, "buddy-signed-on",
plugin, PURPLE_CALLBACK(buddy_signon_cb), NULL);
============================================================
--- pidgin/plugins/xmppconsole.c 03f246100970fcc416cc6e069c445cbeb869339c
+++ pidgin/plugins/xmppconsole.c 3c1364a21e5e4b54af49090bc6de75236e418a74
@@ -186,7 +186,7 @@ static void message_send_cb(GtkWidget *w
gc = console->gc;
if (gc)
- prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
+ prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(console->entry));
gtk_text_buffer_get_start_iter(buffer, &start);
@@ -630,7 +630,7 @@ signed_on_cb(PurpleConnection *gc)
if (!console)
return;
- gtk_combo_box_append_text(GTK_COMBO_BOX(console->dropdown), purple_account_get_username(gc->account));
+ gtk_combo_box_append_text(GTK_COMBO_BOX(console->dropdown), purple_account_get_username(purple_connection_get_account(gc)));
console->accounts = g_list_append(console->accounts, gc);
console->count++;
@@ -661,7 +661,7 @@ signed_off_cb(PurpleConnection *gc)
gtk_combo_box_remove_text(GTK_COMBO_BOX(console->dropdown), i);
console->accounts = g_list_remove(console->accounts, gc);
- printf("%s\n", purple_account_get_username(gc->account));
+ printf("%s\n", purple_account_get_username(purple_connection_get_account(gc)));
console->count--;
if (gc == console->gc) {
@@ -685,9 +685,9 @@ plugin_load(PurplePlugin *plugin)
PURPLE_CALLBACK(xmlnode_received_cb), NULL);
purple_signal_connect(jabber, "jabber-sending-text", xmpp_console_handle,
PURPLE_CALLBACK(xmlnode_sent_cb), NULL);
- purple_signal_connect(purple_connections_get_handle(), "signed-on",
+ purple_signal_connect(NULL, "signed-on",
plugin, PURPLE_CALLBACK(signed_on_cb), NULL);
- purple_signal_connect(purple_connections_get_handle(), "signed-off",
+ purple_signal_connect(NULL, "signed-off",
plugin, PURPLE_CALLBACK(signed_off_cb), NULL);
return TRUE;
More information about the Commits
mailing list