conduit r1370 - in trunk: . conduit/modules/NetworkModule

[jstowers svn gnome org]

Author: jstowers
Date: Wed Mar 12 21:20:29 2008
New Revision: 1370
URL: http://svn.gnome.org/viewvc/conduit?rev=1370&view=rev

Log:
2008-03-13  Chris Rivera <chrismrivera gmail com>

	* conduit/modules/NetworkModule/Peers.py: Use correct dbus 
	types for avahi AddService().
	
	* conduit/modules/NetworkModule/Server.py: Adds missing parameters to 
	is_configured()



Modified:
   trunk/ChangeLog
   trunk/conduit/modules/NetworkModule/Peers.py
   trunk/conduit/modules/NetworkModule/Server.py

Modified: trunk/conduit/modules/NetworkModule/Peers.py
==============================================================================
--- trunk/conduit/modules/NetworkModule/Peers.py	(original)
+++ trunk/conduit/modules/NetworkModule/Peers.py	Wed Mar 12 21:20:29 2008
@@ -159,12 +159,12 @@
         self.group.AddService(
                 IF_UNSPEC,        #interface
                 PROTO_UNSPEC,     #protocol
-                0,                      #flags
+                dbus.UInt32(0),         #flags
                 self.hostname,          #name
                 AVAHI_SERVICE_NAME,     #service type
                 AVAHI_SERVICE_DOMAIN,   #domain
                 '',                     #host
-                self.port,              #port
+                dbus.UInt16(self.port), #port
                 string_array_to_txt_array(["version=%s" % conduit.VERSION])
                 )
         self.group.Commit()

Modified: trunk/conduit/modules/NetworkModule/Server.py
==============================================================================
--- trunk/conduit/modules/NetworkModule/Server.py	(original)
+++ trunk/conduit/modules/NetworkModule/Server.py	Wed Mar 12 21:20:29 2008
@@ -159,7 +159,7 @@
         #Stop right click menu
         return True
 
-    def is_configured(self):
+    def is_configured(self, isSource, isTwoWay):
         #Prevent initiating a sync on the server end by pretending we are
         #not configured
         return False