From e001c3c0c7d8dc9576f1630551a73cc01f19769b Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 19 Jan 2011 17:12:53 +0100 Subject: move (de)installation of abrt-hook-ccpp into abrt-ccpp service. Init script is packaged and installed with abrt-addon-ccpp package. In order to not install the hook twice, "old" plugin loading in abrtd is disabled (pending deletion of entire "old" plugin machinery). Signed-off-by: Denys Vlasenko --- src/daemon/Daemon.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/daemon') diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp index 1516f159..6d9bd87f 100644 --- a/src/daemon/Daemon.cpp +++ b/src/daemon/Daemon.cpp @@ -676,10 +676,6 @@ int main(int argc, char** argv) handle_inotify_cb, NULL); - VERB1 log("Loading plugins from "PLUGINS_LIB_DIR); - g_pPluginManager = new CPluginManager(); - g_pPluginManager->LoadPlugins(); - /* Add an event source which waits for INT/TERM signal */ VERB1 log("Adding signal pipe watch to glib main loop"); channel_signal = g_io_channel_unix_new(s_signal_pipe[0]); @@ -771,12 +767,7 @@ int main(int argc, char** argv) g_io_channel_unref(channel_inotify); delete g_pCommLayer; - if (g_pPluginManager) - { - /* This restores /proc/sys/kernel/core_pattern, among other things: */ - g_pPluginManager->UnLoadPlugins(); - delete g_pPluginManager; - } + if (pMainloop) g_main_loop_unref(pMainloop); -- cgit