Branch: master

84584fc0 2014-10-12 17:49:37 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M src/wlassistant.cpp
diff --git a/src/wlassistant.cpp b/src/wlassistant.cpp
index 36e2964..7913d67 100644
--- a/src/wlassistant.cpp
+++ b/src/wlassistant.cpp
@@ -955,7 +955,7 @@
                 if (i==27) { // ca 2sec have passed and the process is still running. Replace the 'Close' button with 'Stop'.
                         disconnect(buttonClose, TQT_SIGNAL(clicked()),
                                    this, TQT_SLOT(close()) );
-                        buttonClose->setIconSet( SmallIconSet("stop") );
+                        buttonClose->setIconSet( SmallIconSet("process-stop") );
                         buttonClose->setText( i18n("&Stop") );
                         TQToolTip::remove
                                 (buttonClose);
d058ad26 2014-10-12 17:55:31 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/wlassistant
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c