Branch: master

bc58b7a8 2014-10-12 17:50:05 Timothy Pearson 
Bring stop, lock, exit, and run icons into XDG compliance
M libkipi/libkipi/batchprogressdialog.cpp
 
diff --git a/libkipi/libkipi/batchprogressdialog.cpp b/libkipi/libkipi/batchprogressdialog.cpp
index 5244a71..e4567d9 100644
--- a/libkipi/libkipi/batchprogressdialog.cpp
+++ b/libkipi/libkipi/batchprogressdialog.cpp
@@ -80,7 +80,7 @@
    switch( m_messagetype )
      {
      case KIPI::StartingMessage:
-        setPixmap( 0, SmallIcon( "run" ) );
+        setPixmap( 0, SmallIcon( "system-run" ) );
         break;
      case KIPI::SuccessMessage:
         setPixmap( 0, SmallIcon( "ok" ) );
@@ -89,7 +89,7 @@
         setPixmap( 0, SmallIcon( "flag" ) );
         break;
      case KIPI::ErrorMessage:
-        setPixmap( 0, SmallIcon( "stop" ) );
+        setPixmap( 0, SmallIcon( "process-stop" ) );
         break;
      case KIPI::ProgressMessage:
         setPixmap( 0, SmallIcon( "info" ) );
e33048b9 2014-10-12 17:56:02 Timothy Pearson 
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/libkipi
M cmake
 
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c