Branch: master

25f54e1b 2014-10-12 17:49:30 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M src/configuredialog.cpp
diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp
index 5bc1557..3eed13b 100644
--- a/src/configuredialog.cpp
+++ b/src/configuredialog.cpp
@@ -266,7 +266,7 @@
 	tB_general->setItemIconSet( 0, SmallIcon( "scheme_powersave", TQIconSet::Automatic));
 	tB_general->setItemIconSet( 1, SmallIcon( "button", TQIconSet::Automatic));
 	tB_general->setItemIconSet( 2, SmallIcon( "scheme_power", TQIconSet::Automatic));
-	tB_general->setItemIconSet( 3, SmallIcon( "lock", TQIconSet::Automatic));
+	tB_general->setItemIconSet( 3, SmallIcon( "system-lock-screen", TQIconSet::Automatic));
 	tB_general->setItemIconSet( 4, SmallIcon( "misc", TQIconSet::Automatic));
 	pB_configNotify->setIconSet(SmallIconSet("knotify", TQIconSet::Automatic));
 
2cc3e870 2014-10-12 17:55:15 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdepowersave
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c