[kde-workspace] Import complete patch for BZ#921781

[Daniel Vrátil]

commit 8f248b7bf9a53f1b5bdd838ef80ce91ea91459c3
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Jun 11 18:02:10 2013 +0200

    Import complete patch for BZ#921781

 ...ce-4.11-bz#921781-check-max-viewport-size.patch |   57 +++++++++++++++++++-
 1 files changed, 55 insertions(+), 2 deletions(-)
---
diff --git a/kde-workspace-4.11-bz#921781-check-max-viewport-size.patch b/kde-workspace-4.11-bz#921781-check-max-viewport-size.patch
index c4baf57..13ae868 100644
--- a/kde-workspace-4.11-bz#921781-check-max-viewport-size.patch
+++ b/kde-workspace-4.11-bz#921781-check-max-viewport-size.patch
@@ -1,3 +1,56 @@
+diff --git a/kwin/kcmkwin/kwincompositing/dbus.h b/kwin/kcmkwin/kwincompositing/dbus.h
+new file mode 100644
+index 0000000..05f5d23
+--- /dev/null
++++ b/kwin/kcmkwin/kwincompositing/dbus.h
+@@ -0,0 +1,46 @@
++/********************************************************************
++ KWin - the KDE window manager
++ This file is part of the KDE project.
++
++Copyright (C) 2012 Thomas Lübking <thomas.luebking at gmail.com>
++
++This program is free software; you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation; either version 2 of the License, or
++(at your option) any later version.
++
++This program is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++GNU General Public License for more details.
++
++You should have received a copy of the GNU General Public License
++along with this program.  If not, see <http://www.gnu.org/licenses/>.
++*********************************************************************/
++
++#ifndef MAIN_ADAPTOR_H
++#define MAIN_ADAPTOR_H
++
++#include <QtDBus/QDBusAbstractAdaptor>
++#include "main.h"
++
++namespace KWin
++{
++class MainAdaptor : public QDBusAbstractAdaptor
++{
++   Q_OBJECT
++   Q_CLASSINFO("D-Bus Interface", "org.kde.kwinCompositingDialog")
++
++private:
++    KWinCompositingConfig *m_config;
++
++public:
++    MainAdaptor(KWinCompositingConfig *config) : QDBusAbstractAdaptor(config), m_config(config) { }
++
++public slots:
++    Q_NOREPLY void warn(QString message, QString details, QString dontAgainKey) {
++        m_config->warn(message, details, dontAgainKey);
++    }
++};
++}
++#endif
+\ No newline at end of file
 diff --git a/kwin/kcmkwin/kwincompositing/main.cpp b/kwin/kcmkwin/kwincompositing/main.cpp
 index 6e39479..e802b46 100644
 --- a/kwin/kcmkwin/kwincompositing/main.cpp
@@ -170,7 +223,7 @@ index 35079c3..d806531 100644
  
  } // namespace
 diff --git a/kwin/scene_opengl.cpp b/kwin/scene_opengl.cpp
-index 6cf62c6..085cc55 100644
+index 6cf62c6..7df85ce 100644
 --- a/kwin/scene_opengl.cpp
 +++ b/kwin/scene_opengl.cpp
 @@ -97,11 +97,18 @@ Sources and other compositing managers:
@@ -210,7 +263,7 @@ index 6cf62c6..085cc55 100644
 +    glGetIntegerv(GL_MAX_VIEWPORT_DIMS, limit);
 +    if (limit[0] < size.width() || limit[1] < size.height()) {
 +        QMetaObject::invokeMethod(Compositor::self(), "suspend",
-+                                  Qt::QueuedConnection, Q_ARG(Compositor::SuspendReason, Compositor::AllReasonSuspend));
++                                  Qt::QueuedConnection);
 +        const QString message = i18n("<h1>OpenGL desktop effects not possible</h1>"
 +                                     "Your system cannot perform OpenGL Desktop Effects at the "
 +                                     "current resolution<br><br>"