adium.1-4: 471aa5f0: Fixing the merge

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: 471aa5f04627823959bd9accda5d5e5630f119d5
Parent:   77acb716f3a63236615968ae5005fde5224d4409
Author:   evands at pidgin.im
Date:     02/20/11 19:02:24
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/471aa5f04627823959bd9accda5d5e5630f119d5

Changelog: 

Fixing the merge

Changes against parent 77acb716f3a63236615968ae5005fde5224d4409

  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/irc.h
  patched  libpurple/protocols/irc/msgs.c

-------------- next part --------------
============================================================
--- libpurple/protocols/irc/irc.c	22d374bca6b6cc2ca47fdff70eac4a45dcd6fd98
+++ libpurple/protocols/irc/irc.c	d8ff17c7e1fdddcde1c6720e7b220c49deb1c870
@@ -41,6 +41,8 @@ static void irc_ison_buddy_init(char *na
 
 static void irc_ison_buddy_init(char *name, struct irc_buddy *ib, GList **list);
 
+static void irc_who_channel(PurpleConversation *conv, struct irc_conn *irc);
+
 static const char *irc_blist_icon(PurpleAccount *a, PurpleBuddy *b);
 static GList *irc_status_types(PurpleAccount *account);
 static GList *irc_actions(PurplePlugin *plugin, gpointer context);
@@ -195,8 +197,8 @@ gboolean irc_blist_timeout(struct irc_co
 
 	irc_buddy_query(irc);
 
-		return TRUE;
-	}
+	return TRUE;
+}
 
 void irc_buddy_query(struct irc_conn *irc)
 {
@@ -218,9 +220,9 @@ void irc_buddy_query(struct irc_conn *ir
 
 	if (string->len) {
 		buf = irc_format(irc, "vn", "ISON", string->str);
-	irc_send(irc, buf);
-	g_free(buf);
-	irc->ison_outstanding = TRUE;
+		irc_send(irc, buf);
+		g_free(buf);
+		irc->ison_outstanding = TRUE;
 	} else
 		irc->ison_outstanding = FALSE;
 
============================================================
--- libpurple/protocols/irc/irc.h	9acee3aa0a6f57a8147d8a8b32af0a7f0aab5471
+++ libpurple/protocols/irc/irc.h	7e52fe9ba8caa9d1f5a4055123b287b54ef3f599
@@ -108,6 +108,7 @@ gboolean irc_who_channel_timeout(struct 
 int irc_send(struct irc_conn *irc, const char *buf);
 gboolean irc_blist_timeout(struct irc_conn *irc);
 gboolean irc_who_channel_timeout(struct irc_conn *irc);
+void irc_buddy_query(struct irc_conn *irc);
 
 char *irc_escape_privmsg(const char *text, gssize length);
 
============================================================
--- libpurple/protocols/irc/msgs.c	62d6c04d9f4e8cd93ff04b083d9f633950108d5e
+++ libpurple/protocols/irc/msgs.c	58a11bfdfa8d0e944ca399e095ec92f999244623
@@ -110,8 +110,8 @@ static void irc_connected(struct irc_con
 	irc_blist_timeout(irc);
 	if (!irc->timer)
 		irc->timer = purple_timeout_add_seconds(45, (GSourceFunc)irc_blist_timeout, (gpointer)irc);
-	if (!irc->who_channel_timer)
-		irc->who_channel_timer = purple_timeout_add_seconds(300, (GSourceFunc)irc_who_channel_timeout, (gpointer)irc);
+    if (!irc->who_channel_timer)
+        irc->who_channel_timer = purple_timeout_add_seconds(300, (GSourceFunc)irc_who_channel_timeout, (gpointer)irc);
 }
 
 void irc_msg_default(struct irc_conn *irc, const char *name, const char *from, char **args)
@@ -445,9 +445,8 @@ void irc_msg_who(struct irc_conn *irc, c
 		g_free(userhost);
 		g_free(realname);
 		
-		flags = cb->flags;
-		
-		// (G|H)...
+		flags = purple_conv_chat_user_get_flags(chat, cb->name);
+
 		if (args[6][0] == 'G' && !(flags & PURPLE_CBFLAGS_AWAY)) {
 			purple_conv_chat_user_set_flags(chat, cb->name, flags | PURPLE_CBFLAGS_AWAY);
 		} else if(args[6][0] == 'H' && (flags & PURPLE_CBFLAGS_AWAY)) {
@@ -855,6 +854,7 @@ void irc_msg_join(struct irc_conn *irc, 
 	PurpleConversation *convo;
 	PurpleConvChat *chat;
 	PurpleConvChatBuddy *cb;
+
 	char *nick = irc_mask_nick(from), *userhost, *buf;
 	struct irc_buddy *ib;
 	static int id = 1;
@@ -906,7 +906,7 @@ void irc_msg_join(struct irc_conn *irc, 
 	cb = purple_conv_chat_cb_find(chat, nick);
 	
 	if (cb) {
-		purple_conv_chat_cb_set_attribute(chat, cb, "userhost", userhost);
+		purple_conv_chat_cb_set_attribute(chat, cb, "userhost", userhost);		
 	}
 	
 	if ((ib = g_hash_table_lookup(irc->buddies, nick)) != NULL) {