gobjectification: 44b4b1ca: Fix plugins.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 44b4b1ca527e1f7637cfe25992d0d0d2ccedd5e5
Parent:   d1370966525e1f2ca37bc0d52bd60aa774357abf
Author:   qulogic at pidgin.im
Date:     07/19/10 23:50:56
Branch:   im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/44b4b1ca527e1f7637cfe25992d0d0d2ccedd5e5

Changelog: 

Fix plugins.

Changes against parent d1370966525e1f2ca37bc0d52bd60aa774357abf

  patched  finch/plugins/gntgf.c
  patched  finch/plugins/lastlog.c
  patched  libpurple/plugins/statenotify.c
  patched  pidgin/plugins/musicmessaging/musicmessaging.c

-------------- next part --------------
============================================================
--- libpurple/plugins/statenotify.c	d75872c082c7a48bb21d5b231a46d4ce01f418c2
+++ libpurple/plugins/statenotify.c	706fda00f11db595cb3caac1a0f8835c4ebd9300
@@ -30,7 +30,7 @@ write_status(PurpleBuddy *buddy, const c
 
 	if (conv == NULL)
 		return;
-	g_return_if_fail(conv->type == PURPLE_CONV_TYPE_IM);
+	g_return_if_fail(purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM);
 
 	/* Prevent duplicate notifications for buddies in multiple groups */
 	if (buddy != purple_find_buddy(account, buddy_name))
@@ -42,7 +42,7 @@ write_status(PurpleBuddy *buddy, const c
 	g_snprintf(buf, sizeof(buf), message, escaped);
 	g_free(escaped);
 
-	purple_conv_im_write(conv->u.im, NULL, buf, PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_ACTIVE_ONLY | PURPLE_MESSAGE_NO_LINKIFY, time(NULL));
+	purple_conv_im_write(PURPLE_CONV_IM(conv), NULL, buf, PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_ACTIVE_ONLY | PURPLE_MESSAGE_NO_LINKIFY, time(NULL));
 }
 
 static void
============================================================
--- pidgin/plugins/musicmessaging/musicmessaging.c	fa27cdfa57f3b551c7e50e15856573ac178d8913
+++ pidgin/plugins/musicmessaging/musicmessaging.c	26e718d9b60e0a2bbd67758489547194fc469035
@@ -104,7 +104,7 @@ void music_messaging_change_request(cons
 	{
 		if (mmconv->originator)
 		{
-			char *name = (mmconv->conv)->name;
+			const char *name = purple_conversation_get_name(mmconv->conv);
 			send_change_request (session, name, command, parameters);
 		} else
 		{
@@ -376,7 +376,7 @@ intercept_received(PurpleAccount *accoun
 				if (mmconv->originator)
 				{
 					int session = mmconv_from_conv_loc(conv);
-					char *id = (mmconv->conv)->name;
+					const char *id = purple_conversation_get_name(mmconv->conv);
 					char *command;
 					char *parameters;
 					
@@ -424,7 +424,7 @@ intercept_received(PurpleAccount *accoun
 				command = strtok(NULL, " ");
 				/* char *parameters = strtok(NULL, "#"); DONT NEED PARAMETERS */
 				
-				if ((mmconv->conv)->name == id)
+				if (purple_conversation_get_name(mmconv->conv) == id)
 				{
 					purple_notify_message(plugin_pointer, PURPLE_NOTIFY_MSG_ERROR, 
 							    _("Music Messaging"),
============================================================
--- finch/plugins/gntgf.c	d676156ca7a1204b440e9ff8cbc3b28cbe4fa707
+++ finch/plugins/gntgf.c	956073023ba8026000b1553d650e3d613d2bca87
@@ -168,7 +168,7 @@ notify(PurpleConversation *conv, const c
 		beep();
 
 	if (conv != NULL) {
-		FinchConv *fc = conv->ui_data;
+		FinchConv *fc = purple_conversation_get_ui_data(conv);
 		if (gnt_widget_has_focus(fc->window))
 			return;
 	}
@@ -256,7 +256,7 @@ received_chat_msg(PurpleAccount *account
 	if (flags & PURPLE_MESSAGE_WHISPER)
 		return;
 	
-	nick = PURPLE_CONV_CHAT(conv)->nick;
+	nick = purple_conv_chat_get_nick(PURPLE_CONV_CHAT(conv));
 
 	if (g_utf8_collate(sender, nick) == 0)
 		return;
============================================================
--- finch/plugins/lastlog.c	41065a9a8c4cf003e63eface0094670ea996a996
+++ finch/plugins/lastlog.c	361eba6afee2c48d538715d06c183a7b3502cd8d
@@ -60,7 +60,7 @@ lastlog_cb(PurpleConversation *conv, con
 static PurpleCmdRet
 lastlog_cb(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer null)
 {
-	FinchConv *ggconv = conv->ui_data;
+	FinchConv *ggconv = purple_conversation_get_ui_data(conv);
 	char **strings = g_strsplit(GNT_TEXT_VIEW(ggconv->tv)->string->str, "\n", 0);
 	GntWidget *win, *tv;
 	int i, j;