[gjs] Bug 584858: Fix errors (and leftover debugging) from dbus merge.

[C. Scott Ananian <cananian src gnome org>]

commit ab518b98aee44535ab584e49df6e849555079aee
Author: C. Scott Ananian <cscott litl com>
Date:   Thu Jun 4 15:09:45 2009 -0400

    Bug 584858: Fix errors (and leftover debugging) from dbus merge.
    
    Commit e6466712a28c29f23e1e3e762c68ccc2d8e339a5 ported over some code
    contributed by Litl, but a few bugs crept in.  This patch fixes them.
---
 modules/dbus.c  |    2 --
 modules/dbus.js |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/dbus.c b/modules/dbus.c
index 27a32c0..46b9a10 100644
--- a/modules/dbus.c
+++ b/modules/dbus.c
@@ -1632,8 +1632,6 @@ gjs_js_define_dbus_stuff(JSContext      *context,
      * JS program may not even be using it.
      */
 
-    g_printerr ("RUNNING dbus init\n");
-
     if (!JS_DefineFunction(context, module_obj,
                            "signatureLength",
                            gjs_js_dbus_signature_length,
diff --git a/modules/dbus.js b/modules/dbus.js
index 2f33692..bd29d47 100644
--- a/modules/dbus.js
+++ b/modules/dbus.js
@@ -467,7 +467,7 @@ function _getInterfaceXML() {
         let methods = ('methods' in iface) ? iface.methods : [];
         for (let j = 0; j < methods.length; j++) {
             let method = methods[j];
-            result += '    <method name="' + method.name + method.name + '">\n';
+            result += '    <method name="' + method.name + '">\n';
             for each (let sig in _parseDBusSigs(method.inSignature)) {
                 result += '      <arg type="' + sig + '" direction="in"/>\n';
             }
@@ -482,7 +482,7 @@ function _getInterfaceXML() {
             let signal = signals[j];
             result += '    <signal name="' + signal.name + '">\n';
             for each (let sig in _parseDBusSigs(signal.inSignature)) {
-                result += '      <arg type="' + sig + '%s"/>\n';
+                result += '      <arg type="' + sig + '"/>\n';
             }
             result += '    </signal>\n';
         }