yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[kcmkwindesktop] Adjust to changes in NETRootInfo

Browse source
This commit is contained in:
Martin Gräßlin 2013-11-18 13:50:18 +01:00
parent 2c9e21a983
commit 20d03d5754
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kcmkwin/kwindesktop/main.cpp
View file

@ -39,6 +39,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KShortcutsEditor> #include <KShortcutsEditor>
#include <QX11Info> #include <QX11Info>
#include <X11/Xlib.h>
#include <fixx11h.h>
#include <netwm.h> #include <netwm.h>
@ -104,7 +106,7 @@ void KWinDesktopConfig::init()
m_editor->addCollection(m_switchDesktopCollection, i18n("Desktop Switching")); m_editor->addCollection(m_switchDesktopCollection, i18n("Desktop Switching"));
// get number of desktops // get number of desktops
NETRootInfo info(QX11Info::display(), NET::NumberOfDesktops | NET::DesktopNames); NETRootInfo info(QX11Info::connection(), NET::NumberOfDesktops | NET::DesktopNames);
int n = info.numberOfDesktops(); int n = info.numberOfDesktops();
for (int i = 1; i <= n; ++i) { for (int i = 1; i <= n; ++i) {
@ -164,7 +166,7 @@ void KWinDesktopConfig::init()
connect(m_ui->effectConfigButton, SIGNAL(clicked()), SLOT(slotConfigureEffectClicked())); connect(m_ui->effectConfigButton, SIGNAL(clicked()), SLOT(slotConfigureEffectClicked()));
// Begin check for immutable - taken from old desktops kcm // Begin check for immutable - taken from old desktops kcm
int kwin_screen_number = DefaultScreen(QX11Info::display()); int kwin_screen_number = QX11Info::appScreen();
m_config = KSharedConfig::openConfig("kwinrc"); m_config = KSharedConfig::openConfig("kwinrc");
@ -240,7 +242,7 @@ void KWinDesktopConfig::load()
// get number of desktops // get number of desktops
unsigned long properties[] = {NET::NumberOfDesktops | NET::DesktopNames, NET::WM2DesktopLayout }; unsigned long properties[] = {NET::NumberOfDesktops | NET::DesktopNames, NET::WM2DesktopLayout };
NETRootInfo info(QX11Info::display(), properties, 2); NETRootInfo info(QX11Info::connection(), properties, 2);
for (int i = 1; i <= maxDesktops; i++) { for (int i = 1; i <= maxDesktops; i++) {
QString name = QString::fromUtf8(info.desktopName(i)); QString name = QString::fromUtf8(info.desktopName(i));
@ -287,7 +289,7 @@ void KWinDesktopConfig::save()
{ {
// TODO: plasma stuff // TODO: plasma stuff
unsigned long properties[] = {NET::NumberOfDesktops | NET::DesktopNames, NET::WM2DesktopLayout }; unsigned long properties[] = {NET::NumberOfDesktops | NET::DesktopNames, NET::WM2DesktopLayout };
NETRootInfo info(QX11Info::display(), properties, 2); NETRootInfo info(QX11Info::connection(), properties, 2);
// set desktop names // set desktop names
for (int i = 1; i <= maxDesktops; i++) { for (int i = 1; i <= maxDesktops; i++) {
QString desktopName = m_desktopNames[ i -1 ]; QString desktopName = m_desktopNames[ i -1 ];
@ -314,7 +316,7 @@ void KWinDesktopConfig::save()
// save the desktops // save the desktops
QString groupname; QString groupname;
const int screenNumber = DefaultScreen(QX11Info::display()); const int screenNumber = QX11Info::appScreen();
if (screenNumber == 0) if (screenNumber == 0)
groupname = "Desktops"; groupname = "Desktops";
else else