From 756b3f168569e1e9f71f2c4b8667bc9fb54ff37c Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Mon, 11 Jul 2011 22:44:05 +0200 Subject: [PATCH] crash-- move after first call to applet() --- scriptengines/javascript/plasmoid/declarativeappletscript.cpp | 2 +- scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scriptengines/javascript/plasmoid/declarativeappletscript.cpp b/scriptengines/javascript/plasmoid/declarativeappletscript.cpp index 5bd0b9858..6f5cc956d 100644 --- a/scriptengines/javascript/plasmoid/declarativeappletscript.cpp +++ b/scriptengines/javascript/plasmoid/declarativeappletscript.cpp @@ -70,7 +70,6 @@ DeclarativeAppletScript::DeclarativeAppletScript(QObject *parent, const QVariant m_env(0), m_auth(this) { - KGlobal::locale()->insertCatalog(description().pluginName()); Q_UNUSED(args); } @@ -82,6 +81,7 @@ bool DeclarativeAppletScript::init() { m_declarativeWidget = new Plasma::DeclarativeWidget(applet()); m_declarativeWidget->setInitializationDelayed(true); + KGlobal::locale()->insertCatalog(description().pluginName()); //make possible to import extensions from the package //FIXME: probably to be removed, would make possible to use native code from within the package :/ diff --git a/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp b/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp index b0b13e5d4..dba71f2a4 100644 --- a/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp +++ b/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp @@ -105,8 +105,6 @@ SimpleJavaScriptApplet::SimpleJavaScriptApplet(QObject *parent, const QVariantLi Q_UNUSED(args); // kDebug() << "Script applet launched, args" << applet()->startupArguments(); - KGlobal::locale()->insertCatalog(description().pluginName()); - // TODO this will be set to the engine we get from QML m_engine = new QScriptEngine(this); m_env = new ScriptEnv(this, m_engine); @@ -311,6 +309,7 @@ bool SimpleJavaScriptApplet::init() this, SLOT(extenderItemRestored(Plasma::ExtenderItem*))); connect(applet(), SIGNAL(activate()), this, SLOT(activate())); + KGlobal::locale()->insertCatalog(description().pluginName()); setupObjects(); AppletAuthorization auth(this);