Fix up a busted preprocessor check [PATCH by Ray Lehtiniemi]

[kdenlive] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 4f8823771d3f536efb5c41f382a09639700a6b78..4f2ce1bc2d0ad565b9c3d83942b078da51585b0e 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,16 +26,22 @@
 
 #include "mainwindow.h"
 
+#if defined(__APPLE_KDE__) || defined(__DARWIN__)
+#include <SDL/SDL.h>
+#endif
+
 int main(int argc, char *argv[]) {
     KAboutData aboutData(QByteArray("kdenlive"), QByteArray("kdenlive"),
-                         ki18n("Kdenlive"), QByteArray("0.7"),
+                         ki18n("Kdenlive"), QByteArray("0.7.2"),
                          ki18n("An open source video editor."),
                          KAboutData::License_GPL,
                          ki18n("Copyright (c) 2008 Development team"));
-    aboutData.addAuthor(ki18n("Jean-Baptiste Mardelle"), ki18n("Mlt porting, KDE4 porting, Main developer"), "jb@kdenlive.org");
-    aboutData.addAuthor(ki18n("Marco Gittler"), ki18n("MltConnection, Transition, Effect, Timeline Developer"), "g.marco@freenet.de");
+    aboutData.addAuthor(ki18n("Jean-Baptiste Mardelle"), ki18n("MLT porting, KDE4 porting, Main developer"), "jb@kdenlive.org");
+    aboutData.addAuthor(ki18n("Marco Gittler"), ki18n("MLT Connection, Transition, Effect, Timeline Developer"), "g.marco@freenet.de");
     aboutData.setHomepage("http://kdenlive.org");
-    //aboutData.setBugAddress("http://kdenlive.org/mantis");
+    aboutData.setCustomAuthorText(ki18n("Please report bugs to http://kdenlive.org/mantis"), ki18n("Please report bugs to <a href=\"http://kdenlive.org/mantis\">http://kdenlive.org/mantis</a>"));
+    aboutData.setTranslator(ki18n("NAME OF TRANSLATORS"), ki18n("EMAIL OF TRANSLATORS"));
+
     KCmdLineArgs::init(argc, argv, &aboutData);
 
     KCmdLineOptions options;
@@ -62,11 +68,12 @@ int main(int argc, char *argv[]) {
         KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); //new
 
         QString mltPath = args->getOption("mlt-path");
-        MainWindow* window = new MainWindow(mltPath);
-        window->show();
-        if (args->count()) { //new
-            window->openFile(args->url(0)); //new
+        KUrl url;
+        if (args->count()) {
+            url = args->url(0);
         }
+        MainWindow* window = new MainWindow(mltPath, url);
+        window->show();
 
         args->clear();
     }