r6964 - in online-desktop/trunk: m4 online-prefs-sync pyddm pyddm/ddm

[commits mugshot org]

Author: hp
Date: 2007-12-04 17:47:15 -0600 (Tue, 04 Dec 2007)
New Revision: 6964

Modified:
   online-desktop/trunk/m4/intltool.m4
   online-desktop/trunk/online-prefs-sync/online-prefs-sync.synclist
   online-desktop/trunk/pyddm/ddm-viewer
   online-desktop/trunk/pyddm/ddm/DataModel.py
   online-desktop/trunk/pyddm/ddm/Resource.py
Log:
ask for fallbackUserPhotoUrl on global_resource

Modified: online-desktop/trunk/m4/intltool.m4
===================================================================
--- online-desktop/trunk/m4/intltool.m4	2007-12-04 23:46:37 UTC (rev 6963)
+++ online-desktop/trunk/m4/intltool.m4	2007-12-04 23:47:15 UTC (rev 6964)
@@ -87,6 +87,20 @@
 AC_SUBST(INTLTOOL_SERVICE_RULE)
 AC_SUBST(INTLTOOL_POLICY_RULE)
 
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+
 # Use the tools built into the package, not the ones that are installed.
 AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
 AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')

Modified: online-desktop/trunk/online-prefs-sync/online-prefs-sync.synclist
===================================================================
--- online-desktop/trunk/online-prefs-sync/online-prefs-sync.synclist	2007-12-04 23:46:37 UTC (rev 6963)
+++ online-desktop/trunk/online-prefs-sync/online-prefs-sync.synclist	2007-12-04 23:47:15 UTC (rev 6964)
@@ -36,4 +36,6 @@
   <key name="/desktop/gnome/background/*" scope="saved-per-user" priority="lowest"/>,
   <key name="/desktop/gnome/interface/*" scope="saved-per-user" priority="lowest"/>,
   <key name="/desktop/gnome/url-handlers/*" scope="saved-per-user" priority="lowest"/>        
+  <!-- for testing syncing a string list and per-machine -->
+  <key name="/apps/deskbar/enabled_handlers" scope="saved-per-user" priority="lowest"/>        
 </online_sync>

Modified: online-desktop/trunk/pyddm/ddm/DataModel.py
===================================================================
--- online-desktop/trunk/pyddm/ddm/DataModel.py	2007-12-04 23:46:37 UTC (rev 6963)
+++ online-desktop/trunk/pyddm/ddm/DataModel.py	2007-12-04 23:47:15 UTC (rev 6964)
@@ -107,8 +107,12 @@
         self._reset()
 
         _logger.debug("Doing initial query")
-
-        query = self.query_resource("online-desktop:/o/global", "self +;webBaseUrl;online;ddmProtocolVersion")
+        
+        ## FIXME it's kind of random and broken to have this list of properties here... 
+        ## surely the only defensible list to have in a generic data model library 
+        ## would be "+" - i.e. why have a list of defaults here, and also have 
+        ## the concept of server-side defaults with "+"
+        query = self.query_resource("online-desktop:/o/global", "self +;webBaseUrl;online;ddmProtocolVersion;fallbackUserPhotoUrl")
         query.add_handler(self.__on_initial_query_success)
         query.add_error_handler(self.__on_initial_query_error)
         query.execute()

Modified: online-desktop/trunk/pyddm/ddm/Resource.py
===================================================================
--- online-desktop/trunk/pyddm/ddm/Resource.py	2007-12-04 23:46:37 UTC (rev 6963)
+++ online-desktop/trunk/pyddm/ddm/Resource.py	2007-12-04 23:47:15 UTC (rev 6964)
@@ -178,7 +178,7 @@
             raise AttributeError(name)
         
         if isinstance(property_id,list):
-            raise Exception("%s is ambiguous. Possibilities are %s" % (name, property_id))
+            raise Exception("%s is ambiguous on class %s resource %s. Possibilities are %s" % (name, self.class_id, self.resource_id, property_id))
 
         return self._get_by_id(property_id)
         

Modified: online-desktop/trunk/pyddm/ddm-viewer
===================================================================
--- online-desktop/trunk/pyddm/ddm-viewer	2007-12-04 23:46:37 UTC (rev 6963)
+++ online-desktop/trunk/pyddm/ddm-viewer	2007-12-04 23:47:15 UTC (rev 6964)
@@ -22,10 +22,10 @@
     
     
     query = model.query_resource(model.self_resource.resource_id,
-                                 "+;contacts [+;aimBuddies];userContacts +;contacters +;lovedAccounts +;topApplications+;pinnedApplications+;email;aim")
+                                 "+;contacts [+;aimBuddies [+;icon]];userContacts +;contacters +;lovedAccounts +;topApplications+;pinnedApplications+;email;aim")
     query.execute()
 
-    query = model.query_resource("online-desktop:/o/global", "aimBuddies [+;icon]")
+    query = model.query_resource("online-desktop:/o/global", "+;aimBuddies [+;icon]")
     query.execute()
 
 def image_from_data_url(url):