Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use ProcessKiller and add a missing file

A similar construct was used locally but now it's available
from luna-sysmgr-common thus better to use it instead.

a mojodb file was missing that's needed for backups

Open-webOS-DCO-1.0-Signed-off-by: Jukka Honkela <jukka.honkela@palm.com>

Change-Id: I1dfb99a4e2bdedee9a1e02946ee5ad230041f01a
  • Loading branch information...
commit 4696916e3861b0d4d29910df053a79bf4048b402 1 parent dcb9a3b
@jukkahonkela-owo jukkahonkela-owo authored
View
11 Src/webbase/WebAppManager.cpp
@@ -56,6 +56,8 @@
#include "Time.h"
#include "SharedGlobalProperties.h"
+#include <ProcessKiller.h>
+
#include <algorithm>
#include "cjson/json.h"
#include "lunaservice.h"
@@ -244,13 +246,6 @@ WebAppManager::~WebAppManager()
delete m_Application;
}
-void WebAppManager::localeChanged()
-{
- // Don't shutdown for locale changes in minimal mode
- if (Settings::LunaSettings()->uiType != Settings::UI_MINIMAL)
- m_Application->exit(0);
-}
-
void WebAppManager::run()
{
threadStarting();
@@ -261,7 +256,7 @@ void WebAppManager::run()
markUniversalSearchReady();
LocalePreferences* lp = LocalePreferences::instance();
- QObject::connect(lp, SIGNAL(prefsLocaleChanged()), SLOT(localeChanged()));
+ QObject::connect(lp, SIGNAL(prefsLocaleChanged()), new ProcessKiller(), SLOT(localeChanged()));
#ifdef HAS_NYX
nyx_init();
View
5 Src/webbase/WebAppManager.h
@@ -60,13 +60,11 @@ class ApplicationDescription;
#define WEB_APP_MGR_IPC_NAME "WebAppManager"
-class WebAppManager : public QObject
- , public SyncTask
+class WebAppManager : public SyncTask
, public Trackable
, public PIpcClient
, public PIpcChannelListener
{
- Q_OBJECT
public:
static WebAppManager* instance();
@@ -209,7 +207,6 @@ class WebAppManager : public QObject
static bool displayManagerCallback(LSHandle* sh, LSMessage* message, void* ctx);
void slotMemoryStateChanged(MemoryWatcher::MemState state);
- Q_INVOKABLE void localeChanged();
static gboolean deletePagesCallback(gpointer arg);
void deletePages();
View
5 mojodb/com.palm.appDataBackup
@@ -0,0 +1,5 @@
+{
+ "id" : "com.palm.appDataBackup",
+ "preBackup" : "preBackup",
+ "postRestore" : "postRestore"
+}
Please sign in to comment.
Something went wrong with that request. Please try again.