Branch: master

304fceb0 2014-10-12 17:49:04 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M ksystemlog/src/globals.h
diff --git a/ksystemlog/src/globals.h b/ksystemlog/src/globals.h
index 7658ab4..af8afe3 100644
--- a/ksystemlog/src/globals.h
+++ b/ksystemlog/src/globals.h
@@ -44,7 +44,7 @@
 
 
 // String was "none"
-#define NONE_LOG_LEVEL_ICON "help" 
+#define NONE_LOG_LEVEL_ICON "help"
 
 #define DEBUG_LOG_LEVEL_ICON "attach"
 #define INFORMATION_LOG_LEVEL_ICON "messagebox_info"
@@ -53,7 +53,7 @@
 #define ERROR_LOG_LEVEL_ICON "messagebox_critical"
 #define CRITICAL_LOG_LEVEL_ICON "core"
 #define ALERT_LOG_LEVEL_ICON "kalarm"
-#define EMERGENCY_LOG_LEVEL_ICON "exit"
+#define EMERGENCY_LOG_LEVEL_ICON "system-log-out"
 
 enum logLevelIds {
 	NONE_LOG_LEVEL_ID=0,
2d741d51 2014-10-12 17:54:33 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/ksystemlog
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c