Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

1 files changed, 12 insertions, 18 deletions

diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp
index 2c2ca3a..646974d 100644
--- a/src/Daemon/CommLayerServerDBus.cpp
+++ b/src/Daemon/CommLayerServerDBus.cpp
@@ -88,23 +88,21 @@ void CCommLayerServerDBus::JobDone(const char* peer, const char* pUUID)
     send_flush_and_unref(msg);
 }
 
-void CCommLayerServerDBus::Update(const std::string& pMessage, const char* peer, uint64_t job_id)
+void CCommLayerServerDBus::Update(const char* pMessage, const char* peer, uint64_t job_id)
 {
     DBusMessage* msg = new_signal_msg("Update", peer);
-    const char* c_message = pMessage.c_str();
     dbus_message_append_args(msg,
-            DBUS_TYPE_STRING, &c_message,
+            DBUS_TYPE_STRING, &pMessage,
             DBUS_TYPE_UINT64, &job_id, /* TODO: redundant parameter, remove from API */
             DBUS_TYPE_INVALID);
     send_flush_and_unref(msg);
 }
 
-void CCommLayerServerDBus::Warning(const std::string& pMessage, const char* peer, uint64_t job_id)
+void CCommLayerServerDBus::Warning(const char* pMessage, const char* peer, uint64_t job_id)
 {
     DBusMessage* msg = new_signal_msg("Warning", peer);
-    const char* c_message = pMessage.c_str();
     dbus_message_append_args(msg,
-            DBUS_TYPE_STRING, &c_message,
+            DBUS_TYPE_STRING, &pMessage,
             DBUS_TYPE_UINT64, &job_id, /* TODO: redundant parameter, remove from API */
             DBUS_TYPE_INVALID);
     send_flush_and_unref(msg);
@@ -145,7 +143,7 @@ static int handle_GetCrashInfos(DBusMessage* call, DBusMessage* reply)
     return 0;
 }
 
-static int handle_CreateReport(DBusMessage* call, DBusMessage* reply)
+static int handle_StartJob(DBusMessage* call, DBusMessage* reply)
 {
     int r;
     DBusMessageIter in_iter;
@@ -178,7 +176,7 @@ static int handle_CreateReport(DBusMessage* call, DBusMessage* reply)
     return 0;
 }
 
-static int handle_GetJobResult(DBusMessage* call, DBusMessage* reply)
+static int handle_CreateReport(DBusMessage* call, DBusMessage* reply)
 {
     int r;
     DBusMessageIter in_iter;
@@ -192,7 +190,7 @@ static int handle_GetJobResult(DBusMessage* call, DBusMessage* reply)
     }
 
     long unix_uid = get_remote_uid(call);
-    map_crash_report_t report = GetJobResult(pUUID, to_string(unix_uid).c_str(), /*force:*/ 0);
+    map_crash_report_t report = CreateReport(pUUID, to_string(unix_uid).c_str(), /*force:*/ 0);
 
     DBusMessageIter out_iter;
     dbus_message_iter_init_append(reply, &out_iter);
@@ -315,11 +313,7 @@ static int handle_DeleteDebugDump(DBusMessage* call, DBusMessage* reply)
     }
 
     long unix_uid = get_remote_uid(call);
-    bool argout1 = DeleteDebugDump(argin1, to_string(unix_uid).c_str());
-
-    dbus_message_append_args(reply,
-                DBUS_TYPE_BOOLEAN, &argout1,
-                DBUS_TYPE_INVALID);
+    DeleteDebugDump(argin1, to_string(unix_uid).c_str());
 
     send_flush_and_unref(reply);
     return 0;
@@ -482,14 +476,14 @@ static DBusHandlerResult message_received(DBusConnection* conn, DBusMessage* msg
     int r = -1;
     if (strcmp(member, "GetCrashInfos") == 0)
         r = handle_GetCrashInfos(msg, reply);
-    else if (strcmp(member, "CreateReport") == 0)
-        r = handle_CreateReport(msg, reply);
+    else if (strcmp(member, "StartJob") == 0)
+        r = handle_StartJob(msg, reply);
     else if (strcmp(member, "Report") == 0)
         r = handle_Report(msg, reply);
     else if (strcmp(member, "DeleteDebugDump") == 0)
         r = handle_DeleteDebugDump(msg, reply);
-    else if (strcmp(member, "GetJobResult") == 0)
-        r = handle_GetJobResult(msg, reply);
+    else if (strcmp(member, "CreateReport") == 0)
+        r = handle_CreateReport(msg, reply);
     else if (strcmp(member, "GetPluginsInfo") == 0)
         r = handle_GetPluginsInfo(msg, reply);
     else if (strcmp(member, "GetPluginSettings") == 0)