From: Arvin Schnell <aschnell@suse.de>
Date: Wed, 8 Aug 2012 07:20:52 +0000 (+0200)
Subject: - work on dbus interface
X-Git-Tag: v0.1.3~160
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=1b87dff66a192ab5acb08fe7c6ffa1eda0749018;p=thirdparty%2Fsnapper.git

- work on dbus interface
---

diff --git a/dbus/DBusMessage.cc b/dbus/DBusMessage.cc
index 1294ec84..e4c1f8af 100644
--- a/dbus/DBusMessage.cc
+++ b/dbus/DBusMessage.cc
@@ -70,10 +70,9 @@ namespace DBus
 
     Hihi::Hihi(Message& msg)
     {
-	DBusMessageIter* args = new DBusMessageIter();
-	if (!dbus_message_iter_init(msg.get_message(), args))
+	iters.push_back(new DBusMessageIter());
+	if (!dbus_message_iter_init(msg.get_message(), top()))
 	    throw FatalException();
-	iters.push_back(args);
     }
 
 
@@ -105,9 +104,8 @@ namespace DBus
 
     Hoho::Hoho(Message& msg)
     {
-	DBusMessageIter* args = new DBusMessageIter();
-	dbus_message_iter_init_append(msg.get_message(), args);
-	iters.push_back(args);
+	iters.push_back(new DBusMessageIter());
+	dbus_message_iter_init_append(msg.get_message(), top());
     }
 
 
@@ -135,6 +133,7 @@ namespace DBus
 	iters.pop_back();
 	if (!dbus_message_iter_close_container(top(), iter2))
 	    throw FatalException();
+	delete iter2;
     }
 
 
@@ -155,6 +154,7 @@ namespace DBus
 	iters.pop_back();
 	if (!dbus_message_iter_close_container(top(), iter2))
 	    throw FatalException();
+	delete iter2;
     }
 
 
@@ -175,6 +175,7 @@ namespace DBus
 	iters.pop_back();
 	if (!dbus_message_iter_close_container(top(), iter2))
 	    throw FatalException();
+	delete iter2;
     }
 
 
diff --git a/dbus/DBusMessage.h b/dbus/DBusMessage.h
index c15e07b0..0e395c28 100644
--- a/dbus/DBusMessage.h
+++ b/dbus/DBusMessage.h
@@ -179,7 +179,7 @@ namespace DBus
 
     protected:
 
-	list<DBusMessageIter*> iters;
+	vector<DBusMessageIter*> iters;
 
     };