- work on dbus interface

diff --git a/dbus/DBusMessage.cc b/dbus/DBusMessage.cc
index 1294ec844ace5dbed6c09f8ba179fd1bf45229be..e4c1f8affd4b6f3fee6017a5b1bb6fce28970dec 100644 (file)
--- 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 c15e07b0fbfbbc83cedfb89ecd582bca083b1bd7..0e395c28fe9fc2854fe3c4a7765e4cc325ce5f14 100644 (file)
--- a/dbus/DBusMessage.h
+++ b/dbus/DBusMessage.h
@@ -179,7 +179,7 @@ namespace DBus
 
     protected:
 
-       list<DBusMessageIter*> iters;
+       vector<DBusMessageIter*> iters;
 
     };