Merge branch 'master' into bug/3014/krfbbug/3014/krfb

17 files changed, 58 insertions, 85 deletions

diff --git a/kopete/protocols/groupwise/CMakeLists.txt b/kopete/protocols/groupwise/CMakeLists.txt
index c6df3323..c129ffe8 100644
--- a/kopete/protocols/groupwise/CMakeLists.txt
+++ b/kopete/protocols/groupwise/CMakeLists.txt
@@ -9,6 +9,11 @@
 #
 #################################################
 
+if( NOT TQCA_FOUND )
+  set( TQCA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libgroupwise/qca/src )
+  set( TQCA_LIBRARIES "groupwise_tqca-static" )
+endif( )
+
 add_subdirectory( icons )
 add_subdirectory( libgroupwise )
 add_subdirectory( ui )
@@ -18,12 +23,12 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}/ui
   ${CMAKE_CURRENT_SOURCE_DIR}/libgroupwise
   ${CMAKE_CURRENT_SOURCE_DIR}/libgroupwise/tasks
-  ${CMAKE_CURRENT_SOURCE_DIR}/libgroupwise/qca/src
   ${CMAKE_CURRENT_SOURCE_DIR}/ui
   ${CMAKE_SOURCE_DIR}/kopete/libkopete
   ${CMAKE_SOURCE_DIR}/kopete/libkopete/ui
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TQCA_INCLUDE_DIR}
 )
 
 link_directories(
@@ -33,7 +38,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kopete_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kopete_groupwise.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
+
 install( FILES gwchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_groupwise )
 
 
@@ -45,6 +55,6 @@ tde_add_kpart( kopete_groupwise AUTOMOC
     gwconnector.cpp gwmessagemanager.cpp gwcontactlist.cpp
   LINK
     kopetegroupwiseui-static groupwise-static groupwise_tasks-static
-    groupwise_qca-static kopete-shared
+    ${TQCA_LIBRARIES} kopete-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index f102b3f9..b98d5911 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -43,7 +43,7 @@
 #include <kopeteview.h>
 
 #include "client.h"
-#include <qca.h>
+#include <tqca.h>
 #include "gwcontact.h"
 #include "gwcontactlist.h"
 #include "gwprotocol.h"
diff --git a/kopete/protocols/groupwise/kopete_groupwise.desktop b/kopete/protocols/groupwise/kopete_groupwise.desktop
index aadcbc68..7a608ace 100644
--- a/kopete/protocols/groupwise/kopete_groupwise.desktop
+++ b/kopete/protocols/groupwise/kopete_groupwise.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Service
-X-Kopete-Version=1000900
 Icon=groupwise_protocol
 X-TDE-ServiceTypes=Kopete/Protocol
+X-Kopete-Version=1000900
+
 X-TDE-Library=kopete_groupwise
 X-Kopete-Messaging-Protocol=messaging/groupwise
 X-TDE-PluginInfo-Author=Will Stephenson
@@ -14,47 +15,7 @@ X-TDE-PluginInfo-Category=Protocols
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=false
+
 Name=GroupWise
-Name[bn]=গ্রুপ-ওয়াইজ
-Name[fa]=گروه هوشیار
-Name[ne]=समूहगत
-Name[ta]=குழு படி
-Name[tr]=Akıllı Gruplama
+
 Comment=Novell GroupWise Messenger
-Comment[bn]=নোভেল গ্রুপ-ওয়াইজ বার্তাবাহক
-Comment[cs]=Novell GroupWise komunikátor
-Comment[de]=Novell GroupWise-Nachrichtendienst
-Comment[es]=Mensajería GroupWise de Novell
-Comment[fa]=پیام‌رسان GroupWise ناول
-Comment[fi]=Novell GroupWise -viestijä
-Comment[fr]=Messagerie GroupWise Novell
-Comment[he]=תוכנת המסרים של נובל GroupWise
-Comment[is]=Novell GroupWise skilaboðaþjónustan
-Comment[it]=Messaggistica per GroupWise di Novell
-Comment[ja]=Novell GroupWise メッセンジャー
-Comment[ka]= Novell GroupWise მყისიერი შეტყობინებების მაცნე
-Comment[kk]=Novell GroupWise хабарласуы
-Comment[km]=កម្មវិធី​ផ្ញើ​សារ​របស់​ណូវែល - GroupWise
-Comment[lt]=Novell GroupWise žinučių klientas
-Comment[mk]=Гласник за Novell GroupWise 
-Comment[nb]=Novell GroupWise meldingsprogram
-Comment[nds]=Novell GroupWise-Kortnarichtendeenst
-Comment[ne]=नोभेल समूहगत मेसेन्जर
-Comment[nl]=Protocol voor Novell GroupWise Messenger
-Comment[nn]=Lynmeldingsprogrammet Novell GroupWise
-Comment[pl]=Komunikator Novell GroupWise
-Comment[pt_BR]=Mensageiro do GroupWise da Novell
-Comment[ru]=Программа обмена сообщениями Novell GroupWise
-Comment[se]=Novell GroupWise-šleađgadieđáhusprográmma
-Comment[sl]=Sporočilnik za Novell GroupWise
-Comment[sr]=Novell-ов гласник GroupWise
-Comment[sr@Latn]=Novell-ov glasnik GroupWise
-Comment[sv]=Novell GroupWise-meddelandeklient
-Comment[ta]=Novell GroupWise உடனடி தூதர்
-Comment[tg]=Пайёмбари Novell GroupWise 
-Comment[tr]=Novell Akıllı Grup İletişimi
-Comment[uk]=Програма обміну повідомленнями Novell GroupWise
-Comment[uz]=Novell GroupWise mesenjer
-Comment[uz@cyrillic]=Novell GroupWise месенжер
-Comment[zh_CN]=Novell GroupWise 信使
-Comment[zh_TW]=Novell GroupWise 即時訊息
diff --git a/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt b/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt
index ef158cd9..7fb622e1 100644
--- a/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt
+++ b/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt
@@ -9,7 +9,9 @@
 #
 #################################################
 
-add_subdirectory( qca )
+if( NOT TQCA_FOUND )
+  add_subdirectory( qca )
+endif( )
 add_subdirectory( tasks )
 
 # add_definitions(
@@ -19,10 +21,10 @@ add_subdirectory( tasks )
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/qca/src
   ${CMAKE_SOURCE_DIR}/kopete/libkopete
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TQCA_INCLUDE_DIR}
 )
 
 
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
index 67d22462..0c395159 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
@@ -21,7 +21,7 @@
 
 //#include <tqtextstream.h>
 //#include <tqguardedptr.h>
