* implement avahi_exe_name for BSD/Darwin

[catta] / avahi-utils / avahi / __init__.py

diff --git a/avahi-utils/avahi/__init__.py b/avahi-utils/avahi/__init__.py
index 90d2b7639aba5578920399a3f93246ff75eb3094..c10b85d404c6f8903cba1409ff416520179e6ff1 100644 (file)
--- a/avahi-utils/avahi/__init__.py
+++ b/avahi-utils/avahi/__init__.py
@@ -20,13 +20,13 @@
 # Some definitions matching those in core.h
 import socket, dbus
 
-SERVER_INVALID, SERVER_REGISTERING, SERVER_RUNNING, SERVER_COLLISION = range(-1, 3)
+SERVER_INVALID, SERVER_REGISTERING, SERVER_RUNNING, SERVER_COLLISION = range(0, 4)
 
-ENTRY_GROUP_UNCOMMITED, ENTRY_GROUP_REGISTERING, ENTRY_GROUP_ESTABLISHED, ENTRY_GROUP_COLLISION = range(-1, 3)
+ENTRY_GROUP_UNCOMMITED, ENTRY_GROUP_REGISTERING, ENTRY_GROUP_ESTABLISHED, ENTRY_GROUP_COLLISION = range(0, 4)
 
 DOMAIN_BROWSER_REGISTER, DOMAIN_BROWSER_REGISTER_DEFAULT, DOMAIN_BROWSER_BROWSE, DOMAIN_BROWSER_BROWSE_DEFAULT, DOMAIN_BROWSER_BROWSE_LEGACY = range(0, 5)
 
-PROTO_INET, PROTO_INET6, PROTO_UNSPEC = socket.AF_INET, socket.AF_INET6, socket.AF_UNSPEC
+PROTO_UNSPEC, PROTO_INET, PROTO_INET6  = -1, 0, 1
 
 IF_UNSPEC = -1
 
@@ -74,3 +74,11 @@ def string_array_to_txt_array(t):
         l.append(string_to_byte_array(s))
 
     return l
+
+def dict_to_txt_array(txt_dict):
+    l = []
+
+    for k,v in txt_dict.items():
+        l.append(string_to_byte_array("%s=%s" % (k,v)))
+
+    return l