From 9b978f014f44d69911e566e5ee9268a76ae7d2e4 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Mon, 14 May 2007 20:17:33 +0000
Subject: Fix setting owner OLPC properties

---
(limited to 'services')

diff --git a/services/presence/server_plugin.py b/services/presence/server_plugin.py
index 82f2323..ea2ab22 100644
--- a/services/presence/server_plugin.py
+++ b/services/presence/server_plugin.py
@@ -178,7 +178,8 @@ class ServerPlugin(gobject.GObject):
             self._set_self_alias()
 
         if properties.has_key("color") or properties.has_key("ip4-address"):
-            self._set_self_olpc_properties()
+            if self._conn_status == CONNECTION_STATUS_CONNECTED:
+                self._set_self_olpc_properties()
 
     def _owner_icon_changed_cb(self, owner, icon):
         """Owner has changed their icon, forward to network"""
@@ -469,8 +470,6 @@ class ServerPlugin(gobject.GObject):
 
     def _set_self_olpc_properties(self):
         """Set color and key on our Telepathy server identity"""
-        if self._conn_status != CONNECTION_STATUS_CONNECTED:
-            return
         props = {}
         props['color'] = self._owner.props.color
         props['key'] = dbus.ByteArray(self._owner.props.key)
--
cgit v0.9.1