soc.2009.vulture: 12d68186: Join chats from buddy list.

[gdick at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 12d681863654d6a9dd40dd152d6da084d9dea973
Ancestor: 65f37a3a2dbc57bb2fc85358a7c5d17eb4d9bf9c
Author: gdick at soc.pidgin.im
Date: 2009-07-20T14:37:39
Branch: im.pidgin.soc.2009.vulture
URL: http://d.pidgin.im/viewmtn/revision/info/12d681863654d6a9dd40dd152d6da084d9dea973

Modified files:
        vulture/purpleblist.c

ChangeLog: 

Join chats from buddy list.

-------------- next part --------------
============================================================
--- vulture/purpleblist.c	ee0a98c0e8ed7d9a8d121fad883ba73c35ff27b6
+++ vulture/purpleblist.c	76df5b0d2887446c22274cc6f176776b487f618b
@@ -29,6 +29,7 @@
 #include "vultureblist.h"
 #include "purplemain.h"
 #include "resource.h"
+#include "purpleconv.h"
 
 
 
@@ -236,8 +237,10 @@ void PurpleBListNodeActivated(VULTURE_BL
  */
 void PurpleBListNodeActivated(VULTURE_BLIST_NODE *lpvbn)
 {
-	if(lpvbn->lpblistnode &&
-		(PURPLE_BLIST_NODE_IS_CONTACT(lpvbn->lpblistnode) || PURPLE_BLIST_NODE_IS_BUDDY(lpvbn->lpblistnode)))
+	if(!lpvbn->lpblistnode)
+		return;
+
+	if(PURPLE_BLIST_NODE_IS_CONTACT(lpvbn->lpblistnode) || PURPLE_BLIST_NODE_IS_BUDDY(lpvbn->lpblistnode))
 	{
 		PurpleBuddy *lpbuddy;
 
@@ -248,6 +251,8 @@ void PurpleBListNodeActivated(VULTURE_BL
 
 		purple_conversation_new(PURPLE_CONV_TYPE_IM, lpbuddy->account, lpbuddy->name);
 	}
+	else if(PURPLE_BLIST_NODE_IS_CHAT(lpvbn->lpblistnode))
+		PurpleJoinChat((PurpleChat*)lpvbn->lpblistnode);
 }