Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/sametime/sametime.c	Sat Jun 29 03:40:25 2013 +0530
+++ b/libpurple/protocols/sametime/sametime.c	Sat Jun 29 04:37:14 2013 +0530
@@ -2000,7 +2000,7 @@
   for(; members; members = members->next) {
     struct mwLoginInfo *peer = members->data;
     purple_chat_conversation_add_user(g_conf, peer->user_id,
-			    NULL, PURPLE_CHAT_CONVERSATION_BUDDY_NONE, FALSE);
+			    NULL, PURPLE_CHAT_USER_NONE, FALSE);
   }
 }
 
@@ -2041,7 +2041,7 @@
   g_return_if_fail(g_conf != NULL);
 
   purple_chat_conversation_add_user(g_conf, peer->user_id,
-			  NULL, PURPLE_CHAT_CONVERSATION_BUDDY_NONE, TRUE);
+			  NULL, PURPLE_CHAT_USER_NONE, TRUE);
 }
 
 
@@ -2663,7 +2663,7 @@
   idb = mwConversation_getTarget(conv);
 
   serv_got_typing(pd->gc, idb->user, 0,
-		  typing? PURPLE_IM_CONVERSATION_TYPING: PURPLE_IM_CONVERSATION_NOT_TYPING);
+		  typing? PURPLE_IM_TYPING: PURPLE_IM_NOT_TYPING);
 }
 
 
@@ -3010,7 +3010,7 @@
   for(l = members; l; l = l->next) {
     struct mwIdBlock *idb = l->data;
     purple_chat_conversation_add_user(gconf, idb->user,
-			    NULL, PURPLE_CHAT_CONVERSATION_BUDDY_NONE, FALSE);
+			    NULL, PURPLE_CHAT_USER_NONE, FALSE);
   }
   g_list_free(members);
 }
@@ -3051,7 +3051,7 @@
   g_return_if_fail(gconf != NULL);
 
   purple_chat_conversation_add_user(gconf, peer->user,
-			  NULL, PURPLE_CHAT_CONVERSATION_BUDDY_NONE, TRUE);
+			  NULL, PURPLE_CHAT_USER_NONE, TRUE);
 }
 
 
@@ -4026,7 +4026,7 @@
 
 static unsigned int mw_prpl_send_typing(PurpleConnection *gc,
 					const char *name,
-					PurpleIMConversationTypingState state) {
+					PurpleIMTypingState state) {
 
   struct mwPurplePluginData *pd;
   struct mwIdBlock who = { (char *) name, NULL };
@@ -4044,7 +4044,7 @@
   if(mwConversation_isOpen(conv)) {
     mwConversation_send(conv, mwImSend_TYPING, t);
 
-  } else if((state == PURPLE_IM_CONVERSATION_TYPING) || (state == PURPLE_IM_CONVERSATION_TYPED)) {
+  } else if((state == PURPLE_IM_TYPING) || (state == PURPLE_IM_TYPED)) {
     /* only open a channel for sending typing notification, not for
        when typing has stopped. There's no point in re-opening a
        channel just to tell someone that this side isn't typing. */