From 754d9f9589e9bd5bb9de401ee8995d095180ac89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Mon, 30 Apr 2007 12:50:10 +0000
Subject: [PATCH] Merging from old trunk: r655709 | binner | 2007-04-19
 07:39:44 +0200 (Thu, 19 Apr 2007) | 2 lines

SVN_SILENT i18n style guide fixes


svn path=/trunk/KDE/kdebase/workspace/; revision=659588
---
 useractions.cpp | 6 ++----
 workspace.cpp   | 1 -
 workspace.h     | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/useractions.cpp b/useractions.cpp
index a16ebb0698..eed0e1f3e3 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -109,8 +109,6 @@ QMenu* Workspace::clientPopup()
         action = popup->addMenu( advanced_popup );
         action->setText( i18n("Ad&vanced") );
 
-        desk_popup_index = popup->actions().count();
-
         if (options->useTranslucency){
             trans_popup = new QMenu( popup );
             trans_popup->setFont(KGlobalSettings::menuFont());
@@ -249,9 +247,9 @@ void Workspace::initDesktopPopup()
     connect( desk_popup, SIGNAL( aboutToShow() ),
              this, SLOT( desktopPopupAboutToShow() ) );
 
-    QAction *action = popup->addMenu( desk_popup );
+    QAction *action = desk_popup->menuAction();
+    popup->insertAction(mMoveOpAction, action);
     action->setText( i18n("To &Desktop") );
-    action->setData( desk_popup_index );
     }
 
 /*!
diff --git a/workspace.cpp b/workspace.cpp
index 648aac7ea8..111a0ce543 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -101,7 +101,6 @@ Workspace::Workspace( bool restore )
     advanced_popup    (0),
     trans_popup       (0),
     desk_popup        (0),
-    desk_popup_index  (0),
     keys              (0),
     client_keys       ( NULL ),
 //    client_keys_dialog ( NULL ),
diff --git a/workspace.h b/workspace.h
index 971c0cf5c8..139dd92e70 100644
--- a/workspace.h
+++ b/workspace.h
@@ -623,7 +623,6 @@ class Workspace : public QObject, public KDecorationDefines
         QMenu *advanced_popup;
         QMenu *trans_popup;
         QMenu *desk_popup;
-        int desk_popup_index;
 
         void modalActionsSwitch( bool enabled );