Bug 597879 - Initialize basic osso_context for Maemo5 Qt port. r=dougt a=npodb

toolkit/xre/nsNativeAppSupportQt.cpp

@@ -38,16 +38,25 @@
 
 #include <stdlib.h>
 #include "nsNativeAppSupportBase.h"
+#include "nsString.h"
 
 #ifdef MOZ_ENABLE_LIBCONIC
 #include <glib-object.h>
 #endif
 
+#if (MOZ_PLATFORM_MAEMO == 5)
+#include <libosso.h>
+#endif
+
 class nsNativeAppSupportQt : public nsNativeAppSupportBase
 {
 public:
   NS_IMETHOD Start(PRBool* aRetVal);
   NS_IMETHOD Stop(PRBool* aResult);
+#if (MOZ_PLATFORM_MAEMO == 5)
+  // Osso context must be initialized for maemo5 otherwise we will be killed in ~20 seconds
+  osso_context_t *m_osso_context;
+#endif
 };
 
 NS_IMETHODIMP
@@ -60,6 +69,35 @@ nsNativeAppSupportQt::Start(PRBool* aRetVal)
   g_type_init();
 #endif
 
+#ifdef MOZ_PLATFORM_MAEMO
+  /* Initialize maemo application
+
+     The initalization name will be of the form "Vendor.Name".
+     If a Vendor isn't given, then we will just use "Name".
+
+     Note that this value must match your X-Osso-Service name
+     defined in your desktop file.  If it doesn't, the OSSO
+     system will happily kill your process.
+  */
+  nsCAutoString applicationName;
+  if (gAppData->vendor) {
+      applicationName.Append(gAppData->vendor);
+      applicationName.Append(".");
+  }
+  applicationName.Append(gAppData->name);
+  ToLowerCase(applicationName);
+
+  m_osso_context = osso_initialize(applicationName.get(),
+                                   gAppData->version ? gAppData->version : "1.0",
+                                   PR_TRUE,
+                                   nsnull);
+
+  /* Check that initilialization was ok */
+  if (m_osso_context == nsnull) {
+      return NS_ERROR_FAILURE;
+  }
+#endif
+
   return NS_OK;
 }