Allow shutdown after rendering in Gnome session too

svn path=/trunk/kdenlive/; revision=4312

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 65071ac9e16494d057b4026d17907799bb1cb3f9..81b59ac8b115a5809673df188ed1d6ea60fcc7d0 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -943,7 +943,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
                     selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false);
                 } else if (selection.at(i)->parentItem() && !selection.contains(selection.at(i)->parentItem())) {
                     if (static_cast<AbstractGroupItem *>(selection.at(i)->parentItem())->isItemLocked()) continue;
-                    AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(selection.at(i)->parentItem());
+                    //AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(selection.at(i)->parentItem());
                     m_selectionGroup->addToGroup(selection.at(i)->parentItem());
                     selection.at(i)->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false);
                 }

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 82843be02ad1acf5f3f999dc04acc6eef99585da..1c9f4984ad3abc381d82e229b923824c8fe12a98 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3191,6 +3191,9 @@ void MainWindow::slotShutdown()
     if (interface && interface->isServiceRegistered("org.kde.ksmserver")) {
         QDBusInterface smserver("org.kde.ksmserver", "/KSMServer", "org.kde.KSMServerInterface");
         smserver.call("logout", 1, 2, 2);
+    } else if (interface && interface->isServiceRegistered("org.gnome.SessionManager")) {
+        QDBusInterface smserver("org.gnome.SessionManager", "/org/gnome/SessionManager", "org.gnome.SessionManager");
+        smserver.call("Shutdown");
     }
 }
 

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index a778a22145785bee235f8dedf45b98bee2cc9325..2fd3b71405ca07dd06be34f2e696d55e87beaa4d 100644 (file)
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -195,7 +195,7 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) :
     }
 
     QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface();
-    if (!interface || !interface->isServiceRegistered("org.kde.ksmserver")) {
+    if (!interface || (!interface->isServiceRegistered("org.kde.ksmserver") && !interface->isServiceRegistered("org.gnome.SessionManager"))) {
         m_view.shutdown->setEnabled(false);
     }