diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2011-01-19 17:12:53 +0100 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2011-01-19 17:12:53 +0100 |
commit | e001c3c0c7d8dc9576f1630551a73cc01f19769b (patch) | |
tree | 0d8e510ff2e54ff119e4a8b282f4f080510ed7fa /src/daemon/Daemon.cpp | |
parent | c59a0c4143cd285c7c513e124baed517002750bc (diff) | |
download | abrt-e001c3c0c7d8dc9576f1630551a73cc01f19769b.tar.gz abrt-e001c3c0c7d8dc9576f1630551a73cc01f19769b.tar.xz abrt-e001c3c0c7d8dc9576f1630551a73cc01f19769b.zip |
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 <dvlasenk@redhat.com>
Diffstat (limited to 'src/daemon/Daemon.cpp')
-rw-r--r-- | src/daemon/Daemon.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
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); |