Move src/debug to tpsip/debug

18 files changed, 21 insertions, 36 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index a8c6c4e..0ec9a9d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,8 +86,6 @@ libtpsip_convenience_la_SOURCES = \
     sip-connection.c \
     sip-connection-manager.h \
     sip-connection-manager.c \
-    debug.h \
-    debug.c \
     media-factory.h \
     media-factory.c \
     protocol.h \
diff --git a/src/media-factory.c b/src/media-factory.c
index 14e13b7..6f1d9ff 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -33,7 +33,7 @@
 #include <sofia-sip/sip_status.h>
 
 #define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
-#include "debug.h"
+#include "tpsip/debug.h"
 
 typedef enum {
   TPSIP_MEDIA_CHANNEL_CREATE_WITH_AUDIO = 1 << 0,
diff --git a/src/protocol.c b/src/protocol.c
index df9a890..f4aa767 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -30,7 +30,7 @@
 #include <sofia-sip/su_glib.h>
 
 #define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
-#include "debug.h"
+#include "tpsip/debug.h"
 #include "media-factory.h"
 #include "sip-connection.h"
 #include "sip-connection-helpers.h"
diff --git a/src/sip-connection-helpers.c b/src/sip-connection-helpers.c
index da192eb..0761492 100644
--- a/src/sip-connection-helpers.c
+++ b/src/sip-connection-helpers.c
@@ -42,7 +42,7 @@
 #include "sip-connection-private.h"
 
 #define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
-#include "debug.h"
+#include "tpsip/debug.h"
 
 /* Default keepalive timeout in seconds,
  * a value obtained from Sofia-SIP documentation */
diff --git a/src/sip-connection-manager.c b/src/sip-connection-manager.c
index ecb882e..cf8e954 100644
--- a/src/sip-connection-manager.c
+++ b/src/sip-connection-manager.c
@@ -43,7 +43,7 @@
 #include "sip-connection.h"
 
 #define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
-#include "debug.h"
+#include "tpsip/debug.h"
 
 
 G_DEFINE_TYPE(TpsipConnectionManager, tpsip_connection_manager,
diff --git a/src/sip-connection.c b/src/sip-connection.c
index 2751a44..866aba7 100644
--- a/src/sip-connection.c
+++ b/src/sip-connection.c
@@ -50,7 +50,7 @@
 #include <sofia-sip/msg_header.h>
 
 #define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
-#include "debug.h"
+#include "tpsip/debug.h"
 
 G_DEFINE_TYPE_WITH_CODE (TpsipConnection, tpsip_connection,
     TPSIP_TYPE_BASE_CONNECTION,
diff --git a/src/sip-media-channel.c b/src/sip-media-channel.c
index cf07564..66b3970 100644
--- a/src/sip-media-channel.c
+++ b/src/sip-media-channel.c
@@ -38,7 +38,7 @@
 #include <tpsip/event-target.h>
 
 #define DEBUG_FLAG TPSIP_DEBUG_MEDIA
-#include "debug.h"
+#include "tpsip/debug.h"
 
 #include <tpsip/base-connection.h>
 
diff --git a/src/sip-media-session.c b/src/sip-media-session.c
index 988a990..3808f53 100644
--- a/src/sip-media-session.c
+++ b/src/sip-media-session.c
@@ -46,7 +46,7 @@
 #include "signals-marshal.h"
 
 #define DEBUG_FLAG TPSIP_DEBUG_MEDIA
-#include "debug.h"
+#include "tpsip/debug.h"
 
 /* The timeout for outstanding re-INVITE transactions in seconds.
  * Chosen to match the allowed cancellation timeout for proxies
diff --git a/src/sip-media-stream.c b/src/sip-media-stream.c
index d3826bb..f87e502 100644
--- a/src/sip-media-stream.c
+++ b/src/sip-media-stream.c
@@ -48,7 +48,7 @@
 #include "signals-marshal.h"
 
 #define DEBUG_FLAG TPSIP_DEBUG_MEDIA
-#include "debug.h"
+#include "tpsip/debug.h"
 
 
 #define same_boolean(old, new) ((!(old)) == (!(new)))
diff --git a/src/sip-text-channel.c b/src/sip-text-channel.c
index 71be195..f55f597 100644
--- a/src/sip-text-channel.c
+++ b/src/sip-text-channel.c
@@ -45,7 +45,7 @@
 #include <sofia-sip/sip_status.h>
 
 #define DEBUG_FLAG TPSIP_DEBUG_IM
-#include "debug.h"
+#include "tpsip/debug.h"
 
 static gboolean
 tpsip_text_channel_nua_r_message_cb (TpsipTextChannel *self,
diff --git a/src/telepathy-sofiasip.c b/src/telepathy-sofiasip.c
index a19b752..dfdf5e8 100644
--- a/src/telepathy-sofiasip.c
+++ b/src/telepathy-sofiasip.c
@@ -24,8 +24,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <config.h>
-#include "debug.h"
+#include "config.h"
+
+#include "tpsip/debug.h"
 
 #include "sip-connection-manager.h"
 #include <telepathy-glib/run.h>
diff --git a/src/text-factory.c b/src/text-factory.c
index 4b8d0b3..04d0e68 100644
--- a/src/text-factory.c
+++ b/src/text-factory.c
@@ -35,7 +35,7 @@
 #include <sofia-sip/sip_status.h>
 
 #define DEBUG_FLAG TPSIP_DEBUG_IM
-#include "debug.h"
+#include "tpsip/debug.h"
 
 
 static void channel_manager_iface_init (gpointer g_iface, gpointer iface_data);
diff --git a/tpsip/Makefile.am b/tpsip/Makefile.am
index 2a9df4d..98ef29d 100644
--- a/tpsip/Makefile.am
+++ b/tpsip/Makefile.am
@@ -22,6 +22,7 @@ tpsip_include_HEADERS = \
 	codec-param-formats.h \
 	event-target.h \
 	handles.h \
+	debug.h \
 	util.h
 
 BUILT_SOURCES = \
@@ -35,6 +36,7 @@ libtpsip_la_SOURCES = \
 	codec-param-formats.c \
 	event-target.c \
 	handles.c \
+	debug.c \
 	util.c
 
 nodist_libtpsip_la_SOURCES = \
diff --git a/tpsip/base-connection-sofia.c b/tpsip/base-connection-sofia.c
index 4c04eae..6721c66 100644
--- a/tpsip/base-connection-sofia.c
+++ b/tpsip/base-connection-sofia.c
@@ -26,7 +26,7 @@
 #include <sofia-sip/su_tag_io.h>
 
 #define DEBUG_FLAG TPSIP_DEBUG_EVENTS
-#include "src/debug.h"
+#include "tpsip/debug.h"
 
 static void
 priv_r_shutdown(int status,
diff --git a/tpsip/connection-aliasing.c b/tpsip/connection-aliasing.c
index d8af0ef..84b876e 100644
--- a/tpsip/connection-aliasing.c
+++ b/tpsip/connection-aliasing.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 #define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
-#include "src/debug.h"
+#include "tpsip/debug.h"
 
 enum {
   PROP_NONE,
diff --git a/src/debug.c b/tpsip/debug.c
index dc20fa5..7b07226 100644
--- a/src/debug.c
+++ b/tpsip/debug.c
@@ -19,8 +19,6 @@
 
 #include "config.h"
 
-#ifdef ENABLE_DEBUG
-
 #include <stdarg.h>
 
 #include <glib.h>
@@ -28,7 +26,7 @@
 #include <telepathy-glib/debug.h>
 #include <telepathy-glib/debug-sender.h>
 
-#include "debug.h"
+#include "tpsip/debug.h"
 
 static TpsipDebugFlags tpsip_debug_flags = 0;
 
@@ -85,7 +83,7 @@ debug_flag_to_domain (TpsipDebugFlags flag)
           GDebugKey key = (GDebugKey) tpsip_debug_keys[i];
           gchar *val;
 
-          val = g_strdup_printf ("%s/%s", G_LOG_DOMAIN, key.key);
+          val = g_strdup_printf ("%s/%s", "tpsip", key.key);
           g_hash_table_insert (flag_to_domains,
               GUINT_TO_POINTER (key.value), val);
         }
@@ -141,5 +139,3 @@ void tpsip_log (TpsipDebugFlags flag,
 
   g_free (message);
 }
-
-#endif /* ENABLE_DEBUG */
diff --git a/src/debug.h b/tpsip/debug.h
index 6e91e47..06a0dd4 100644
--- a/src/debug.h
+++ b/tpsip/debug.h
@@ -20,10 +20,6 @@
 #ifndef __DEBUG_H__
 #define __DEBUG_H__
 
-#include "config.h"
-
-#ifdef ENABLE_DEBUG
-
 #include <glib.h>
 
 G_BEGIN_DECLS
@@ -60,11 +56,7 @@ G_END_DECLS
 
 /* #define DEBUGGING tpsip_debug_flag_is_set(DEBUG_FLAG) */
 
-#endif /* DEBUG_FLAG */
-
-#else /* ENABLE_DEBUG */
-
-#ifdef DEBUG_FLAG
+#else /* DEBUG_FLAG */
 
 #define DEBUG(format, ...)
 #define WARNING(format, ...)
@@ -72,8 +64,4 @@ G_END_DECLS
 
 #endif /* DEBUG_FLAG */
 
-#define tpsip_debug_free() G_STMT_START { } G_STMT_END
-
-#endif /* ENABLE_DEBUG */
-
 #endif /* __DEBUG_H__ */
diff --git a/tpsip/handles.c b/tpsip/handles.c
index 55eb7e2..ad1f328 100644
--- a/tpsip/handles.c
+++ b/tpsip/handles.c
@@ -26,7 +26,7 @@
 #include <sofia-sip/sip_header.h>
 
 #define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
-#include "src/debug.h"
+#include "tpsip/debug.h"
 
 static GQuark
 tpsip_handle_url_quark ()