From f940500f4a0d713032345c27dd712b5c873a0f69 Mon Sep 17 00:00:00 2001
From: Nikola Pajkovsky <npajkovs@redhat.com>
Date: Wed, 6 Apr 2011 18:00:02 +0200
Subject: cleanup: get rid of GetPluginSettings dbus call

Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
---
 src/daemon/CommLayerServerDBus.cpp | 29 -----------------------------
 src/daemon/Daemon.cpp              |  1 -
 src/daemon/MiddleWare.cpp          | 10 ----------
 src/daemon/MiddleWare.h            |  2 --
 4 files changed, 42 deletions(-)

(limited to 'src/daemon')

diff --git a/src/daemon/CommLayerServerDBus.cpp b/src/daemon/CommLayerServerDBus.cpp
index b0fd0ed4..9fd48b84 100644
--- a/src/daemon/CommLayerServerDBus.cpp
+++ b/src/daemon/CommLayerServerDBus.cpp
@@ -305,33 +305,6 @@ static int handle_DeleteDebugDump(DBusMessage* call, DBusMessage* reply)
     return 0;
 }
 
-static int handle_GetPluginSettings(DBusMessage* call, DBusMessage* reply)
-{
-    int r;
-    DBusMessageIter in_iter;
-    dbus_message_iter_init(call, &in_iter);
-    const char* PluginName;
-    r = load_val(&in_iter, PluginName);
-    if (r != ABRT_DBUS_LAST_FIELD)
-    {
-        error_msg("dbus call %s: parameter type mismatch", __func__ + 7);
-        return -1;
-    }
-
-    //long unix_uid = get_remote_uid(call);
-    //VERB1 log("got %s('%s') call from uid %ld", "GetPluginSettings", PluginName, unix_uid);
-    map_string_h *plugin_settings = GetPluginSettings(PluginName);
-
-    DBusMessageIter out_iter;
-    dbus_message_iter_init_append(reply, &out_iter);
-    store_map_string(&out_iter, plugin_settings);
-
-    free_map_string(plugin_settings);
-
-    send_flush_and_unref(reply);
-    return 0;
-}
-
 static int handle_GetSettings(DBusMessage* call, DBusMessage* reply)
 {
     map_abrt_settings_t result = GetSettings();
@@ -389,8 +362,6 @@ static DBusHandlerResult message_received(DBusConnection* conn, DBusMessage* msg
         r = handle_DeleteDebugDump(msg, reply);
     else if (strcmp(member, "CreateReport") == 0)
         r = handle_CreateReport(msg, reply);
-    else if (strcmp(member, "GetPluginSettings") == 0)
-        r = handle_GetPluginSettings(msg, reply);
     else if (strcmp(member, "GetSettings") == 0)
         r = handle_GetSettings(msg, reply);
 // looks unused to me.
diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index 59a07262..b1aaf8cf 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -65,7 +65,6 @@ using namespace std;
  *      Returns report_status_t (map_vector_string_t) - the status of each call.
  *      2nd parameter is the contents of user's abrt.conf.
  * - DeleteDebugDump(crash_id): delete it from DB and delete corresponding /var/spool/abrt/DIR
- * - GetPluginSettings(PluginName): returns map_plugin_settings_t (map_string_t)
  * - RegisterPlugin(PluginName): returns void
  * - UnRegisterPlugin(PluginName): returns void
  * - GetSettings(): returns map_abrt_settings_t (map_map_string_t)
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index 051ffacc..5ae77080 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -778,13 +778,3 @@ int DeleteDebugDump(const char *dump_dir_name, long caller_uid)
 
     return 0; /* success */
 }
-
-map_string_h *GetPluginSettings(const char *plugin_name)
-{
-    char *conf_file = xasprintf(PLUGINS_CONF_DIR"/%s.conf", plugin_name);
-    map_string_h *settings = new_map_string();
-    if (load_conf_file(conf_file, settings, /*skip w/o value:*/ false))
-        VERB3 log("Loaded %s.conf", plugin_name);
-    free(conf_file);
-    return settings;
-}
diff --git a/src/daemon/MiddleWare.h b/src/daemon/MiddleWare.h
index 366a95de..b3f6e602 100644
--- a/src/daemon/MiddleWare.h
+++ b/src/daemon/MiddleWare.h
@@ -78,6 +78,4 @@ int  CreateReportThread(const char* dump_dir_name, long caller_uid, int force, c
 void CreateReport(const char* dump_dir_name, long caller_uid, int force, crash_data_t **crash_data);
 int  DeleteDebugDump(const char *dump_dir_name, long caller_uid);
 
-map_string_h *GetPluginSettings(const char *plugin_name);
-
 #endif /*MIDDLEWARE_H_*/
-- 
cgit