From: Steven Luo <steven+maemo@steven676.net>
Date: Sun, 13 Dec 2009 08:21:46 +0000 (-0800)
Subject: Create and register two different OssoBrowser objects instead of reusing one
X-Git-Tag: v3.0rc1~25
X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=commitdiff_plain;h=504e4bc571d33afed7274523af46f86378d6a6d8;hp=6e58a3c82137f47f41b82a8426a2d6e8be7c39bc

Create and register two different OssoBrowser objects instead of reusing one

Valgrind complains about a memory leak otherwise.
---

diff --git a/main.c b/main.c
index e84c2be..9033117 100644
--- a/main.c
+++ b/main.c
@@ -160,7 +160,7 @@ out_noopen:
 }
 
 int main() {
-	OssoBrowser *obj;
+	OssoBrowser *obj_osso_browser, *obj_osso_browser_req;
 	GMainLoop *mainloop;
 	GError *error = NULL;
 
@@ -203,11 +203,13 @@ int main() {
 
 	dbus_request_osso_browser_name(&ctx);
 
-	obj = g_object_new(OSSO_BROWSER_TYPE, NULL);
+	obj_osso_browser = g_object_new(OSSO_BROWSER_TYPE, NULL);
+	obj_osso_browser_req = g_object_new(OSSO_BROWSER_TYPE, NULL);
 	dbus_g_connection_register_g_object(ctx.session_bus,
-			"/com/nokia/osso_browser", G_OBJECT(obj));
+			"/com/nokia/osso_browser", G_OBJECT(obj_osso_browser));
 	dbus_g_connection_register_g_object(ctx.session_bus,
-			"/com/nokia/osso_browser/request", G_OBJECT(obj));
+			"/com/nokia/osso_browser/request",
+			G_OBJECT(obj_osso_browser_req));
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	printf("Starting main loop\n");