summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-06-25 13:06:53 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-06-25 13:06:53 +0800
commit93d8c3835435f920615219c5481937312bc4dad8 (patch)
tree796b63ff88925f8f19400321cf6aefc1e9e3c410 /src
parentee11a63700fb426c53bf2cc40dbccece797d93d4 (diff)
downloadmobilebling-93d8c3835435f920615219c5481937312bc4dad8.tar.gz
mobilebling-93d8c3835435f920615219c5481937312bc4dad8.tar.bz2
Added PluginClassHandler test
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/screen.cpp55
2 files changed, 1 insertions, 55 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 093599a..775ff85 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -53,6 +53,7 @@ add_executable (compiz
propertywriter.cpp
eventsource.cpp
valueholder.cpp
+ logmessage.cpp
${_bcop_sources}
)
diff --git a/src/screen.cpp b/src/screen.cpp
index 183fee0..c1677e0 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -1135,40 +1135,6 @@ CompScreen::imageToFile (CompString &path,
return false;
}
-const char *
-logLevelToString (CompLogLevel level)
-{
- switch (level) {
- case CompLogLevelFatal:
- return "Fatal";
- case CompLogLevelError:
- return "Error";
- case CompLogLevelWarn:
- return "Warn";
- case CompLogLevelInfo:
- return "Info";
- case CompLogLevelDebug:
- return "Debug";
- default:
- break;
- }
-
- return "Unknown";
-}
-
-static void
-logMessage (const char *componentName,
- CompLogLevel level,
- const char *message)
-{
- if (!debugOutput && level >= CompLogLevelDebug)
- return;
-
- fprintf (stderr, "%s (%s) - %s: %s\n",
- programName, componentName,
- logLevelToString (level), message);
-}
-
void
CompScreen::logMessage (const char *componentName,
CompLogLevel level,
@@ -1178,27 +1144,6 @@ CompScreen::logMessage (const char *componentName,
::logMessage (componentName, level, message);
}
-void
-compLogMessage (const char *componentName,
- CompLogLevel level,
- const char *format,
- ...)
-{
- va_list args;
- char message[2048];
-
- va_start (args, format);
-
- vsnprintf (message, 2048, format, args);
-
- if (screen)
- screen->logMessage (componentName, level, message);
- else
- logMessage (componentName, level, message);
-
- va_end (args);
-}
-
int
PrivateScreen::getWmState (Window id)
{