[gnome-mag/bonobo-less] Some Fixes:

[Fernando Herrera de las Heras <fherrera src gnome org>]

commit a9c865e4f48b7530eb4708ead80241bd8a0c49ce
Author: Fernando Herrera <fherrera onirica com>
Date:   Mon Jul 5 20:30:05 2010 +0200

    Some Fixes:
    
    	Fix ZoomRegion path name.
    	Return GVariant tuples for some functions.
    	Fix test to use bounds

 magnifier/magnifier.c   |    6 ++++--
 magnifier/zoom-region.c |   11 +++++++----
 test/dbus-mag-test.py   |    4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/magnifier/magnifier.c b/magnifier/magnifier.c
index 939febd..b4d177c 100644
--- a/magnifier/magnifier.c
+++ b/magnifier/magnifier.c
@@ -904,9 +904,11 @@ method_call_cb (GDBusConnection       *connection,
 		if (len == 0) {
 			gchar *empty_array = NULL;
 			g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@as)", g_variant_new_array (G_VARIANT_TYPE_STRING, NULL, 0)));
-		} else 
+		} else  {
+			GVariant *array = g_variant_new_strv ((const gchar * const*)list, len);
 			g_dbus_method_invocation_return_value (invocation,
-						       	       g_variant_new_strv ((const gchar * const*)list, len));
+						       	       g_variant_new_tuple (&array, 1));
+		}
 		g_free (list);
 	} else if (g_strcmp0 (method_name, "addZoomRegion") == 0) {
 		ZoomRegion *zoom_region;
diff --git a/magnifier/zoom-region.c b/magnifier/zoom-region.c
index 832cb2c..0d28f5c 100644
--- a/magnifier/zoom-region.c
+++ b/magnifier/zoom-region.c
@@ -171,7 +171,7 @@ reset_timing_stats()
 
 /** DEBUG STUFF **/
 
-#undef DEBUG
+#define DEBUG
 #ifdef DEBUG
 #define DEBUG_RECT(a, b) _debug_announce_rect (a, b)
 #else
@@ -2592,12 +2592,15 @@ method_call_cb (GDBusConnection       *connection,
 		g_dbus_method_invocation_return_value (invocation,
 						       g_variant_new ("(b)", retval));
 	} else if (g_strcmp0 (method_name, "getMagFactor") == 0) {
+		GVariant *array;
 		GVariant *children[2];
 
 		children[0] = g_variant_new_double (zoom_region->xscale);
 		children[1] = g_variant_new_double (zoom_region->yscale);
+
+		array = g_variant_new_array (G_VARIANT_TYPE_DOUBLE, children, 2);
 		g_dbus_method_invocation_return_value (invocation,
-						       g_variant_new_array (G_VARIANT_TYPE_DOUBLE, children, 2));
+						       g_variant_new_tuple (&array, 1));
 	} else if (g_strcmp0 (method_name, "setRoi") == 0) {
 		RectBounds  bounds;
 		GVariant   *roi;
@@ -3641,8 +3644,8 @@ zoom_region_new (GDBusConnection *connection,
 	_this_zoom_region->priv->parent = MAGNIFIER (parent);
 	zoom_region_init_window (_this_zoom_region);
 
-	_this_zoom_region->object_path = g_strdup_printf("/org/gnome/ZoomRegion/%i", zoom_region_number);
-	g_print ("Registering /org/gnome/ZoomRegion/%i", zoom_region_number);
+	_this_zoom_region->object_path = g_strdup_printf("/org/gnome/Magnifier/ZoomRegion/%i", zoom_region_number);
+	g_print ("Registering /org/gnome/Magnifier/ZoomRegion/%i", zoom_region_number);
 
 	if (!introspection_data)
 		introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
diff --git a/test/dbus-mag-test.py b/test/dbus-mag-test.py
index a554bcb..194baa9 100755
--- a/test/dbus-mag-test.py
+++ b/test/dbus-mag-test.py
@@ -68,8 +68,8 @@ else:
     print "FAILED TO ADD";
 print "";
 
-roi = [200, 100, 100, 100];
-position = [800, 800, 100, 100];
+roi = [200, 100, 300, 200];
+position = [800, 800, 900, 900];
 print "Creating another zoom region of ", roi, " , and at ", position
 zoomRegionPath = magProxy.createZoomRegion (2.5, 2.5, roi, position);
 magProxy.addZoomRegion(zoomRegionPath);