~ubuntu-branches/ubuntu/oneiric/kde-runtime/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu-mobile-02-insert-a-catalog-named-as-the-plugin-name.patch

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2011-09-16 14:57:48 UTC
  • Revision ID: package-import@ubuntu.com-20110916145748-ckb4e6m0wivpk3tw
Tags: 4:4.7.1-0ubuntu5
Drop all kde-active packages and patches as double-building with different
patchsets doesn't seem to work on the archive builders.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
From 927bdaf42a64d0207b470ac0f244a054cb71ea45 Mon Sep 17 00:00:00 2001
2
 
From: Marco Martin <notmart@gmail.com>
3
 
Date: Mon, 11 Jul 2011 21:23:32 +0200
4
 
Subject: [PATCH 2/10] insert a catalog named as the plugin name
5
 
 
6
 
---
7
 
 .../plasmoid/declarativeappletscript.cpp           |    1 +
8
 
 .../javascript/plasmoid/simplejavascriptapplet.cpp |    2 ++
9
 
 2 files changed, 3 insertions(+), 0 deletions(-)
10
 
 
11
 
diff --git a/plasma/scriptengines/javascript/plasmoid/declarativeappletscript.cpp b/plasma/scriptengines/javascript/plasmoid/declarativeappletscript.cpp
12
 
index 08d53fa..5bd0b98 100644
13
 
--- a/plasma/scriptengines/javascript/plasmoid/declarativeappletscript.cpp
14
 
+++ b/plasma/scriptengines/javascript/plasmoid/declarativeappletscript.cpp
15
 
@@ -70,6 +70,7 @@ DeclarativeAppletScript::DeclarativeAppletScript(QObject *parent, const QVariant
16
 
       m_env(0),
17
 
       m_auth(this)
18
 
 {
19
 
+    KGlobal::locale()->insertCatalog(description().pluginName());
20
 
     Q_UNUSED(args);
21
 
 }
22
 
 
23
 
diff --git a/plasma/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp b/plasma/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp
24
 
index 0076cd8..b0b13e5 100644
25
 
--- a/plasma/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp
26
 
+++ b/plasma/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp
27
 
@@ -105,6 +105,8 @@ SimpleJavaScriptApplet::SimpleJavaScriptApplet(QObject *parent, const QVariantLi
28
 
     Q_UNUSED(args);
29
 
 //    kDebug() << "Script applet launched, args" << applet()->startupArguments();
30
 
 
31
 
+    KGlobal::locale()->insertCatalog(description().pluginName());
32
 
+
33
 
     // TODO this will be set to the engine we get from QML
34
 
     m_engine = new QScriptEngine(this);
35
 
     m_env = new ScriptEnv(this, m_engine);
36
 
1.7.5.4
37