empathy r751 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Mar 11 12:22:27 2008
New Revision: 751
URL: http://svn.gnome.org/viewvc/empathy?rev=751&view=rev

Log:
Fix droping a contact to the chat window.


Modified:
   trunk/libempathy-gtk/empathy-chat-window.c

Modified: trunk/libempathy-gtk/empathy-chat-window.c
==============================================================================
--- trunk/libempathy-gtk/empathy-chat-window.c	(original)
+++ trunk/libempathy-gtk/empathy-chat-window.c	Tue Mar 11 12:22:27 2008
@@ -1585,8 +1585,6 @@
 				EmpathyChatWindow *window)
 {
 	if (info == DND_DRAG_TYPE_CONTACT_ID) {
-		EmpathyContactFactory *factory;
-		EmpathyContact        *contact = NULL;
 		EmpathyChat           *chat;
 		EmpathyChatWindow     *old_window;
 		McAccount             *account;
@@ -1600,30 +1598,17 @@
 		empathy_debug (DEBUG_DOMAIN, "DND contact from roster with id:'%s'", id);
 		
 		strv = g_strsplit (id, "/", 2);
-		factory = empathy_contact_factory_new ();
 		account = mc_account_lookup (strv[0]);
-		if (account) {
-			contact = empathy_contact_factory_get_from_id (factory,
-								       account,
-								       strv[1]);
-			g_object_unref (account);
-		}
-		g_object_unref (factory);
-		g_object_unref (account);
-		g_strfreev (strv);
-
-		if (!contact) {
-			empathy_debug (DEBUG_DOMAIN, "DND contact from roster not found");
-			return;
-		}
-		
-		account = empathy_contact_get_account (contact);
-		chat = empathy_chat_window_find_chat (account, id);
+		chat = empathy_chat_window_find_chat (account, strv[1]);
 
 		if (!chat) {
-			empathy_chat_with_contact_id (account, id);
+			empathy_chat_with_contact_id (account, strv[2]);
+			g_object_unref (account);
+			g_strfreev (strv);
 			return;
 		}
+		g_object_unref (account);
+		g_strfreev (strv);
 
 		old_window = empathy_chat_get_window (chat);		
 		if (old_window) {