Branch: master

82f3c511 2014-10-12 17:47:54 Timothy Pearson 
Bring stop, lock, exit, and run icons into XDG compliance
M kaffeine/src/input/dvb/krecord.cpp
 
diff --git a/kaffeine/src/input/dvb/krecord.cpp b/kaffeine/src/input/dvb/krecord.cpp
index 587f701..ca9fa92 100644
--- a/kaffeine/src/input/dvb/krecord.cpp
+++ b/kaffeine/src/input/dvb/krecord.cpp
@@ -90,7 +90,7 @@
 	editBtn->setGuiItem( KGuiItem(i18n("Edit"), icon->loadIconSet("edit", TDEIcon::Small) ) );
 	//editBtn->setEnabled( false );
 	deleteBtn->setGuiItem( KGuiItem(i18n("Stop/Delete"), icon->loadIconSet("editcut", TDEIcon::Small) ) );
-	okBtn->setGuiItem( KGuiItem(i18n("Close"), icon->loadIconSet("exit", TDEIcon::Small) ) );
+	okBtn->setGuiItem( KGuiItem(i18n("Close"), icon->loadIconSet("system-log-out", TDEIcon::Small) ) );
 
 	isRecording = icon->loadIcon("player_record", TDEIcon::Small);
 	yesRepeat = icon->loadIcon("reload", TDEIcon::Small);
b76a139c 2014-10-12 17:52:57 Timothy Pearson 
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kaffeine
M cmake
 
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c