-// #include <qca.h>
+// #include <tqca.h>
 // #include <stdlib.h>
 // #include "bytestream.h"
 // #include "base64.h"
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
index c7166ffe..c63868f7 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
@@ -20,7 +20,7 @@
 #ifndef GW_CLIENTSTREAM_H
 #define GW_CLIENTSTREAM_H
 
-#include <qca.h>
+#include <tqca.h>
 
 #include "gwfield.h"
 #include "stream.h"
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt b/kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt
index 9c74e339..c14c9761 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt
@@ -15,8 +15,8 @@ include_directories(
 )
 
 
-##### groupwise_qca (static) ####################
+##### groupwise_tqca (static) ###################
 
-tde_add_library( groupwise_qca STATIC_PIC AUTOMOC
-  SOURCES qca.cpp
+tde_add_library( groupwise_tqca STATIC_PIC AUTOMOC
+  SOURCES tqca.cpp
 )
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
index e9a361d9..4441fe33 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
@@ -1,8 +1,8 @@
 METASOURCES = AUTO
 
-noinst_LTLIBRARIES = libqca.la
+noinst_LTLIBRARIES = libtqca.la
 INCLUDES = $(all_includes)
 
-libqca_la_SOURCES = \
-	qca.cpp
-# libqca_la_LIBADD = -lqt-mt
+libtqca_la_SOURCES = \
+	tqca.cpp
+# libtqca_la_LIBADD = -lqt-mt
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/tqca.cpp
index 3981964a..5656addf 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/tqca.cpp
@@ -1,5 +1,5 @@
 /*
- * qca.cpp - TQt Cryptographic Architecture
+ * tqca.cpp - TQt Cryptographic Architecture
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
@@ -18,7 +18,7 @@
  *
  */
 
-#include "qca.h"
+#include "tqca.h"
 
 #include <tqptrlist.h>
 #include <tqdir.h>
@@ -30,7 +30,7 @@
 #include <tqapplication.h>
 #include <tqguardedptr.h>
 #include <stdlib.h>
-#include "qcaprovider.h"
+#include "tqcaprovider.h"
 
 #if defined(Q_OS_WIN32)
 #define PLUGIN_EXT "dll"
@@ -1483,4 +1483,4 @@ TQByteArray SASL::readOutgoing()
 	return a;
 }
 
