empathy r956 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Wed Apr 16 20:11:16 2008
New Revision: 956
URL: http://svn.gnome.org/viewvc/empathy?rev=956&view=rev

Log:
Fix crash in DND of chat tab.


Modified:
   trunk/src/empathy-chat-window.c

Modified: trunk/src/empathy-chat-window.c
==============================================================================
--- trunk/src/empathy-chat-window.c	(original)
+++ trunk/src/empathy-chat-window.c	Wed Apr 16 20:11:16 2008
@@ -957,12 +957,10 @@
 		EmpathyChat           *chat;
 		EmpathyChatWindow     *old_window;
 		McAccount             *account;
-		const gchar           *id = NULL;
+		const gchar           *id;
 		gchar                **strv;
 
-		if (selection) {
-			id = (const gchar*) selection->data;
-		}
+		id = (const gchar*) selection->data;
 
 		empathy_debug (DEBUG_DOMAIN, "DND contact from roster with id:'%s'", id);
 		
@@ -1002,21 +1000,14 @@
 		gtk_drag_finish (context, TRUE, FALSE, time);
 	}
 	else if (info == DND_DRAG_TYPE_TAB) {
-		EmpathyChat        *chat = NULL;
-		EmpathyChatWindow  *old_window;
-		GtkWidget        **child = NULL;
+		EmpathyChat        **chat;
+		EmpathyChatWindow   *old_window = NULL;
 
 		empathy_debug (DEBUG_DOMAIN, "DND tab");
 
-		if (selection) {
-			child = (void*) selection->data;
-		}
-
-		if (child) {
-			chat = EMPATHY_CHAT (child);
-		}
+		chat = (void*) selection->data;
+		old_window = chat_window_find_chat (*chat);
 
-		old_window = chat_window_find_chat (chat);
 		if (old_window) {
 			EmpathyChatWindowPriv *priv;