[telepathy-gabble/master] Convert GLogLevelFlags to GabbleDebugLevel checking the flag.

Jonny Lamb jonny.lamb at collabora.co.uk
Tue Jun 16 11:49:27 PDT 2009


If the GLib log message level is G_LOG_LEVEL_ERROR, then it is also
G_LOG_LEVEL_FATAL, therefore simply checking whether the level is one
of the two fails.

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 src/debugger.c |   38 ++++++++++++++------------------------
 1 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/debugger.c b/src/debugger.c
index 5e412d9..ffc358a 100644
--- a/src/debugger.c
+++ b/src/debugger.c
@@ -45,30 +45,20 @@ enum
 static GabbleDebugLevel
 log_level_flags_to_debug_level (GLogLevelFlags level)
 {
-  switch (level)
-    {
-    case G_LOG_LEVEL_ERROR:
-      return GABBLE_DEBUG_LEVEL_ERROR;
-      break;
-    case G_LOG_LEVEL_CRITICAL:
-      return GABBLE_DEBUG_LEVEL_CRITICAL;
-      break;
-    case G_LOG_LEVEL_WARNING:
-      return GABBLE_DEBUG_LEVEL_WARNING;
-      break;
-    case G_LOG_LEVEL_MESSAGE:
-      return GABBLE_DEBUG_LEVEL_MESSAGE;
-      break;
-    case G_LOG_LEVEL_INFO:
-      return GABBLE_DEBUG_LEVEL_INFO;
-      break;
-    case G_LOG_LEVEL_DEBUG:
-      return GABBLE_DEBUG_LEVEL_DEBUG;
-      break;
-    default:
-      g_assert_not_reached ();
-      break;
-    }
+  if (level & G_LOG_LEVEL_ERROR)
+    return GABBLE_DEBUG_LEVEL_ERROR;
+  else if (level & G_LOG_LEVEL_CRITICAL)
+    return GABBLE_DEBUG_LEVEL_CRITICAL;
+  else if (level & G_LOG_LEVEL_WARNING)
+    return GABBLE_DEBUG_LEVEL_WARNING;
+  else if (level & G_LOG_LEVEL_MESSAGE)
+    return GABBLE_DEBUG_LEVEL_MESSAGE;
+  else if (level & G_LOG_LEVEL_INFO)
+    return GABBLE_DEBUG_LEVEL_INFO;
+  else if (level & G_LOG_LEVEL_DEBUG)
+    return GABBLE_DEBUG_LEVEL_DEBUG;
+  else
+    g_assert_not_reached ();
 }
 
 static GabbleDebugMessage *
-- 
1.5.6.5




More information about the telepathy-commits mailing list