Branch: master

5a97cc4a 2014-10-13 20:10:04 Timothy Pearson
Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance
M kmag/kmag.cpp
M ksayit/src/ksayitsystemtray.cpp
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index 0c0e483..5195678 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -126,7 +126,7 @@
 
 void KmagApp::initActions()
 {
-  fileNewWindow = new TDEAction(i18n("New &Window"), "window_new", TDEStdAccel::openNew(), TQT_TQOBJECT(this),
+  fileNewWindow = new TDEAction(i18n("New &Window"), "window-new", TDEStdAccel::openNew(), TQT_TQOBJECT(this),
                               TQT_SLOT(slotFileNewWindow()), actionCollection(),"new_window");
   fileNewWindow->setToolTip(i18n("Open a new KMagnifier window"));
 
diff --git a/ksayit/src/ksayitsystemtray.cpp b/ksayit/src/ksayitsystemtray.cpp
index 4a8ac59..43452ca 100644
--- a/ksayit/src/ksayitsystemtray.cpp
+++ b/ksayit/src/ksayitsystemtray.cpp
@@ -52,21 +52,21 @@
 
   // User defined actions
   say = new TDEAction(i18n("Say"),
-              "player_play",
+              "media-playback-start",
               0,
               TQT_TQOBJECT(this), TQT_SLOT (slotSayActivated()),
               actionCollection(),
               "say_it");
   
   shutup = new TDEAction(i18n("Shut Up"),
-              "player_stop",
+              "media-playback-stop",
               0,
               TQT_TQOBJECT(this), TQT_SLOT (slotStopActivated()),
               actionCollection(),
               "shut_up");
   
   pause = new TDEAction (i18n("Pause"),
-              "player_pause",
+              "media-playback-pause",
               0,
               TQT_TQOBJECT(this), TQT_SLOT (slotPauseActivated()),
               actionCollection(),
50a2443b 2014-10-13 20:11:37 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeaccessibility
M cmake
diff --git a/cmake b/cmake
index 08c6f54..47d7755 160000
--- a/cmake
+++ b/cmake
-Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
+Subproject commit 47d775518c382c77f663a70bb23fad93e6810090