[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/Applications/16.12] src: Move DBus and force icon theme above KAboutData
From:       Jean-Baptiste Mardelle <null () kde ! org>
Date:       2016-12-17 9:42:52
Message-ID: E1cIBW0-00020D-Dv () code ! kde ! org
[Download RAW message or body]

Git commit 215457f670b78c5f6fdd9a2adb6173496b9bedf2 by Jean-Baptiste Mardelle.
Committed on 17/12/2016 at 09:42.
Pushed by mardelle into branch 'Applications/16.12'.

Move DBus and force icon theme above KAboutData
CCBUG: 373531

M  +12   -10   src/main.cpp

https://commits.kde.org/kdenlive/215457f670b78c5f6fdd9a2adb6173496b9bedf2

diff --git a/src/main.cpp b/src/main.cpp
index 74d3ddaf5..40c5e6bae 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -68,6 +68,14 @@ int main(int argc, char *argv[])
         }
     }
 
+    // Init DBus services
+    KDBusService programDBusService;
+
+    bool forceBreeze = grp.readEntry("force_breeze", QVariant(false)).toBool();
+    if (forceBreeze) {
+        QIcon::setThemeName("breeze");
+    }
+
     // Create KAboutData
     KAboutData aboutData(QByteArray("kdenlive"),
                          i18n("Kdenlive"), KDENLIVE_VERSION,
@@ -96,6 +104,10 @@ int main(int argc, char *argv[])
     // Register about data
     KAboutData::setApplicationData(aboutData);
 
+    // Add rcc stored icons to the search path so that we always find our icons
+    KIconLoader *loader = KIconLoader::global();
+    loader->reconfigure("kdenlive", QStringList() << QStringLiteral(":/pics"));
+
     // Set app stuff from about data
     app.setApplicationDisplayName(aboutData.displayName());
     app.setOrganizationDomain(aboutData.organizationDomain());
@@ -116,7 +128,6 @@ int main(int argc, char *argv[])
     // Parse command line
     parser.process(app);
     aboutData.processCommandLine(&parser);
-    KDBusService programDBusService;
 
 #if KXMLGUI_VERSION_MINOR > 14 || KXMLGUI_VERSION_MAJOR > 5
     KCrash::initialize();
@@ -124,15 +135,6 @@ int main(int argc, char *argv[])
     KCrash::setCrashHandler(KCrash::defaultCrashHandler);
 #endif
 
-    // Add rcc stored icons to the search path so that we always find our icons
-    KIconLoader *loader = KIconLoader::global();
-    loader->reconfigure("kdenlive", QStringList() << QStringLiteral(":/pics"));
-
-    bool forceBreeze = grp.readEntry("force_breeze", QVariant(false)).toBool();
-    if (forceBreeze) {
-        QIcon::setThemeName("breeze");
-    }
-
     // see if we are starting with session management
     if (qApp->isSessionRestored()){
 	  int n = 1;
[prev in list] [next in list] [prev in thread] [next in thread]