Support --desktop_file_hint via $DESKTOP_FILE_HINT

Author: niemeyer

bridge.go

@@ -14,6 +14,7 @@ import "C"
 import (
 	"fmt"
 	"gopkg.in/qml.v0/tref"
+	"os"
 	"reflect"
 	"runtime"
 	"sync"
@@ -25,9 +26,18 @@ var hookWaiting C.int
 
 // guiLoop runs the main GUI thread event loop in C++ land.
 func guiLoop() {
+	// This is not an option in Init to avoid forcing people to patch
+	// and recompile an application just so it runs on Ubuntu Touch.
+	deskfile := os.Getenv("DESKTOP_FILE_HINT")
+	cdeskfile := (*C.char)(nil)
+	if deskfile != "" {
+		os.Setenv("DESKTOP_FILE_HINT", "")
+		cdeskfile = C.CString("--desktop_file_hint=" + deskfile)
+	}
+
 	runtime.LockOSThread()
 	guiLoopRef = tref.Ref()
-	C.newGuiApplication()
+	C.newGuiApplication(cdeskfile)
 	C.idleTimerInit(&hookWaiting)
 	guiLoopReady.Unlock()
 	C.applicationExec()

cpp/capi.cpp

@@ -43,11 +43,15 @@ void panicf(const char *format, ...)
     hookPanic(local_strdup(ba.constData()));
 }
 
-void newGuiApplication()
+void newGuiApplication(char *deskfile)
 {
     static char empty[1] = {0};
-    static char *argv[] = {empty};
+    static char *argv[] = {empty, empty, empty};
     static int argc = 1;
+    if (deskfile) {
+        argv[argc] = deskfile;
+        argc++;
+    }
     new QApplication(argc, argv);
 
     // The event should never die.

cpp/capi.h

@@ -105,7 +105,7 @@ typedef struct {
     int line;
 } LogMessage;
 
-void newGuiApplication();
+void newGuiApplication(char *deskfile);
 void applicationExec();
 void applicationFlushAll();