ayatana-commits team mailing list archive

[Aurélien Gâteau <aurelien.gateau@xxxxxxxxxxxxx>]

Aurélien Gâteau has proposed merging lp:~agateau/dbusmenu/misc-tool-fixes into lp:dbusmenu.

Requested reviews:
  DBus Menu Team (dbusmenu-team)


Re-enabled test-json as it passes on my machine. Please tell me if it works for you as well. Removed some debug output from dbusmenu-dumper which would could get inside the dump (but only if run in click-to-dump mode, so this change is not the reason test-json works now)
-- 
https://code.launchpad.net/~agateau/dbusmenu/misc-tool-fixes/+merge/31869
Your team ayatana-commits is subscribed to branch lp:dbusmenu.

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2010-07-22 19:05:53 +0000
+++ tests/Makefile.am	2010-08-05 17:41:18 +0000
@@ -10,6 +10,7 @@
 	test-glib-proxy \
 	test-glib-simple-items \
 	test-glib-submenu \
+	test-json \
 	test-gtk-objects-test \
 	test-gtk-label \
 	test-gtk-shortcut \

=== modified file 'tools/dbusmenu-dumper.c'
--- tools/dbusmenu-dumper.c	2010-07-20 21:36:57 +0000
+++ tools/dbusmenu-dumper.c	2010-08-05 17:41:18 +0000
@@ -445,12 +445,10 @@
 			g_printerr("ERROR: could not get the id for the pointed window\n");
 			return 1;
 		}
-		g_debug("window: %u", (unsigned int)window);
 		if (!init_dbus_vars_from_window(window)) {
 			g_printerr("ERROR: could not find a menu for the pointed window\n");
 			return 1;
 		}
-		g_debug("dbusname: %s, dbusobject: %s", dbusname, dbusobject);
 	} else {
 		if (dbusname == NULL) {
 			g_printerr("ERROR: dbus-name not specified\n");