# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1182052227 0
# Node ID 88dc7c826752291498eca257283051a15f3dcf30
# Parent  4bd4756dc72796d539024153cd5700f5f9100179# Parent  5d10587689702094cc2314379695d22f434a7a7a
merge of '96e4fe7ca94dcb0c455414bd266f9953e2aea59a'
     and 'dcf2ead9f63be6b4b902706a962d67327ae5230e'

diff -r 4bd4756dc727 -r 88dc7c826752 libpurple/dbus-analyze-functions.py
--- a/libpurple/dbus-analyze-functions.py	Sun Jun 17 03:05:39 2007 +0000
+++ b/libpurple/dbus-analyze-functions.py	Sun Jun 17 03:50:27 2007 +0000
@@ -138,7 +138,7 @@
             # strings
             if type[0] in ["char", "gchar"]:
                 if const:
-                    return self.inputstring(type, name)
+                    return self.inputstring(type, name, unsigned)
                 else:
                     raise myexception
 
@@ -244,8 +244,11 @@
         else:
             self.inputparams.append(("G_TYPE_INT", name))
 
-    def inputstring(self, type, name):
-        self.paramshdr.append("const char *%s" % name)
+    def inputstring(self, type, name, us):
+        if us:
+            self.paramshdr.append("const unsigned char *%s" % name)
+        else:
+            self.paramshdr.append("const char *%s" % name)
         self.inputparams.append(("G_TYPE_STRING", name))
         
     def inputpurplestructure(self, type, name):
@@ -366,10 +369,13 @@
             self.cparams.append(("UINT32", name))
             self.addintype("u", name)
 
-    def inputstring(self, type, name):
-        self.cdecls.append("\tconst char *%s;" % name)
+    def inputstring(self, type, name, us):
+        if us:
+            self.cdecls.append("\tconst unsigned char *%s;" % name)
+        else:
+            self.cdecls.append("\tconst char *%s;" % name)
         self.cparams.append(("STRING", name))
-        self.ccode  .append("\tNULLIFY(%s);" % name)
+        self.ccode.append("\t%s = (%s && %s[0]) ? %s : NULL;" % (name,name,name,name))
         self.addintype("s", name)
 
     def inputhash(self, type, name):