26 files changed, 4 insertions, 53 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 733f1fd..73e4319 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,8 +19,9 @@ ENDIF()
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR})
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
+SET(G_LOG_DOMAIN "C_CREATEREPOLIB")
 
-# Find necessare libraries
+# Find necessary libraries
 
 find_package(BZip2 REQUIRED)
 find_package(CURL REQUIRED)
diff --git a/doc/Doxyfile.in.in b/doc/Doxyfile.in.in
index cf96424..bd6b5a7 100644
--- a/doc/Doxyfile.in.in
+++ b/doc/Doxyfile.in.in
@@ -714,7 +714,6 @@ EXCLUDE_SYMLINKS       = NO
 
 EXCLUDE_PATTERNS       = *_wrap.* \
                          cmd_parser.* \
-                         logging.h \
                          *_internal.h
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2c07997..2f7c4fa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,7 +62,8 @@ TARGET_LINK_LIBRARIES(libcreaterepo_c ${ZLIB_LIBRARY})
 SET_TARGET_PROPERTIES(libcreaterepo_c PROPERTIES
                       OUTPUT_NAME "createrepo_c"
                       SOVERSION ${CR_MAJOR}
-                      VERSION "${VERSION}")
+                      VERSION "${VERSION}"
+                      COMPILE_DEFINITIONS "G_LOG_DOMAIN=\"${G_LOG_DOMAIN}\"")
 
 ADD_EXECUTABLE(createrepo_c createrepo_c.c cmd_parser.c)
 TARGET_LINK_LIBRARIES(createrepo_c
diff --git a/src/compression_wrapper.c b/src/compression_wrapper.c
index 8a6b19c..e7f0e62 100644
--- a/src/compression_wrapper.c
+++ b/src/compression_wrapper.c
@@ -29,7 +29,6 @@
 #include <zlib.h>
 #include <bzlib.h>
 #include <lzma.h>
-#include "logging.h"
 #include "error.h"
 #include "compression_wrapper.h"
 
diff --git a/src/createrepo_c.c b/src/createrepo_c.c
index f1e2158..497d7af 100644
--- a/src/createrepo_c.c
+++ b/src/createrepo_c.c
@@ -44,7 +44,6 @@
 #include "xml_file.h"
 
 
-#define G_LOG_DOMAIN        ((gchar*) 0)
 #define MAX_TASK_BUFFER_LEN 20
 
 
diff --git a/src/load_metadata.c b/src/load_metadata.c
index 35b0e1c..d228121 100644
--- a/src/load_metadata.c
+++ b/src/load_metadata.c
@@ -25,7 +25,6 @@
 #include <assert.h>
 #include "error.h"
 #include "package.h"
-#include "logging.h"
 #include "misc.h"
 #include "load_metadata.h"
 #include "locate_metadata.h"
diff --git a/src/locate_metadata.c b/src/locate_metadata.c
index c1a7669..c1e363a 100644
--- a/src/locate_metadata.c
+++ b/src/locate_metadata.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <errno.h>
 #include "error.h"
-#include "logging.h"
 #include "misc.h"
 #include "locate_metadata.h"
 #include "repomd.h"
diff --git a/src/logging.h b/src/logging.h
deleted file mode 100644
index 71c33f8..0000000
--- a/src/logging.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* createrepo_c - Library of routines for manipulation with repodata
- * Copyright (C) 2012  Tomas Mlcoch
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA.
- */
-
-#ifndef __C_CREATEREPOLIB_LOGGING_H__
-#define __C_CREATEREPOLIB_LOGGING_H__
-
-#undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN    "C_CREATEREPOLIB"
-
-#endif /* __C_CREATEREPOLIB_LOGGING_H__ */
diff --git a/src/mergerepo_c.c b/src/mergerepo_c.c
index ca3d8c5..4b2150a 100644
--- a/src/mergerepo_c.c
+++ b/src/mergerepo_c.c
@@ -43,8 +43,6 @@
 //  - rozvijet architekturu na listy tak jak to dela mergedrepo
 
 
-#define G_LOG_DOMAIN    ((gchar*) 0)
-
 #define DEFAULT_OUTPUTDIR               "merged_repo/"
 #define DEFAULT_DB_COMPRESSION_TYPE             CR_CW_BZ2_COMPRESSION
 #define DEFAULT_GROUPFILE_COMPRESSION_TYPE      CR_CW_GZ_COMPRESSION
diff --git a/src/misc.c b/src/misc.c
index 14b3412..c7a6112 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -32,7 +32,6 @@
 #include <curl/curl.h>
 #include <rpm/rpmlib.h>
 #include "error.h"
-#include "logging.h"
 #include "misc.h"
 
 #define BUFFER_SIZE     4096
diff --git a/src/modifyrepo_c.c b/src/modifyrepo_c.c
index 3e43882..d4f321c 100644
--- a/src/modifyrepo_c.c
+++ b/src/modifyrepo_c.c
@@ -37,8 +37,6 @@
 #include "xml_file.h"
 #include "modifyrepo_shared.h"
 
-#define G_LOG_DOMAIN            ((gchar*) 0)
-
 typedef struct {
 
     gboolean version;
diff --git a/src/modifyrepo_shared.c b/src/modifyrepo_shared.c
index 43241e0..9e39c0e 100644
--- a/src/modifyrepo_shared.c
+++ b/src/modifyrepo_shared.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <assert.h>
 #include "error.h"
-#include "logging.h"
 #include "misc.h"
 #include "checksum.h"
 #include "modifyrepo_shared.h"
diff --git a/src/package.c b/src/package.c
index 1e83bd0..8fd09ec 100644
--- a/src/package.c
+++ b/src/package.c
@@ -20,7 +20,6 @@
 
 #include <string.h>
 #include "package.h"
-#include "logging.h"
 #include "misc.h"
 
 #define PACKAGE_CHUNK_SIZE 2048
diff --git a/src/parsehdr.c b/src/parsehdr.c
index a5db476..de21a61 100644
--- a/src/parsehdr.c
+++ b/src/parsehdr.c
@@ -21,7 +21,6 @@
 #include <assert.h>
 #include <rpm/rpmfi.h>
 #include <stdlib.h>
-#include "logging.h"
 #include "parsehdr.h"
 #include "xml_dump.h"
 #include "misc.h"
diff --git a/src/parsepkg.c b/src/parsepkg.c
index 75b4877..f3f284f 100644
--- a/src/parsepkg.c
+++ b/src/parsepkg.c
@@ -29,7 +29,6 @@
 #include <rpm/rpmlib.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmkeyring.h>
-#include "logging.h"
 #include "error.h"
 #include "parsehdr.h"
 #include "misc.h"
diff --git a/src/repomd.c b/src/repomd.c
index dd4d92e..63ef93d 100644
--- a/src/repomd.c
+++ b/src/repomd.c
@@ -27,7 +27,6 @@
 #include <libxml/encoding.h>
 #include <libxml/xmlwriter.h>
 #include "error.h"
-#include "logging.h"
 #include "misc.h"
 #include "checksum.h"
 #include "repomd.h"
diff --git a/src/sqlite.c b/src/sqlite.c
index 5868071..3ce44e7 100644
--- a/src/sqlite.c
+++ b/src/sqlite.c
@@ -26,7 +26,6 @@
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
-#include "logging.h"
 #include "misc.h"
 #include "sqlite.h"
 #include "error.h"
diff --git a/src/xml_dump.c b/src/xml_dump.c
index 69458f0..6a303ea 100644
--- a/src/xml_dump.c
+++ b/src/xml_dump.c
@@ -24,7 +24,6 @@
 #include <libxml/parser.h>
 #include <string.h>
 #include "error.h"
-#include "logging.h"
 #include "misc.h"
 #include "xml_dump.h"
 #include "xml_dump_internal.h"
diff --git a/src/xml_dump_filelists.c b/src/xml_dump_filelists.c
index 1bb9cb0..7011ead 100644
--- a/src/xml_dump_filelists.c
+++ b/src/xml_dump_filelists.c
@@ -24,7 +24,6 @@
 #include <libxml/encoding.h>
 #include <libxml/xmlwriter.h>
 #include "error.h"
-#include "logging.h"
 #include "package.h"
 #include "xml_dump.h"
 #include "xml_dump_internal.h"
diff --git a/src/xml_dump_other.c b/src/xml_dump_other.c
index cd629c7..975fca5 100644
--- a/src/xml_dump_other.c
+++ b/src/xml_dump_other.c
@@ -25,7 +25,6 @@
 #include <libxml/xmlwriter.h>
 #include <libxml/xmlsave.h>
 #include "error.h"
-#include "logging.h"
 #include "package.h"
 #include "xml_dump.h"
 #include "xml_dump_internal.h"
diff --git a/src/xml_dump_primary.c b/src/xml_dump_primary.c
index df98fd7..9fd5b24 100644
--- a/src/xml_dump_primary.c
+++ b/src/xml_dump_primary.c
@@ -24,7 +24,6 @@
 #include <libxml/encoding.h>
 #include <libxml/xmlwriter.h>
 #include "error.h"
-#include "logging.h"
 #include "package.h"
 #include "xml_dump.h"
 #include "xml_dump_internal.h"
diff --git a/src/xml_dump_repomd.c b/src/xml_dump_repomd.c
index 5860a6d..6da5646 100644
--- a/src/xml_dump_repomd.c
+++ b/src/xml_dump_repomd.c
@@ -25,7 +25,6 @@
 #include <libxml/xmlwriter.h>
 #include <libxml/xmlsave.h>
 #include "error.h"
-#include "logging.h"
 #include "repomd.h"
 #include "xml_dump.h"
 #include "xml_dump_internal.h"
diff --git a/src/xml_parser_filelists.c b/src/xml_parser_filelists.c
index e7cb51b..32a5d2c 100644
--- a/src/xml_parser_filelists.c
+++ b/src/xml_parser_filelists.c
@@ -28,7 +28,6 @@
 #include "xml_parser.h"
 #include "error.h"
 #include "package.h"
-#include "logging.h"
 #include "misc.h"
 
 #define ERR_DOMAIN      CR_XML_PARSER_FIL_ERROR
diff --git a/src/xml_parser_other.c b/src/xml_parser_other.c
index af560a2..5a34bcd 100644
--- a/src/xml_parser_other.c
+++ b/src/xml_parser_other.c
@@ -28,7 +28,6 @@
 #include "xml_parser.h"
 #include "error.h"
 #include "package.h"
-#include "logging.h"
 #include "misc.h"
 
 #define ERR_DOMAIN      CR_XML_PARSER_OTH_ERROR
diff --git a/src/xml_parser_primary.c b/src/xml_parser_primary.c
index 9f964eb..bccb054 100644
--- a/src/xml_parser_primary.c
+++ b/src/xml_parser_primary.c
@@ -28,7 +28,6 @@
 #include "xml_parser.h"
 #include "error.h"
 #include "package.h"
-#include "logging.h"
 #include "misc.h"
 
 #define ERR_DOMAIN      CR_XML_PARSER_PRI_ERROR
diff --git a/src/xml_parser_repomd.c b/src/xml_parser_repomd.c
index f9559da..dd05713 100644
--- a/src/xml_parser_repomd.c
+++ b/src/xml_parser_repomd.c
@@ -28,7 +28,6 @@
 #include "xml_parser.h"
 #include "error.h"
 #include "package.h"
-#include "logging.h"
 #include "misc.h"
 
 #define ERR_DOMAIN      CR_XML_PARSER_REPOMD_ERROR