-#include "qca.moc"
+#include "tqca.moc"
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h b/kopete/protocols/groupwise/libgroupwise/qca/src/tqca.h
index 7a8a3af4..701aeb31 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/tqca.h
@@ -1,5 +1,5 @@
 /*
- * qca.h - TQt Cryptographic Architecture
+ * tqca.h - TQt Cryptographic Architecture
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h b/kopete/protocols/groupwise/libgroupwise/qca/src/tqcaprovider.h
index b0e5385a..f88d1b4f 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/tqcaprovider.h
@@ -1,5 +1,5 @@
 /*
- * qcaprovider.h - TQCA Plugin API
+ * tqcaprovider.h - TQCA Plugin API
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 #include <tqdatetime.h>
 #include <tqobject.h>
 #include <tqhostaddress.h>
-#include "qca.h"
+#include "tqca.h"
 
 #define TQCA_PLUGIN_VERSION 1
 
diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
index 7965e08a..372d7d9a 100644
--- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
@@ -19,7 +19,7 @@
 
 #include <tqtimer.h>
 
-#include <qca.h>
+#include <tqca.h>
 
 #include "qcatlshandler.h"
 
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc
index edeb0239..d14fb46b 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf.cc
+++ b/kopete/protocols/groupwise/libgroupwise/rtf.cc
@@ -646,9 +646,9 @@ extern int rtflex (void);
  */
 YY_DECL
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
     
 #line 46 "rtf.ll"
 
@@ -697,7 +697,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
 				(yy_last_accepting_state) = yy_current_state;
@@ -930,9 +930,9 @@ case YY_STATE_EOF(INITIAL):
  */
 static int yy_get_next_buffer (void)
 {
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
+    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = (yytext_ptr);
+	int number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1056,14 +1056,14 @@ static int yy_get_next_buffer (void)
 
     static yy_state_type yy_get_previous_state (void)
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	yy_state_type yy_current_state;
+	char *yy_cp;
     
 	yy_current_state = (yy_start);
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			(yy_last_accepting_state) = yy_current_state;
@@ -1088,10 +1088,10 @@ static int yy_get_next_buffer (void)
  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
-	register int yy_is_jam;
-    	register char *yy_cp = (yy_c_buf_p);
+	int yy_is_jam;
+    	char *yy_cp = (yy_c_buf_p);
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		(yy_last_accepting_state) = yy_current_state;
@@ -1664,7 +1664,7 @@ int rtflex_destroy  (void)
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {
-	register int i;
+	int i;
     	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
@@ -1673,7 +1673,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s )
 {
-	register int n;
+	int n;
     	for ( n = 0; s[n]; ++n )
 		;
 
diff --git a/kopete/protocols/groupwise/libgroupwise/securestream.h b/kopete/protocols/groupwise/libgroupwise/securestream.h
index d5b877fd..ccf916e6 100644
--- a/kopete/protocols/groupwise/libgroupwise/securestream.h
+++ b/kopete/protocols/groupwise/libgroupwise/securestream.h
@@ -21,7 +21,7 @@
 #ifndef SECURESTREAM_H
 #define SECURESTREAM_H
 
-#include <qca.h>
+#include <tqca.h>
 #include "tlshandler.h"
 #include "bytestream.h"
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt b/kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt
index 1fc4a60a..8c85f94e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt
@@ -13,9 +13,9 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/..
-  ${CMAKE_CURRENT_SOURCE_DIR}/../qca/src
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TQCA_INCLUDE_DIR}
 )
 
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
index f4df0b8a..a4b1fee0 100644
--- a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
+++ b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
@@ -19,7 +19,7 @@
 
 #include "gwclientstream.h"
 #include "gwconnector.h"
-#include <qca.h>
+#include <tqca.h>
 #include "tqcatlshandler.h"
 #include "requestfactory.h"
 #include "request.h"
diff --git a/kopete/protocols/groupwise/ui/CMakeLists.txt b/kopete/protocols/groupwise/ui/CMakeLists.txt
index 2045bef7..c9ea2643 100644
--- a/kopete/protocols/groupwise/ui/CMakeLists.txt
+++ b/kopete/protocols/groupwise/ui/CMakeLists.txt
@@ -12,13 +12,13 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../libgroupwise
-  ${CMAKE_CURRENT_SOURCE_DIR}/../libgroupwise/qca/src
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_BINARY_DIR}/kopete/libkopete/ui
   ${CMAKE_SOURCE_DIR}/kopete/libkopete
   ${CMAKE_SOURCE_DIR}/kopete/libkopete/ui
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TQCA_INCLUDE_DIR}
 )