[Galago-commits] r2573 - in trunk/galago-daemon: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-02-09 00:29:22 -0800 (Thu, 09 Feb 2006)
New Revision: 2573

Modified:
   trunk/galago-daemon/AUTHORS
   trunk/galago-daemon/ChangeLog
   trunk/galago-daemon/src/logging.c
Log:
Patch by Jorn Baayen to fix get_log_level_name() so that it treats the log level flags as a bitmask, as it should be. It was previously going and using a switch statement. This closes patch #17.


Modified: trunk/galago-daemon/AUTHORS
===================================================================
--- trunk/galago-daemon/AUTHORS	2006-02-09 08:08:40 UTC (rev 2572)
+++ trunk/galago-daemon/AUTHORS	2006-02-09 08:29:22 UTC (rev 2573)
@@ -1 +1,8 @@
-Christian Hammond <chipx86 at gnupdate.org>
+Developers:
+
+	Christian Hammond <chipx86 at gnupdate.org>
+
+
+Patch Writers:
+
+	Jorn Baayen - <jorn at openedhand.com>

Modified: trunk/galago-daemon/ChangeLog
===================================================================
--- trunk/galago-daemon/ChangeLog	2006-02-09 08:08:40 UTC (rev 2572)
+++ trunk/galago-daemon/ChangeLog	2006-02-09 08:29:22 UTC (rev 2573)
@@ -1,3 +1,11 @@
+Thu Feb 09 00:28:25 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/logging.c:
+	* AUTHORS:
+	  - Patch by Jorn Baayen to fix get_log_level_name() so that it treats
+	    the log level flags as a bitmask, as it should be. It was previously
+	    going and using a switch statement. This closes patch #17.
+
 Tue Feb 07 00:50:39 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/presence.c:

Modified: trunk/galago-daemon/src/logging.c
===================================================================
--- trunk/galago-daemon/src/logging.c	2006-02-09 08:08:40 UTC (rev 2572)
+++ trunk/galago-daemon/src/logging.c	2006-02-09 08:29:22 UTC (rev 2573)
@@ -32,17 +32,20 @@
 static const gchar *
 get_log_level_name(GLogLevelFlags log_level)
 {
-	switch (log_level)
-	{
-		case G_LOG_LEVEL_ERROR:    return "ERROR";
-		case G_LOG_LEVEL_CRITICAL: return "CRITICAL";
-		case G_LOG_LEVEL_WARNING:  return "WARNING";
-		case G_LOG_LEVEL_MESSAGE:  return "INFO";
-		case G_LOG_LEVEL_INFO:     return "INFO";
-		case G_LOG_LEVEL_DEBUG:    return "DEBUG";
-		default:
-			g_return_val_if_reached("UNKNOWN");
-	}
+	if (log_level & G_LOG_LEVEL_ERROR)
+		return "ERROR";
+	else if (log_level & G_LOG_LEVEL_CRITICAL)
+		return "CRITICAL";
+	else if (log_level & G_LOG_LEVEL_WARNING)
+		return "WARNING";
+	else if (log_level & G_LOG_LEVEL_MESSAGE)
+		return "MESSAGE";
+	else if (log_level & G_LOG_LEVEL_INFO)
+		return "INFO";
+	else if (log_level & G_LOG_LEVEL_DEBUG)
+		return "DEBUG";
+	else
+		return "UNKNOWN";
 }
 
 static void