r6920 - online-desktop/trunk/pyddm

[commits mugshot org]

Author: hp
Date: 2007-11-15 15:00:08 -0600 (Thu, 15 Nov 2007)
New Revision: 6920

Modified:
   online-desktop/trunk/pyddm/ddm-viewer
Log:
fix ddm-viewer

Modified: online-desktop/trunk/pyddm/ddm-viewer
===================================================================
--- online-desktop/trunk/pyddm/ddm-viewer	2007-11-15 19:52:44 UTC (rev 6919)
+++ online-desktop/trunk/pyddm/ddm-viewer	2007-11-15 21:00:08 UTC (rev 6920)
@@ -13,22 +13,21 @@
 
 DBusGMainLoop(set_as_default=True)
     
-def on_connect():
-    print "Connected"
+def on_ready():
+    print "Ready"
 
     ## Queries are called here for the side effect of getting them in DataModel so
     ## they will be in the tree view. Eventually we should make the query something
     ## you can put in the UI or at least on the command line.
     
-    query = model.query_resource(model.self_id, "+;contacts +;contacters +;lovedAccounts +;topApplications+;pinnedApplications+;email;aim")
+    
+    query = model.query_resource(model.self_resource.resource_id,
+                                 "+;contacts +;userContacts +;contacters +;lovedAccounts +;topApplications+;pinnedApplications+;email;aim")
     query.execute()
 
-    query = model.query_resource("online-desktop:/o/global", "onlineBuddies [+;icon]")
-    query.execute()
+    #query = model.query_resource("online-desktop:/o/global", "onlineBuddies [+;icon]")
+    #query.execute()
 
-def on_disconnect():
-    print "Disconnected"
-
 def image_from_data_url(url):
     ## data:image/png;base64,BASE64DATA
 
@@ -161,10 +160,9 @@
 #print "Using server: " + str(options.server)
 
 model = DataModel(server_name=options.server)
-model.add_connected_handler(on_connect)
-model.add_disconnected_handler(on_disconnect)
-if model.connected:
-    on_connect()
+model.add_ready_handler(on_ready)
+if model.ready:
+    on_ready()
 
 window = gtk.Window()
 sw = gtk.ScrolledWindow()