Bring stop, lock, exit, and run icons into XDG compliance

diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
index 2b490c9..2ba6493 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -161,7 +161,7 @@
 
   if (_share->getBoolValue("browseable"))
   {
-    p.drawPixmap(x,0,SmallIcon("run"));
+    p.drawPixmap(x,0,SmallIcon("system-run"));
     x = x+w+margin;
   }
 
@@ -305,7 +305,7 @@
       icon = SmallIcon("folder");
     else
     if (label == i18n("Locking"))
-      icon = SmallIcon("lock");
+      icon = SmallIcon("system-lock-screen");
     else
     if (label == i18n("Printing"))
       icon = SmallIcon("fileprint");
diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
index 5653601..161d704 100644
--- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
@@ -298,7 +298,7 @@
 			 icon = SmallIcon("fileprint");
 		else
 		if (label.lower() == "locking")
-			 icon = SmallIcon("lock");
+			 icon = SmallIcon("system-lock-screen");
 		else
 		if (label.lower() == "logon")
 			 icon = SmallIcon("tdmconfig");
diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index 72b2298..3ab47b0 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -315,7 +315,7 @@
   actPrint->setEnabled(false);
   actStartQuery = new TDEAction(i18n("St&art Query"),"reload", 0 , TQT_TQOBJECT(this),
                   TQT_SLOT(doDefine()), actionCollection(), "start_query");
-  actStopQuery = new TDEAction(i18n("St&op Query"),"stop", 0 , TQT_TQOBJECT(this),
+  actStopQuery = new TDEAction(i18n("St&op Query"),"process-stop", 0 , TQT_TQOBJECT(this),
                  TQT_SLOT(stopClients()), actionCollection(), "stop_query");
   actStopQuery->setEnabled(false);
   KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection());
diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp
index 7695de8..b23af9b 100644
--- a/kpf/src/ActiveMonitorWindow.cpp
+++ b/kpf/src/ActiveMonitorWindow.cpp
@@ -49,7 +49,7 @@
       new TDEAction
       (
         i18n("&Cancel Selected Transfers"),
-        "stop",
+        "process-stop",
         0,
         TQT_TQOBJECT(monitor_),
         TQT_SLOT(slotKillSelected()),
diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp
index b282f64..8633d46 100644
--- a/kppp/logview/main.cpp
+++ b/kppp/logview/main.cpp
@@ -69,7 +69,7 @@
     // create menu
     mb = new KMenuBar(this);
     TQPopupMenu *fm = new TQPopupMenu;
-    fm->insertItem(SmallIcon("exit"),KStdGuiItem::quit().text(), F_EXIT);
+    fm->insertItem(SmallIcon("system-log-out"),KStdGuiItem::quit().text(), F_EXIT);
     mb->insertItem(i18n("&File"), fm);
 
     mb->setAccel(CTRL + Key_Q, F_EXIT);
diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp
index 94d484c..2f27f98 100644
--- a/kppp/miniterm.cpp
+++ b/kppp/miniterm.cpp
@@ -102,7 +102,7 @@
 void MiniTerm::setupToolbar() {
   toolbar = new TDEToolBar( this );
 
-  toolbar->insertButton("exit", 0,
+  toolbar->insertButton("system-log-out", 0,
 		      TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
 		      TQT_SLOT(cancelbutton()), TRUE, i18n("Close MiniTerm"));
 

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdenetwork

diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c