desktop-data-model r7246 - trunk/engine

[otaylor svn gnome org]

Author: otaylor
Date: Thu Jan 31 00:44:51 2008
New Revision: 7246
URL: http://svn.gnome.org/viewvc/desktop-data-model?rev=7246&view=rev

Log:
- Call lm_connection_set_jid() to humor loudmouth-1.3 
 (http://developer.imendio.com/issues/browse/LM-116)
- Be robust against different orders of callbacks for our
 stream handler.


Modified:
   trunk/engine/hippo-connection.c

Modified: trunk/engine/hippo-connection.c
==============================================================================
--- trunk/engine/hippo-connection.c	(original)
+++ trunk/engine/hippo-connection.c	Thu Jan 31 00:44:51 2008
@@ -1046,6 +1046,13 @@
     g_debug("Connecting to %s port %d", message_host, message_port);
 
     connection->lm_connection = lm_connection_new(message_host);
+    
+    /* Loudmouth 1.3 wants a JID, but ends up only using to extract the server
+     * from for the to="" of the stream header. The node doesn't matter, so
+     * we don't have to worry about the fact that we don't have the username
+     * until later.
+     */
+    lm_connection_set_jid(connection->lm_connection, "unknown online gnome org");
 
     g_free(message_host);
     
@@ -2632,6 +2639,10 @@
 {
     HippoConnection *connection = HIPPO_CONNECTION(data);
 
+    /* From a previous generation */
+    if (lconnection != connection->lm_connection)
+        return;
+
     g_debug("handle_disconnect reason NO j/k reason=%s",
             disconnect_reason_debug_string(reason));