[telepathy-gabble/master] Split the GLogLevelFlags -> GabbleDebugLevel into another function.

[Jonny Lamb]

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

diff --git a/src/debugger.c b/src/debugger.c
index f48a889..e5f7234 100644
--- a/src/debugger.c
+++ b/src/debugger.c
@@ -42,44 +42,47 @@ enum
   NUM_PROPERTIES
 };
 
-static GabbleDebugMessage *
-debug_message_new (gdouble timestamp,
-		   const gchar *domain,
-		   GLogLevelFlags level,
-		   const gchar *string)
+static GabbleDebugLevel
+log_level_flags_to_debug_level (GLogLevelFlags level)
 {
-  GabbleDebugMessage *msg;
-  GabbleDebugLevel log_level;
-
   switch (level)
     {
     case G_LOG_LEVEL_ERROR:
-      log_level = GABBLE_DEBUG_LEVEL_ERROR;
+      return GABBLE_DEBUG_LEVEL_ERROR;
       break;
     case G_LOG_LEVEL_CRITICAL:
-      log_level = GABBLE_DEBUG_LEVEL_CRITICAL;
+      return GABBLE_DEBUG_LEVEL_CRITICAL;
       break;
     case G_LOG_LEVEL_WARNING:
-      log_level = GABBLE_DEBUG_LEVEL_WARNING;
+      return GABBLE_DEBUG_LEVEL_WARNING;
       break;
     case G_LOG_LEVEL_MESSAGE:
-      log_level = GABBLE_DEBUG_LEVEL_MESSAGE;
+      return GABBLE_DEBUG_LEVEL_MESSAGE;
       break;
     case G_LOG_LEVEL_INFO:
-      log_level = GABBLE_DEBUG_LEVEL_INFO;
+      return GABBLE_DEBUG_LEVEL_INFO;
       break;
     case G_LOG_LEVEL_DEBUG:
-      log_level = GABBLE_DEBUG_LEVEL_DEBUG;
+      return GABBLE_DEBUG_LEVEL_DEBUG;
       break;
     default:
       g_assert_not_reached ();
       break;
     }
+}
+
+static GabbleDebugMessage *
+debug_message_new (gdouble timestamp,
+		   const gchar *domain,
+		   GLogLevelFlags level,
+		   const gchar *string)
+{
+  GabbleDebugMessage *msg;
 
   msg = g_slice_new0 (GabbleDebugMessage);
   msg->timestamp = timestamp;
   msg->domain = g_strdup (domain);
-  msg->level = log_level;
+  msg->level = log_level_flags_to_debug_level (level);
   msg->string = g_strdup (string);
   return msg;
 }
-- 
1.5.6.5