OSDN Git Service

gobex: Fix not printing debug messages when GOBEX_DEBUG is set
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Mon, 6 Aug 2012 14:27:20 +0000 (17:27 +0300)
committerMarcel Holtmann <marcel@holtmann.org>
Tue, 4 Dec 2012 21:22:06 +0000 (22:22 +0100)
g_debug doesn't print anything if domain is not present in
G_MESSAGES_DEBUG.

gobex/gobex-debug.h
gobex/gobex.c

index 589104e..14faa10 100644 (file)
@@ -37,8 +37,8 @@ extern guint gobex_debug;
 
 #define g_obex_debug(level, format, ...) \
        if (gobex_debug & level) \
-               g_debug("%s:%s() " format, __FILE__, __FUNCTION__, \
-                                                       ## __VA_ARGS__)
+               g_log("gobex", G_LOG_LEVEL_DEBUG, "%s:%s() " format, __FILE__, \
+                                               __FUNCTION__, ## __VA_ARGS__)
 
 static inline void g_obex_dump(const char *prefix, const void *buf,
                                                                gsize len)
index b20542d..b6126b8 100644 (file)
@@ -1246,9 +1246,11 @@ GObex *g_obex_new(GIOChannel *io, GObexTransportType transport_type,
 
        if (gobex_debug == 0) {
                const char *env = g_getenv("GOBEX_DEBUG");
-               if (env)
+
+               if (env) {
                        gobex_debug = g_parse_debug_string(env, keys, 6);
-               else
+                       g_setenv("G_MESSAGES_DEBUG", "gobex", FALSE);
+               } else
                        gobex_debug = G_OBEX_DEBUG_NONE;
        }