Branch: master

e351efa2 2014-10-12 17:49:20 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M smb4k/browser/smb4knetworkbrowser_part.cpp
diff --git a/smb4k/browser/smb4knetworkbrowser_part.cpp b/smb4k/browser/smb4knetworkbrowser_part.cpp
index 6d59ecf..fe55a29 100644
--- a/smb4k/browser/smb4knetworkbrowser_part.cpp
+++ b/smb4k/browser/smb4knetworkbrowser_part.cpp
@@ -141,7 +141,7 @@
   TDEAction *rescan =        new TDEAction( i18n( "Scan Netwo&rk" ), "reload", TDEShortcut( CTRL+Key_R ),
                                         this, TQT_SLOT( slotRescan() ),
                                         actionCollection(), "rescan_action" );
-  TDEAction *abort =         new TDEAction( i18n( "&Abort" ) , "stop", TDEShortcut( CTRL+Key_A ),
+  TDEAction *abort =         new TDEAction( i18n( "&Abort" ) , "process-stop", TDEShortcut( CTRL+Key_A ),
                                         this, TQT_SLOT( slotAbort() ),
                                         actionCollection(), "abort_action" );
   TDEActionSeparator *sep1 = new TDEActionSeparator( actionCollection(),
c075c60b 2014-10-12 17:54:56 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/smb4k
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c