[Galago-commits] r2668 - in trunk/galago-python: . src tests

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-03 21:25:49 -0700 (Mon, 03 Apr 2006)
New Revision: 2668

Modified:
   trunk/galago-python/ChangeLog
   trunk/galago-python/src/Makefile.am
   trunk/galago-python/src/galago.defs
   trunk/galago-python/tests/presence-feed.py
   trunk/galago-python/tests/unittests.py
Log:
Updated for the galago_init() flags change.


Modified: trunk/galago-python/ChangeLog
===================================================================
--- trunk/galago-python/ChangeLog	2006-04-04 04:23:02 UTC (rev 2667)
+++ trunk/galago-python/ChangeLog	2006-04-04 04:25:49 UTC (rev 2668)
@@ -1,3 +1,11 @@
+Mon Apr 03 21:25:31 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/galago.defs:
+	* src/Makefile.am:
+	* tests/presence-feed.py:
+	* tests/unittests.py:
+	  - Updated for the galago_init() flags change.
+
 Mon Apr 03 03:21:36 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/galago.defs:

Modified: trunk/galago-python/src/Makefile.am
===================================================================
--- trunk/galago-python/src/Makefile.am	2006-04-04 04:23:02 UTC (rev 2667)
+++ trunk/galago-python/src/Makefile.am	2006-04-04 04:25:49 UTC (rev 2668)
@@ -51,7 +51,7 @@
 		 -e 's/"origin")/"origin" (default "GALAGO_REMOTE"))/g' \
 		 -e 's/"idle_start_time")/"idle_start_time" (default "time(NULL)"))/g' \
 		 -e '/define-function create_person/,/^$$/ { s/"id")/"id" (default "NULL"))/ }' \
-		 -e 's/"gboolean" "feed")/"gboolean" "feed" (default "FALSE"))/g' \
+		 -e 's/\("GalagoInitFlags" "flags"\))/\1 (default "GALAGO_INIT_CLIENT"))/g' \
 		 -e 's/"const-Galago/"Galago/g' \
 		 -e '/define-function galago_status_new/,/^$$/ { s/parameters/properties/g; s/"GalagoStatusType" "type"/"primitive"/g; s/"const-char\*" "id"/"id"/g; s/"const-char\*" "name"/"name"/g; s/"gboolean" "exclusive"/"exclusive"/g }' \
 		 -e 's/(parameters\n *.("GalagoStatusType" "type")\n *.("const-char\*" "id")\n *.("const-char\*" "name")\n *.("gboolean" "exclusive")/"bunnies"/gM' \

Modified: trunk/galago-python/src/galago.defs
===================================================================
--- trunk/galago-python/src/galago.defs	2006-04-04 04:23:02 UTC (rev 2667)
+++ trunk/galago-python/src/galago.defs	2006-04-04 04:25:49 UTC (rev 2668)
@@ -58,6 +58,17 @@
 
 ;; Enumerations and flags ...
 
+(define-flags InitFlags
+  (in-module "Galago")
+  (c-name "GalagoInitFlags")
+  (gtype-id "GALAGO_TYPE_INIT_FLAGS")
+  (values
+    '("client" "GALAGO_INIT_CLIENT")
+    '("feed" "GALAGO_INIT_FEED")
+    '("no-activation" "GALAGO_INIT_NO_ACTIVATION")
+  )
+)
+
 (define-enum ObjectFlags
   (in-module "Galago")
   (c-name "GalagoObjectFlags")
@@ -348,7 +359,7 @@
   (return-type "gboolean")
   (parameters
     '("const-char*" "name")
-    '("gboolean" "feed" (default "FALSE"))
+    '("GalagoInitFlags" "flags" (default "GALAGO_INIT_CLIENT"))
   )
 )
 
@@ -502,6 +513,11 @@
 
 ;; From /usr/include/libgalago/galago-enum-types.h
 
+(define-function init_flags_get_type
+  (c-name "galago_init_flags_get_type")
+  (return-type "GType")
+)
+
 (define-function galago_object_flags_get_type
   (c-name "galago_object_flags_get_type")
   (return-type "GType")

Modified: trunk/galago-python/tests/presence-feed.py
===================================================================
--- trunk/galago-python/tests/presence-feed.py	2006-04-04 04:23:02 UTC (rev 2667)
+++ trunk/galago-python/tests/presence-feed.py	2006-04-04 04:25:49 UTC (rev 2668)
@@ -66,7 +66,7 @@
     account.add_contact(contact)
 
 
-if not galago.init("test-feed", True):
+if not galago.init("test-feed", galago.INIT_FEED):
     print "Unable to initialize Galago and connect to the server"
     sys.exit(1)
 

Modified: trunk/galago-python/tests/unittests.py
===================================================================
--- trunk/galago-python/tests/unittests.py	2006-04-04 04:23:02 UTC (rev 2667)
+++ trunk/galago-python/tests/unittests.py	2006-04-04 04:25:49 UTC (rev 2668)
@@ -20,7 +20,7 @@
 
 class BaseTestCase(unittest.TestCase):
     def setUp(self):
-        self.failUnless(galago.init("check-galago-python", True))
+        self.failUnless(galago.init("check-galago-python", galago.INIT_FEED))
 
     def tearDown(self):
         galago.uninit()
@@ -33,9 +33,9 @@
         pass
 
     def testInitReinit(self):
-        self.failUnless(galago.init("check-galago-python", False))
+        self.failUnless(galago.init("check-galago-python"))
         galago.uninit()
-        self.failUnless(galago.init("check-galago-python", False))
+        self.failUnless(galago.init("check-galago-python"))
 
 
 class ObjectTestCase(BaseTestCase):