new crash types

5 files changed, 12 insertions, 10 deletions

diff --git a/src/Applet/DBusClientProxy.h b/src/Applet/DBusClientProxy.h
index f0b8a00..4bbf5ee 100644
--- a/src/Applet/DBusClientProxy.h
+++ b/src/Applet/DBusClientProxy.h
@@ -50,7 +50,7 @@ public:
       ...
       >
       */
-    dbus_vector_crash_infos_t GetCrashInfos(const std::string &pUID)
+    vector_crash_infos_t GetCrashInfos(const std::string &pUID)
     {
         DBus::CallMessage call;
         
@@ -61,7 +61,7 @@ public:
         DBus::Message ret = invoke_method(call);
         DBus::MessageIter ri = ret.reader();
 
-        dbus_vector_crash_infos_t argout;
+        vector_crash_infos_t argout;
         ri >> argout;
         return argout;
     }
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index fac346c..f3eb96f 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -71,13 +71,13 @@ gboolean CCrashWatcher::handle_event_cb(GIOChannel *gio, GIOCondition condition,
         {
             std::string sName = name;
             CCrashWatcher *cc = (CCrashWatcher*)daemon;
-            crash_info_t crashinfo;
+            map_crash_info_t crashinfo;
             try
             {
                 if(cc->m_pMW->SaveDebugDump(std::string(DEBUG_DUMPS_DIR) + "/" + name, crashinfo))
                 {
                     /* send message to dbus */
-                    cc->m_pCommLayer->Crash(crashinfo.m_sPackage);
+                    cc->m_pCommLayer->Crash(crashinfo[item_crash_into_t_str[CI_PACKAGE]][CD_CONTENT]);
                 }
             }
             catch(std::string err)
@@ -236,7 +236,7 @@ void CCrashWatcher::FindNewDumps(const std::string& pPath)
         perror ("Couldn't open the directory");
 
     for (std::vector<std::string>::iterator itt = dirs.begin(); itt != dirs.end(); ++itt){
-        crash_info_t crashinfo;
+        map_crash_info_t crashinfo;
         std::cerr << "Saving debugdeump: " << *itt << std::endl;
         try
         {
diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h
index 7ab7072..14fd560 100644
--- a/src/Daemon/CrashWatcher.h
+++ b/src/Daemon/CrashWatcher.h
@@ -75,11 +75,13 @@ class CCrashWatcher
 
     /* methods exported on dbus */
     public:
-        dbus_vector_crash_infos_t GetCrashInfos(const std::string &pUID);
+        /*
+        vector_crash_infos_t GetCrashInfos(const std::string &pUID);
         dbus_vector_map_crash_infos_t GetCrashInfosMap(const std::string &pDBusSender);
         dbus_map_report_info_t CreateReport(const std::string &pUUID,const std::string &pDBusSender);
         bool Report(dbus_map_report_info_t pReport);
         bool DeleteDebugDump(const std::string& pUUID, const std::string& pDBusSender);
+         */
     public:
         /* Observer methods */
         void Update(const std::string&) {}
diff --git a/src/Daemon/DBusCommon.h b/src/Daemon/DBusCommon.h
index 8923f42..20c9424 100644
--- a/src/Daemon/DBusCommon.h
+++ b/src/Daemon/DBusCommon.h
@@ -26,7 +26,7 @@
 #include <vector>
 
 //typedef std::vector<crash_info_t> vector_crash_infos_t;
-typedef std::vector< std::vector<std::string> > dbus_vector_crash_infos_t;
+typedef std::vector< std::vector<std::string> > vector_crash_infos_t;
 typedef std::vector< std::map<std::string, std::string> > dbus_vector_map_crash_infos_t;
 //typedef std::map<std::string, std::string> dbus_map_report_info_t;
-typedef std::vector<std::string> dbus_vector_crash_report_info_t;
+typedef std::vector<std::string> map_crash_report_t;
diff --git a/src/Daemon/DBusServerProxy.h b/src/Daemon/DBusServerProxy.h
index 8ed1e5b..afdfe1b 100644
--- a/src/Daemon/DBusServerProxy.h
+++ b/src/Daemon/DBusServerProxy.h
@@ -87,7 +87,7 @@ public:
     /* methods exported by this interface,
      * you will have to implement them in your ObjectAdaptor
      */
-     virtual dbus_vector_crash_infos_t GetCrashInfos(const std::string &pUID) = 0;
+     virtual vector_crash_infos_t GetCrashInfos(const std::string &pUID) = 0;
      virtual dbus_vector_map_crash_infos_t GetCrashInfosMap(const std::string &pDBusSender) = 0;
      virtual dbus_map_report_info_t CreateReport(const std::string &pUUID,const std::string &pDBusSender) = 0;
      virtual bool Report(dbus_map_report_info_t pReport) = 0;
@@ -132,7 +132,7 @@ private:
         DBus::MessageIter ri = call.reader();
 
         std::string argin1; ri >> argin1;
-        dbus_vector_crash_infos_t argout1 = GetCrashInfos(argin1);
+        vector_crash_infos_t argout1 = GetCrashInfos(argin1);
         DBus::ReturnMessage reply(call);
         DBus::MessageIter wi = reply.writer();
         wi << argout1;