[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=4a5659d

The following commit has been merged in the master branch:
commit 4a5659d90bc35bec5a487377317951c2055b371f
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Tue Oct 11 21:03:45 2011 +0300

    Load the proper translation catalogs.
---
 config/appearance-config.cpp | 2 +-
 config/behavior-config.cpp   | 2 +-
 lib/chat-widget.cpp          | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/config/appearance-config.cpp b/config/appearance-config.cpp
index 895040b..1aefc6b 100644
--- a/config/appearance-config.cpp
+++ b/config/appearance-config.cpp
@@ -31,7 +31,7 @@
 #include <KPluginFactory>
 
 K_PLUGIN_FACTORY(KCMTelepathyChatAppearanceConfigFactory, registerPlugin<AppearanceConfig>();)
-K_EXPORT_PLUGIN(KCMTelepathyChatAppearanceConfigFactory("telepathy_chat_appearance_config", "kcm_telepathy_chat_appearance_config"))
+K_EXPORT_PLUGIN(KCMTelepathyChatAppearanceConfigFactory("telepathy_chat_appearance_config", "telepathy-chat-window-config"))
 
 AppearanceConfig::AppearanceConfig(QWidget *parent, const QVariantList& args)
     : KCModule(KCMTelepathyChatAppearanceConfigFactory::componentData(), parent, args),
diff --git a/config/behavior-config.cpp b/config/behavior-config.cpp
index 647071a..65ddab9 100644
--- a/config/behavior-config.cpp
+++ b/config/behavior-config.cpp
@@ -25,7 +25,7 @@
 #include <KPluginFactory>
 
 K_PLUGIN_FACTORY(KCMTelepathyChatBehaviorConfigFactory, registerPlugin<BehaviorConfig>();)
-K_EXPORT_PLUGIN(KCMTelepathyChatBehaviorConfigFactory("telepathy_chat_behavior_config", "kcm_telepathy_chat_behavior_config"))
+K_EXPORT_PLUGIN(KCMTelepathyChatBehaviorConfigFactory("telepathy_chat_behavior_config", "telepathy-chat-window-config"))
 
 
 BehaviorConfig::BehaviorConfig(QWidget *parent, const QVariantList& args)
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index f0d618e..bc06453 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -129,6 +129,9 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
     d->channel = channel;
     d->account = account;
 
+    //load translations for this library. keep this before any i18n() calls in library code
+    KGlobal::locale()->insertCatalog(QLatin1String("ktelepathy_chat_lib"));
+
     d->chatviewlInitialised = false;
     d->showFormatToolbarAction = new QAction(i18n("Show format options"), this);
     d->isGroupChat = (channel->targetHandleType() == Tp::HandleTypeContact ? false : true);

-- 
ktp-text-ui packaging