diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-25 19:31:22 +0200 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-25 19:31:22 +0200 |
commit | de34fb6d4ccfacff5c823c3ce95b4e1746e78afc (patch) | |
tree | a80b09979c2aedf829c08f7c4ae0c2346657fd04 | |
parent | 7cf6ff7366aa71f9c3ae41bd7b2373541875070f (diff) | |
download | abrt-de34fb6d4ccfacff5c823c3ce95b4e1746e78afc.tar.gz abrt-de34fb6d4ccfacff5c823c3ce95b4e1746e78afc.tar.xz abrt-de34fb6d4ccfacff5c823c3ce95b4e1746e78afc.zip |
reduce usage of daemon's library in non-daemon parts
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
-rw-r--r-- | lib/utils/abrt_curl.c | 3 | ||||
-rw-r--r-- | lib/utils/dump_dir.c | 1 | ||||
-rw-r--r-- | src/daemon/Makefile.am | 2 | ||||
-rw-r--r-- | src/daemon/PluginManager.cpp | 1 | ||||
-rw-r--r-- | src/daemon/abrt-action-save-package-data.cpp | 2 | ||||
-rw-r--r-- | src/hooks/Makefile.am | 1 |
6 files changed, 5 insertions, 5 deletions
diff --git a/lib/utils/abrt_curl.c b/lib/utils/abrt_curl.c index 02506218..f23d3949 100644 --- a/lib/utils/abrt_curl.c +++ b/lib/utils/abrt_curl.c @@ -18,7 +18,6 @@ */ #include "abrtlib.h" #include "abrt_curl.h" -#include "comm_layer_inner.h" /* * Utility functions @@ -168,7 +167,7 @@ static size_t fread_with_reporting(void *ptr, size_t size, size_t nmemb, void *u fseeko(fp, 0, SEEK_END); off_t sz = ftello(fp); fseeko(fp, cur_pos, SEEK_SET); - update_client(_("Uploaded: %llu of %llu kbytes"), + log(_("Uploaded: %llu of %llu kbytes"), (unsigned long long)cur_pos / 1024, (unsigned long long)sz / 1024); } diff --git a/lib/utils/dump_dir.c b/lib/utils/dump_dir.c index 19a6c875..e8a0e7e3 100644 --- a/lib/utils/dump_dir.c +++ b/lib/utils/dump_dir.c @@ -20,7 +20,6 @@ */ #include <sys/utsname.h> #include "abrtlib.h" -#include "comm_layer_inner.h" #include "strbuf.h" // TODO: diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index daac8462..9eb41f23 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -223,6 +223,7 @@ abrt_action_kerneloops_CPPFLAGS = \ $(GLIB_CFLAGS) \ -D_GNU_SOURCE \ -Wall -Werror +# libABRTdUtils is used only because of LoadPluginSettings: abrt_action_kerneloops_LDADD = \ ../../lib/utils/libABRT_web_utils.la \ ../../lib/utils/libABRTdUtils.la \ @@ -244,6 +245,7 @@ abrt_action_print_CPPFLAGS = \ $(GLIB_CFLAGS) \ -D_GNU_SOURCE \ -Wall -Werror +# libABRTdUtils is used only because of make_description_logger: abrt_action_print_LDADD = \ ../../lib/utils/libABRTdUtils.la \ ../../lib/utils/libABRTUtils.la diff --git a/src/daemon/PluginManager.cpp b/src/daemon/PluginManager.cpp index b67048a0..ecc574d9 100644 --- a/src/daemon/PluginManager.cpp +++ b/src/daemon/PluginManager.cpp @@ -21,7 +21,6 @@ #include <dlfcn.h> #include "abrtlib.h" #include "abrt_exception.h" -#include "comm_layer_inner.h" #include "Polkit.h" #include "PluginManager.h" diff --git a/src/daemon/abrt-action-save-package-data.cpp b/src/daemon/abrt-action-save-package-data.cpp index 9c1c4c0b..55acd97f 100644 --- a/src/daemon/abrt-action-save-package-data.cpp +++ b/src/daemon/abrt-action-save-package-data.cpp @@ -25,6 +25,8 @@ #define PROGNAME "abrt-action-save-package-data" +// TODO: convert g_settings_foo usage to command-line switches + /** * Returns the first full path argument in the command line or NULL. * Skips options (params of the form "-XXX"). diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am index 4d7c342a..11468b95 100644 --- a/src/hooks/Makefile.am +++ b/src/hooks/Makefile.am @@ -29,7 +29,6 @@ dumpoops_CPPFLAGS = \ # build will succeed, but at runtime plugins do need ABRT*d*Utils dumpoops_LDADD = \ ../../lib/utils/libABRTUtils.la \ - ../../lib/utils/libABRTdUtils.la \ $(GLIB_FLAGS) python_PYTHON = abrt.pth abrt_exception_handler.py |