warn about system upgrade, minor fixes, code cleanup

[fapman] / main.cpp

diff --git a/main.cpp b/main.cpp
index e81f3ab..424313d 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -56,7 +56,6 @@ int main(int argc, char *argv[])
     w.show();
 #endif
 
-#ifdef Q_WS_MAEMO_5
        uid_t userUID = getuid();
        if( userUID != 0 ) {
                ConfirmDialog d(false, &w);
@@ -87,6 +86,7 @@ int main(int argc, char *argv[])
                d.exec();
        }
 
+#ifdef Q_WS_MAEMO_5
        // *** from patch by qwerty12 ***
        if (!QDBusConnection::sessionBus().isConnected()) {
                qWarning("Cannot connect to the D-Bus session bus.");
@@ -100,7 +100,6 @@ int main(int argc, char *argv[])
                qWarning("%s", qPrintable(QDBusConnection::sessionBus().lastError().message()));
        }
        // ***
-
 #endif
 
     return a.exec();