summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-09-15 18:31:43 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-09-15 18:37:28 +0900
commit68cfcb9af6531490340813dcea85f65cde67f50e (patch)
tree732d4ff9d72be5770bd382f95c79af2114cacd8d
parent95cc8dacd3546f1cb26ba1a5b6b1eff9ccfb19d2 (diff)
downloadtdebase-68cfcb9af6531490340813dcea85f65cde67f50e.tar.gz
tdebase-68cfcb9af6531490340813dcea85f65cde67f50e.zip
twin: fix broken functionality introduced in recent commits
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 5fde4286063666e491dcabb7f9e4c22ca6ed963c)
-rw-r--r--kcontrol/keys/main.cpp1
-rw-r--r--twin/killer/killer.cpp1
-rw-r--r--twin/main.cpp3
-rw-r--r--twin/resumer/resumer.cpp1
4 files changed, 2 insertions, 4 deletions
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index 55188cd6f..d002b667f 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -150,7 +150,6 @@ extern "C"
{
// What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15
TDEGlobal::locale()->insertCatalogue("twin");
- TDEGlobal::locale()->insertCatalogue("twin_lib");
TDEGlobal::locale()->insertCatalogue("kdesktop");
TDEGlobal::locale()->insertCatalogue("kicker");
return new KeyModule(parent, "kcmkeys");
diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp
index 3913d5317..bf763e7c1 100644
--- a/twin/killer/killer.cpp
+++ b/twin/killer/killer.cpp
@@ -46,7 +46,6 @@ static const TDECmdLineOptions options[] =
int main( int argc, char* argv[] )
{
TDELocale::setMainCatalogue( "twin" ); // the messages are in twin's .po file
- TDEGlobal::locale()->insertCatalogue( "twin_lib" );
TDECmdLineArgs::init( argc, argv, "twin_killer_helper", I18N_NOOP( "TWin" ),
I18N_NOOP( "TWin helper utility" ), "1.0" );
TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/twin/main.cpp b/twin/main.cpp
index 4231ee517..84f123f83 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -310,7 +310,6 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
}
TDEGlobal::locale()->setMainCatalogue("twin");
- TDEGlobal::locale()->insertCatalogue( "twin_lib" );
TDEAboutData aboutData( "twin", I18N_NOOP("TWin"),
version, description, TDEAboutData::License_GPL,
@@ -343,6 +342,8 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
else
appname.sprintf("twin-screen-%d", KWinInternal::screen_number);
+ TDEGlobal::locale()->insertCatalogue("twin_lib");
+
DCOPClient* client = a.dcopClient();
client->registerAs( appname.data(), false);
client->setDefaultObject( "KWinInterface" );
diff --git a/twin/resumer/resumer.cpp b/twin/resumer/resumer.cpp
index 232d0e303..3c915b8c8 100644
--- a/twin/resumer/resumer.cpp
+++ b/twin/resumer/resumer.cpp
@@ -45,7 +45,6 @@ static const TDECmdLineOptions options[] =
int main( int argc, char* argv[] )
{
TDELocale::setMainCatalogue( "twin" ); // the messages are in twin's .po file
- TDEGlobal::locale()->insertCatalogue( "twin_lib" );
TDECmdLineArgs::init( argc, argv, "twin_resume_helper", I18N_NOOP( "TWin" ),
I18N_NOOP( "TWin helper utility" ), "1.0" );
TDECmdLineArgs::addCmdLineOptions( options );