Apply Alex patch (now we can use enable-final argument

some module compiles with enable-final now)
As discussed with Alex it's not necessary to have program name
into automoc macro

svn path=/trunk/KDE/kdenetwork/krfb/; revision=598296

CMakeLists.txt

@@ -0,0 +1,8 @@
+
+add_subdirectory( srvloc ) 
+add_subdirectory( kinetd ) 
+add_subdirectory( libvncserver ) 
+add_subdirectory( krfb ) 
+add_subdirectory( kcm_krfb ) 
+add_subdirectory( krfb_httpd ) 
+

Makefile.am

@@ -1,8 +0,0 @@
-SUBDIRS = srvloc kinetd libvncserver krfb kcm_krfb krfb_httpd
-
-EXTRA_DIST = AUTHORS README TODO NOTES DCOP-INTERFACE
-
-# not a GNU package. You can remove this line, if 
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign 
-

doc/CMakeLists.txt

@@ -0,0 +1,16 @@
+
+
+
+
+########### install files ###############
+
+
+
+
+
+#original Makefile.am contents follow:
+
+#
+#KDE_LANG = en
+#KDE_DOCS = AUTO
+#

doc/Makefile.am

@@ -1,4 +0,0 @@
-
-KDE_LANG = en
-KDE_DOCS = AUTO
-

doc/index.docbook

@@ -25,9 +25,8 @@ as Authors, publish date, the abstract, and Keywords -->
 &Brad.Hards;
 &Brad.Hards.mail;
 </author>
-</authorgroup>
-
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
 
 <copyright>
 <year>2003</year>
@@ -113,7 +112,7 @@ to help you perform a task.
 <para>
 Please report any problems or feature requests to the &kde; mailing
 lists or file a bug at <ulink
-url="http://bugs.kde.org">http://www.bugs.kde.org</ulink>. 
+url="http://bugs.kde.org">http://bugs.kde.org</ulink>. 
 </para>
 </chapter>
 
@@ -369,10 +368,10 @@ as &krdc;.
 </para>
 
 <para>
-The <guilabel>Allow uninvited connections</guilabel> checkbox controls
+The <guilabel>Allow uninvited connections</guilabel> check box controls
 whether &krfb; allows connection without an invitation. If uninvited
 connections are allowed, then you should probably specify a
-password. You can also use the checkboxes here to choose whether you
+password. You can also use the check boxes here to choose whether you
 have to confirm the connection before it proceeds, and whether the
 person connecting can control the desktop, or only view.
 </para>
@@ -397,7 +396,7 @@ password is securely guarded.
 
 <para>
 &krfb; allows you to control whether the background image is passed to
-the client, or not. This is controlled using a checkbox in the
+the client, or not. This is controlled using a check box in the
 <guilabel>Session</guilabel> tab, as shown below.
 </para>
 
@@ -493,7 +492,7 @@ Connection</guibutton>, then the attempt to connect will be terminated.
 
 <para>
 The <guilabel>Allow remote user to control keyboard and
-mouse</guilabel> checkbox determines whether this client can only
+mouse</guilabel> check box determines whether this client can only
 observe, or can take control of your machine. 
 </para>
 

kcm_krfb/CMakeLists.txt

@@ -0,0 +1,50 @@
+
+
+
+
+########### next target ###############
+
+set(kcm_krfb_PART_SRCS kcm_krfb.cpp )
+
+kde4_automoc(${kcm_krfb_PART_SRCS})
+
+kde4_add_ui_files(kcm_krfb_PART_SRCS configurationwidget.ui )
+
+kde4_add_plugin(kcm_krfb ${kcm_krfb_PART_SRCS})
+
+kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_krfb )
+
+target_link_libraries(kcm_krfb  ${KDE4_KIO_LIBS} krfbconfig )
+
+install(TARGETS kcm_krfb  DESTINATION ${PLUGIN_INSTALL_DIR})
+
+
+########### install files ###############
+
+install( FILES kcmkrfb.desktop  DESTINATION ${XDG_APPS_DIR})
+
+
+
+
+#original Makefile.am contents follow:
+
+#METASOURCES = AUTO
+#
+## Code
+#kde_module_LTLIBRARIES = kcm_krfb.la
+#
+#kcm_krfb_la_SOURCES = configurationwidget.ui kcm_krfb.cpp
+#kcm_krfb_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) -module
+#kcm_krfb_la_LIBADD   = ../krfb/libkrfbconfig.la $(LIB_KDEUI) -lkio
+#
+## Services
+#xdg_apps_DATA = kcmkrfb.desktop
+#
+#EXTRA_DIST = $(kcm_krfb_la_SOURCES)\
+#             $(xdg_apps_DATA)
+#
+## set the include path for X, qt and KDE
+#INCLUDES= -I../krfb $(all_includes)
+#
+#messages: rc.cpp
+#	$(XGETTEXT) *.cpp *.h -o $(podir)/kcm_krfb.pot

kcm_krfb/Makefile.am

@@ -1,20 +0,0 @@
-METASOURCES = AUTO
-
-# Code
-kde_module_LTLIBRARIES = kcm_krfb.la
-
-kcm_krfb_la_SOURCES = configurationwidget.ui kcm_krfb.cpp
-kcm_krfb_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) -module
-kcm_krfb_la_LIBADD   = ../krfb/libkrfbconfig.la $(LIB_KDEUI)
-
-# Services
-xdg_apps_DATA = kcmkrfb.desktop
-
-EXTRA_DIST = $(kcm_krfb_la_SOURCES)\
-             $(xdg_apps_DATA)
-
-# set the include path for X, qt and KDE
-INCLUDES= -I../krfb $(all_includes)
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kcm_krfb.pot

kcm_krfb/Messages.sh

@@ -0,0 +1,2 @@
+#! /bin/sh
+$XGETTEXT *.cpp *.h -o $podir/kcm_krfb.pot

kcm_krfb/configurationwidget.ui

@@ -50,12 +50,6 @@
                         <property name="name">
                             <cstring>GroupBox1</cstring>
                         </property>
-                        <property name="frameShape">
-                            <enum>Box</enum>
-                        </property>
-                        <property name="frameShadow">
-                            <enum>Sunken</enum>
-                        </property>
                         <property name="title">
                             <string>Invitations</string>
                         </property>
@@ -420,10 +414,10 @@
                                         <property name="value">
                                             <number>5900</number>
                                         </property>
-                                        <property name="minValue">
+                                        <property name="minimum">
                                             <number>1024</number>
                                         </property>
-                                        <property name="maxValue">
+                                        <property name="maximum">
                                             <number>32767</number>
                                         </property>
                                         <property name="toolTip" stdset="0">
@@ -502,6 +496,13 @@ Most VNC clients use a display number instead of the actual port. This display n
     <tabstop>portInput</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
+<customwidgets>
+    <customwidget>
+        <class>KIntNumInput</class>
+        <header location="global">knuminput.h</header>
+        <container>0</container>
+    </customwidget>
+</customwidgets>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>

kcm_krfb/kcm_krfb.cpp

@@ -25,7 +25,6 @@
 #include <qradiobutton.h>
 #include <qlineedit.h>
 #include <qbuttongroup.h>
-#include <qcstring.h>
 #include <qdatastream.h>
 #include <kapplication.h>
 #include <kdialog.h>
@@ -45,30 +44,33 @@ typedef KGenericFactory<KcmKRfb, QWidget> KcmKRfbFactory;
 
 // Can't use K_EXPORT_COMPONENT_FACTORY, since insertCatalogue necessary
 extern "C" {
-  void *init_kcm_krfb() {
-    KGlobal::locale()->insertCatalogue("krfb"); // For invitation translations
+  KDE_EXPORT void *init_kcm_krfb() {
+    KGlobal::locale()->insertCatalog("krfb"); // For invitation translations
     return new KcmKRfbFactory("kcm_krfb"); 
   }
 }
 
 
 KcmKRfb::KcmKRfb(QWidget *p, const char *name, const QStringList &) :
-	KCModule(KcmKRfbFactory::instance(), p, name),
+	KCModule(KcmKRfbFactory::instance(), p),
 	m_configuration(KRFB_CONFIGURATION_MODE) {
 
         m_confWidget = new ConfigurationWidget(this);
 
-	QVBoxLayout *l = new QVBoxLayout(this, 0, KDialog::spacingHint());
+	QVBoxLayout *l = new QVBoxLayout(this);
+	l->setSpacing(KDialog::spacingHint());
+	l->setMargin(0);
 	l->add(m_confWidget);
 
 	setButtons(Default|Apply|Reset);
 
-	m_about = new KAboutData( "kcm_krfb", I18N_NOOP("Desktop Sharing Control Module"),
+	KAboutData* about = new KAboutData( "kcm_krfb", I18N_NOOP("Desktop Sharing Control Module"),
 		VERSION,
 		I18N_NOOP("Configure desktop sharing"), KAboutData::License_GPL,
 		"(c) 2002, Tim Jansen\n",
 		0, "http://www.tjansen.de/krfb", "tim@tjansen.de");
-	m_about->addAuthor("Tim Jansen", 0, "tim@tjansen.de");
+	about->addAuthor("Tim Jansen", 0, "tim@tjansen.de");
+	setAboutData( about );
 
 	load();
 
@@ -86,9 +88,6 @@ KcmKRfb::KcmKRfb(QWidget *p, const char *name, const QStringList &) :
 	setInvitationNum(m_configuration.invitations().size());
 	connect(m_confWidget->disableBackgroundCB, SIGNAL(clicked()), SLOT(configChanged()) );
 }
-KcmKRfb::~KcmKRfb() {
-	delete m_about;
-}
 
 void KcmKRfb::configChanged() {
 	emit changed(true);
@@ -98,7 +97,7 @@ void KcmKRfb::setInvitationNum(int num) {
 	if (num == 0)
 		m_confWidget->invitationNumLabel->setText(i18n("You have no open invitation."));
 	else
-		m_confWidget->invitationNumLabel->setText(i18n("Open invitations: %1").arg(num));
+		m_confWidget->invitationNumLabel->setText(i18n("Open invitations: %1", num));
 }
 
 void KcmKRfb::checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) {
@@ -108,8 +107,8 @@ void KcmKRfb::checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) {
 	DCOPClient *d = KApplication::dcopClient();
 
 	QByteArray sdata, rdata;
-	QCString replyType;
-	QDataStream arg(sdata, IO_WriteOnly);
+	DCOPCString replyType;
+	QDataStream arg(&sdata, QIODevice::WriteOnly);
 	arg << QString("krfb");
 	if (!d->call ("kded", "kinetd", "isInstalled(QString)", sdata, replyType, rdata))
 		return;
@@ -117,7 +116,7 @@ void KcmKRfb::checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) {
 	if (replyType != "bool")
 		return;
 
-	QDataStream answer(rdata, IO_ReadOnly);
+	QDataStream answer(&rdata, QIODevice::ReadOnly);
 	answer >> krfbAvailable;
 	kinetdAvailable = true;
 }
@@ -153,6 +152,7 @@ void KcmKRfb::save() {
 		m_configuration.setPreferredPort(m_confWidget->portInput->value());
 	m_configuration.setDisableBackground(m_confWidget->disableBackgroundCB->isChecked());
 	m_configuration.save();
+	kapp->dcopClient()->emitDCOPSignal("KRFB::ConfigChanged", "KRFB_ConfigChanged()", QByteArray());
 	emit changed(false);
 }
 
@@ -171,11 +171,6 @@ void KcmKRfb::defaults() {
 	emit changed(true);
 }
 
-const KAboutData *KcmKRfb::aboutData() const
-{
-	return m_about;
-}
-
 QString KcmKRfb::quickHelp() const
 {
 	return i18n("<h1>Desktop Sharing</h1> This module allows you to configure"

kcm_krfb/kcm_krfb.h

@@ -30,17 +30,14 @@ class KcmKRfb : public KCModule {
 private:
 	Configuration m_configuration;
 	ConfigurationWidget *m_confWidget;
-	KAboutData *m_about;
 	void checkKInetd(bool&, bool&);
 public:
 	KcmKRfb(QWidget *p, const char *name, const QStringList &);
-	~KcmKRfb();
 
 	void load();
 	void save();
 	void defaults();
 	QString quickHelp() const;
-	const KAboutData *aboutData() const;
 private slots:
 	void setInvitationNum(int num);
 	void configChanged();

kcm_krfb/kcmkrfb.desktop

@@ -10,132 +10,14 @@ X-KDE-Library=krfb
 X-KDE-ParentApp=kcontrol
 
 Name=Desktop Sharing
-Name[af]=Werkskerm Deeling
-Name[ar]=مشاركة سطح المكتب
-Name[bg]=Споделяне на работно място
-Name[bs]=Dijeljenje desktopa
-Name[ca]=Compartició de l'escriptori
-Name[cs]=Sdílení pracovní plochy
-Name[cy]=Rhannu Penbwrdd
-Name[da]=Skrivebordsdeling
-Name[de]=Arbeitsfläche freigeben
-Name[el]=Μοίρασμα επιφάνειας εργασίας
-Name[eo]=Tabuloj komunaj
-Name[es]=Compartición de escritorio
-Name[et]=Töölaua jagamine
-Name[fi]=Työpöydän jakaminen
 Name[fr]=Partage de bureau
-Name[gl]=Compartición do escritorio
-Name[he]=שיתוף שולחנות עבודה
-Name[hi]=डेस्कटॉप साझा
-Name[hr]=Dijeljenje radne površine
-Name[hu]=Munkaasztal-megosztás
-Name[it]=Condivisione Desktop
-Name[ja]=デスクトップ共有
-Name[lt]=Dalinimasis darbastaliu
-Name[mn]=Ажлын байрыг хамтран эзэмших
-Name[ms]=Perkongsian Ruang Kerja
-Name[mt]=Qsim tad-desktop
-Name[nb]=Delte skrivebord
-Name[nl]=Bureaubladvrijgave
-Name[nn]=Skrivebordsdeling
-Name[nso]=Kabagano ya Desktop
-Name[pl]=Współdzielenie pulpitu
-Name[pt]=Partilha do Ambiente de Trabalho
-Name[pt_BR]=Compartilhamento do Desktop
-Name[ro]=Partajare ecran
-Name[ru]=Общий рабочий стол
-Name[sk]=Zdieľanie pracovnej plochy
-Name[sl]=Deljenje namizja
-Name[sr]=Дељење радне површине
-Name[sv]=Dela ut skrivbordet
-Name[ta]=மேசைமேல் பகிர்வு
-Name[th]=ใช้งานพื้นที่ทำงานร่วมกัน
-Name[tr]=Masaüstü Paylaşımı
-Name[uk]=Спільні стільниці
-Name[ven]=U kovhekana ha Desikithopo
-Name[xh]=Ukwehlulelana kwe Desktop
-Name[xx]=xxDesktop Sharingxx
-Name[zh_CN]=桌面共享
-Name[zh_TW]=桌面分享
-Name[zu]=Ukwahlulelana kwe-Desktop
+Name[x-test]=xxDesktop Sharingxx
 
 Comment=Configure Desktop Sharing
-Comment[af]=Konfigureer Werkskerm Deeling
-Comment[ar]=تعديل مشاركة سطح المكتب
-Comment[bg]=Настройки на споделянето на работно място
-Comment[bs]=Podesite dijeljenje desktopa
-Comment[ca]=Lupa de l'escriptori
-Comment[cs]=Nastavit sdílení pracovní plochy
-Comment[cy]=Ffurfweddu Rhannu Penbwrdd
-Comment[da]=Indstil skrivebordsdeling
-Comment[de]=Freigabe der Arbeitsfläche einrichten
-Comment[el]=Ρύθμιση του μοιράσματος της επιφάνειας εργασίας
-Comment[eo]=Agordu fordonadon de viaj tabuloj
-Comment[es]=Compartición de escritorio
-Comment[et]=Töölaua jagamise seadistamine
-Comment[fi]=Aseta työpöydän jakamista
 Comment[fr]=Configuration du partage du bureau
-Comment[gl]=Configura-la compartición do escritorio
-Comment[he]=שינוי הגדרות שיתוף שולחנות העבודה
-Comment[hi]=कॉन्फिगर डेस्कटॉप साझा
-Comment[hu]=A munkaasztal-megosztás beállításai
-Comment[it]=Configura condivisione desktop
-Comment[ja]=デスクトップ共有の設定
-Comment[lt]=Konfigūruoti dalinimąsi darbastaliu
-Comment[mn]=Ажлын байрны хамтран эзэмших тохируулга
-Comment[ms]= Selaraskan Perkongsian Desktop
-Comment[nb]=Tilpass delte skrivebord
-Comment[nl]=Bureaubladvrijgave configureren
-Comment[nn]=Set opp skrivebordsdeling
-Comment[nso]=Beakanya Kabagano ya Desktop
-Comment[pl]=Konfiguracja współdzielenia pulpitu
-Comment[pt]=Configura a Partilha do Ecrã
-Comment[pt_BR]=Configurar Compartilhamento do Desktop
-Comment[ru]=Параметры общего рабочего стола
-Comment[sk]=Nastavenie zdieľania pracovnej plochy
-Comment[sl]=Nastavi deljenje namizja
-Comment[sr]=Подешавање дељења радне површине
-Comment[sv]=Anpassa utdelning av skrivbord
-Comment[ta]=மேஜைமேல் பகிர்வை உள்ளமை
-Comment[tr]=Masaüstü Paylaşımını Yapılandır
-Comment[uk]=Налаштувати спільні стільниці
-Comment[ven]=Dzudzanyani u kovhekana ha desikithopo
-Comment[xh]=Qwalasela Ukusebenzisa ngokuhlangeneyo kwe Desktop 
-Comment[xx]=xxConfigure Desktop Sharingxx
-Comment[zh_CN]=配置桌面共享
-Comment[zh_TW]=設定桌面分享
-Comment[zu]=Hlela kahle Ukwahlulelana kwe-Desktop
+Comment[x-test]=xxConfigure Desktop Sharingxx
 Keywords=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited
-Keywords[bg]=споделяне,работно,място,десктоп,покана,връзка,desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited
-Keywords[ca]=compartició de l'escriptori,krfb,vnc,compartir,krdc,connexió a l'escriptori remot,invitació,port,slp,no invitat
-Keywords[cs]=sdílení plochy,krfb,vnc,sdílení,rdp,krdc,připojení vzdálené plochy,pozvánka,port,slp
-Keywords[cy]=rhannu penbwrdd,krfb,vnc,rhannu,rdp,krdc,cysylltiad penbwrdd pell,gwahoddiad,porth,slp,heb wahoddiad
-Keywords[da]=skrivebordsdeling,krfb,vnc,deling,krdc,ekstern skrivebordsforbindelse,invitation,port,slp,ikke inviteret
-Keywords[de]=Arbeitsfläche freigeben,krfb,VNC,freigeben,krdc,Entfernte Arbeitsfläche,Einladung,Port,slp,uneingeladen
-Keywords[el]=μοίρασμα επιφάνειας εργασίας,krfb,vnc,μοίρασμα,krdc,σύνδεση σε απομακρυσμένη επιφάνεια εργασίας,πρόσκληση,θύρα,slp,χωρίς πρόσκληση
-Keywords[es]=compartición de escritorio,krfb,vnc,compartir,rdp,krdc, conexión escritorio remoto,invitación,puerto,slp,no invitado
-Keywords[et]=töölaua jagamine,krfb,vnc,jagamine,rdp,krdc,kaugtöölaua ühendus,rdp,kutse,port,slp,kutsumata
-Keywords[fi]=työpöydän jakaminen,krfb,vnc,jakaminen,krdc,etätyöpöytäyhteys, kutsu,portti,slp,kutsumaton
 Keywords[fr]=partage de bureau,krfb,vnc,partage,rdp,krdc,connexion à un bureau distant,invitation,port,slp,non invité
-Keywords[gl]=compartición de escritorio, vnc, compartir, krdc, conexión escritorio remoto, invitación, porto, slt
-Keywords[he]=שיתוף שולחן עבודה,krfb,vnc,שיתוף,rdp,krdc,חיבור לשולחן עבודה מרוחק,rdp
-Keywords[hi]=डेस्कटॉप साझा, केआरएफबी,वीएनसी,साझा,केआरडीसी,रिमोट डेस्कटॉप कनेक्शन,निमंत्रण,पोर्ट,एसएलपी,अनिमंत्रित
-Keywords[hu]=munkaasztal-megosztás,krfb,vnc,megosztás,krdc,csatlakozás távoli munkaasztalhoz,meghívás,port,slp,meghívás nélkül
-Keywords[it]=condivisione desktop,krfb,vnc,condivisione,krdc,connessione desktop remoto,invito,porta,slp,non invitato
-Keywords[ms]= perkongsian ruang kerja, sambungan, liang, desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited
-Keywords[nb]=skrivebordsdeling,krfb,vnc,deling,krdc,tilkobling til fjernt skrivebord,invitasjon,port,slp,ikke invitert
-Keywords[nl]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,uitnodiging,slp,rdp,verbinding,bureaubladvrijgave,bureaublad op afstand
-Keywords[pl]=współdzielenie pulpitu,krfb,vnc,współdzielenie,rdp,krdc,zdalne połączenie, zdalne biurko, zdalny pulpit, zaproszenie,port,slp
-Keywords[pt]=partilha do ecrã,krfb,vnc,partilha,krdc,ligação a um ecrã remoto,convite,porto,slp,sem convite
-Keywords[pt_BR]=compartilhamento de desktop,krfb,vnc,compartilhamento,krdc,conexão a desktop remoto,convite,porta,slp,não convidado
-Keywords[sk]=zdieľanie plochy,krfb,vnc,zdieľanie,rdp,krdc,pripojenie vzdialenej pracovnej plochy,rdp
-Keywords[sl]=namizje,souporaba,krfb,vnc,krdc,povezava oddaljenega namizja, povabilo,port,slp,nepovabljen
-Keywords[sr]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,радна површина,дељење,позив,порт,непозван,удаљено
-Keywords[sv]=dela skrivbord,krfb,vnc,dela,krdc,fjärrskrivbordsanslutning,inbjudan,port,slp
-Keywords[ta]=மேஜைமேல் பகிர்வு,krfb,vnc,பகிர்வு,krdc,தொலை மேஜைமேல் இணைப்பு,அழைப்பிதழ்,துரை,slp,uninvited
-Keywords[tr]=masaüstü paylaşımı,krfb,vnc,paylaşım,krdc,uzak masaüstü bağlantısı,davet,port,slp
-Keywords[xx]=xxdesktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvitedxx
-Keywords[zh_CN]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,桌面共享,共享,远程桌面连接,邀请,端口,未邀请
+Keywords[x-test]=xxdesktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvitedxx
 
-Categories=Qt;KDE;X-KDE-settings-network
+Categories=Qt;KDE;X-KDE-settings-network;

kinetd/CMakeLists.txt

@@ -0,0 +1,59 @@
+
+include_directories( ${CMAKE_SOURCE_DIR}/krfb/srvloc  )
+
+
+########### next target ###############
+
+set(kded_kinetd_PART_SRCS kinetd.cpp )
+
+kde4_automoc(${kded_kinetd_PART_SRCS})
+
+kde4_add_dcop_skels(kded_kinetd_PART_SRCS kinetd.h )
+
+kde4_add_plugin(kded_kinetd ${kded_kinetd_PART_SRCS})
+
+kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kded_kinetd )
+
+target_link_libraries(kded_kinetd  ${KDE4_KIO_LIBS} srvloc ${KDE4_KDNSSD_LIBS} )
+
+install(TARGETS kded_kinetd  DESTINATION ${PLUGIN_INSTALL_DIR})
+
+
+########### install files ###############
+
+install( FILES kinetdmodule.desktop  DESTINATION ${SERVICETYPES_INSTALL_DIR})
+install( FILES kinetd.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/kded)
+
+
+
+
+#original Makefile.am contents follow:
+
+#METASOURCES = AUTO
+#
+## Code 
+#kde_module_LTLIBRARIES = kded_kinetd.la
+#
+#kded_kinetd_la_SOURCES = kinetd.cpp kinetd.skel
+#kded_kinetd_la_LDFLAGS  = $(all_libraries) -module -avoid-version
+#kded_kinetd_la_LIBADD   = ../srvloc/libsrvloc.la $(LIB_KIO) $(LIB_KDNSSD)
+#
+## Services
+#kde_servicetypes_DATA = kinetdmodule.desktop
+#kdeddir = $(kde_servicesdir)/kded
+#kded_DATA = kinetd.desktop
+#
+#EXTRA_DIST = $(kded_kinetd_la_SOURCES)\
+#             $(kded_DATA) \
+#             $(kde_servicetypes_DATA) \
+#	     eventsrc README.debugging
+#
+#install-data-local:
+#	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kinetd
+#	$(INSTALL_DATA) $(srcdir)/eventsrc $(DESTDIR)$(kde_datadir)/kinetd/eventsrc
+#
+## set the include path for X, qt and KDE
+#INCLUDES= -I$(top_srcdir)/krfb/srvloc $(all_includes)
+#
+#messages: rc.cpp
+#	$(XGETTEXT) *.cpp -o $(podir)/kinetd.pot

kinetd/Makefile.am

@@ -1,30 +0,0 @@
-METASOURCES = AUTO
-
-# Code 
-kde_module_LTLIBRARIES = kded_kinetd.la
-
-kded_kinetd_la_SOURCES = kinetd.cpp kinetd.skel
-kded_kinetd_la_LDFLAGS  = $(all_libraries) -module -avoid-version
-kded_kinetd_la_LIBADD   = ../srvloc/libsrvloc.la $(LIB_KIO) 
-
-# Services
-kde_servicetypes_DATA = kinetdmodule.desktop
-kdeddir = $(kde_servicesdir)/kded
-kded_DATA = kinetd.desktop
-
-EXTRA_DIST = $(kded_kinetd_la_SOURCES)\
-             $(kded_DATA) \
-             $(kde_servicetypes_DATA) \
-	     eventsrc README.debugging
-
-KDE_ICON = kinetd
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kinetd
-	$(INSTALL_DATA) $(srcdir)/eventsrc $(DESTDIR)$(kde_datadir)/kinetd/eventsrc
-
-# set the include path for X, qt and KDE
-INCLUDES= -I$(top_srcdir)/krfb/srvloc $(all_includes)
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kinetd.pot

kinetd/Messages.sh

@@ -0,0 +1,2 @@
+#! /bin/sh
+$XGETTEXT *.cpp -o $podir/kinetd.pot

kinetd/eventsrc

@@ -1,205 +1,22 @@
 [!Global!]
 IconName=kinetd
 Comment=KInetD
-Comment[hi]=के-इनिट-डी
-Comment[sv]=Kinetd
-Comment[xx]=xxKInetDxx
+Comment[x-test]=xxKInetDxx
 
 [IncomingConnection]
 Name=IncomingConnection
-Name[ar]=اتصال وارد
-Name[bg]=Входяща връзка
-Name[ca]=Connexió entrant
-Name[cs]=Příchozí spojení
-Name[cy]=CysylltiadCyrraedd
-Name[da]=IndkommendeForbindelse
-Name[de]=Eingehende Verbindung
-Name[el]=Εισερχόμενη σύνδεση
-Name[eo]=EnvenantaKonekto
-Name[es]=Conexión entrante
-Name[et]=Sissetulev ühendus
-Name[fi]=Saapuva yhteys
 Name[fr]=Connexion entrante
-Name[gl]=Conexión Entrante
-Name[he]=חיבור נכנס
-Name[hi]=आवक-कनेक्शन
-Name[hr]=DolaznaVeza
-Name[hu]=Bejövő kapcsolat
-Name[it]=Connessioni in entrata
-Name[ja]=外部からの接続
-Name[lt]=Ateinantis prisijungimas
-Name[mn]=Орж ирсэн Холболт
-Name[ms]=Sambungan Masuk
-Name[mt]=KonnessjonijiDieħla
-Name[nb]=Innkommende forbindelse
-Name[nl]=Inkomende verbinding
-Name[nn]=Innkomande samband
-Name[nso]=Kopantsho yeo e Tsenago
-Name[pl]=Połączenia przychodzące
-Name[pt_BR]=Conexões de Entrada
-Name[ro]=Conexiune de intrare
-Name[ru]=Входящее соединение
-Name[se]=Boahtti oktavuohta
-Name[sk]=Prichádzajúce spojenia
-Name[sl]=Prihajajoča povezava
-Name[sr]=Долазећа веза
-Name[sv]=Inkommande anslutning
-Name[ta]=பல இணைப்புக்கள்
-Name[th]=มีการเชื่อมต่อเข้ามา
-Name[tr]=Gelen Bağlantı
-Name[uk]=ВхіднеЗ'єднання
-Name[ven]=Vhukwamanihanga ngomu
-Name[xh]=Uxhumaniso Olungenayo
-Name[xx]=xxIncomingConnectionxx
-Name[zh_CN]=进入的连接
-Name[zh_TW]=進來的連接
-Name[zu]=UkuxhumanaOkuzayo
+Name[x-test]=xxIncomingConnectionxx
 Comment=Received incoming connection
-Comment[af]=Ontvang inkomende verbinding
-Comment[ar]=تم استلام اتصال وارد
-Comment[bg]=Получена е входяща връзка
-Comment[bs]=Primio dolaznu konekciju
-Comment[ca]=Rebuda connexió entrant
-Comment[cs]=Obdrženo příchozí spojení
-Comment[cy]=Derbynwyd cysylltiad a gyrhaeddodd
-Comment[da]=Modtog indkommende forbindelse
-Comment[de]=Verbindungsanfrage eingegangen
-Comment[el]=Λήψη εισερχόμενης σύνδεσης
-Comment[eo]=Ricevantaj envenantaj konektoj
-Comment[es]=Recibida conexión entrante
-Comment[et]=Saadi sissetulev ühendus
-Comment[fi]=Vastaanotettiin saapuva yhteys
 Comment[fr]=Reçu une connexion entrante
-Comment[gl]=Recibíuse unha conexión entrante
-Comment[he]=נתקבל חיבור נכנס
-Comment[hi]=आवक कनेक्शन प्राप्त
-Comment[hr]=Primio dolaznu vezu
-Comment[hu]=Csatlakozási kérés érkezett
-Comment[it]=Connessione in entrata stabilita
-Comment[ja]=着信した外部からの接続
-Comment[lt]=Gautas įeinantis prisijungimas
-Comment[mn]=Орж ирсэн Холболтыг хүлээн авав
-Comment[ms]=Menerima sambungan masuk
-Comment[mt]=Irċevejt konnessjoni dieħla
-Comment[nb]=Motta innkommende forbindelse
-Comment[nl]=Ontving een inkomende verbinding
-Comment[nn]=Motta innkomande samband
-Comment[nso]=Kopantsho yeo e amogetswego ya tseo di tsenago
-Comment[pl]=Otrzymano połącznie przychodzące
-Comment[pt]=Foi recebida uma ligação
-Comment[pt_BR]=Recebendo conexão de entrada
-Comment[ro]=Conexiune de intrare recepţionată
-Comment[ru]=Входящее соединение завершилось успешно
-Comment[sk]=Prijaté príchodzie spojenia
-Comment[sl]=Prejeta je prihajajoča povezava
-Comment[sr]=Примљена је долазећа веза
-Comment[sv]=Tar emot inkommande anslutning
-Comment[ta]=எதிர்பாராத இணைப்பு ஏற்க்கப்ப்ட்டது
-Comment[th]=ได้รับการเชื่อมต่อเข้ามา
-Comment[tr]=Gelen bağlantı alınıyor
-Comment[uk]=Отримано вхідне з'єднання
-Comment[ven]=Vhukwamani hau dzhena ho tanganedzhwaho
-Comment[xh]=Uxhulumano olungenayo olufunyenweyo
-Comment[xx]=xxReceived incoming connectionxx
-Comment[zh_CN]=收到进入的连接
-Comment[zh_TW]=已接收的進來的連線
-Comment[zu]=Ukuxhumanisa okungenayo okutholakele
+Comment[x-test]=xxReceived incoming connectionxx
 default_presentation=4
 
 [ProcessFailed]
 Name=ProcessFailed
-Name[ar]=فشلت العملية
-Name[bg]=Процесът се провали
-Name[ca]=Procés fallit
-Name[cs]=Proces selhal
-Name[cy]=MethoddProses
-Name[da]=ProcesMislykkedes
-Name[de]=Prozess fehlgeschlagen
-Name[el]=Η επεξεργασία απέτυχε
-Name[eo]=ProcezoFiaskis
-Name[es]=Proceso fallido
-Name[et]=Protsess ebaõnnestus
-Name[fi]=Prosessi epäonnistui
 Name[fr]=Échec du processus
-Name[gl]=Proceso fallido
-Name[he]=תהליך נכשל
-Name[hi]=प्रक्रिया-असफल
-Name[hr]=ProcesNeuspješan
-Name[hu]=Hibás folyamat
-Name[it]=Processo fallito
-Name[ja]=プロセス失敗
-Name[lt]=Procesas nepavyko
-Name[mn]=Ажиллагаа сүйрэв
-Name[ms]=Proses Gagal
-Name[mt]=ProċessFalla
-Name[nb]=Prosess mislyktes
-Name[nl]=Proces faalde
-Name[nn]=Prosess mislukkast
-Name[nso]=Tiragalo e Paletswe
-Name[pl]=Błąd procesu
-Name[pt_BR]=Falha de Processo
-Name[ro]=Proces eşuat
-Name[ru]=Ошибка процесса
-Name[se]=Proseassa filtii
-Name[sk]=Proces neúspešny
-Name[sl]=Proces ni uspel
-Name[sr]=Процес није успео
-Name[sv]=Process misslyckades
-Name[ta]=செயல் தோல்வியுற்றது
-Name[th]=โปรเซสล้มเหลว
-Name[uk]=ПомилкаПроцесу
-Name[ven]=Tshitenwa tsho bala
-Name[xh]=Inkqubo Yahlulekile
-Name[xx]=xxProcessFailedxx
-Name[zh_CN]=处理失败
-Name[zh_TW]=程序失敗
-Name[zu]=UkwenzekaKuhlulekile
+Name[x-test]=xxProcessFailedxx
 Comment=Could not call process to handle connection
-Comment[af]=Kon nie roep proses na handvatsel verbinding
-Comment[ar]=لم أستطع استحضار العملية لحمل المكالمة
-Comment[bg]=Процесът за обработка на входящи връзки не може да бъде стартиран
-Comment[bs]=Ne mogu pokrenuti proces koji upravlja konekcijom
-Comment[ca]=No es pot cridar al procés per a manejar la connexió
-Comment[cs]=Nelze spustit proces k obsluze spojení
-Comment[cy]=Methu galw proses i drin y cysylltiad
-Comment[da]=Kunne ikke kalde proces til at håndtere forbindelse
-Comment[de]=Der Prozess zur Bearbeitung der Verbindungsanfrage wurde nicht gefunden
-Comment[el]=Δεν ήταν δυνατή η κλήση της διεργασίας για τον έλεγχο της σύνδεσης
-Comment[eo]=Ne eblis lanĉi instancon por prizorgi la konekton
-Comment[es]=Imposible lanzar proceso para manejar conexión
-Comment[et]=Ei suuda käivitada protsessi ühenduse käsitsemiseks
-Comment[fi]=Ei voitu kutsua prosessia yhteyden hoitamiseksi
 Comment[fr]=Impossible d'appeler le processus pour gérer la connexion
-Comment[gl]=Non se puidcho chamar ó proceso para que atendese á conexión
-Comment[he]=אין אפשרות לקרוא לתהליך על מנת לטפל בחיבור
-Comment[hi]=कनेक्शन हैंडल करने हेतु प्रक्रिया काल नहीं कर सका
-Comment[hr]=Nisam mogao pozvati proces za kontrolu veze
-Comment[hu]=A kapcsolat kezelése nem sikerült
-Comment[it]=Impossibile richiamare il processo per gestire la connessione
-Comment[ja]=接続を扱うプロセスを呼び出せません
-Comment[lt]=Negaliu iškviesti proceso prisijungimui apdoroti
-Comment[mn]=Холболтыг заах ажиллагаагдуудаж чадаагүй
-Comment[ms]=Tidak dapat memanggil proses untuk mengendalikan sambungan
-Comment[mt]=Ma stajtx insejjaħ proċess biex jieħu ħsieb il-konnessjoni
-Comment[nb]=Kunne ikke kalle en prosess for å håndtere forbindelsen
-Comment[nl]=Het proces om de verbinding af te handelen kon niet worden aangeroepen
-Comment[nn]=Klarte ikkje kalla prosess for sambandshandtering
-Comment[nso]=Ebe ekase bitse tiragalo go swara kopantsho
-Comment[pl]=Nie można było uruchomić procesu obsługi połączenia
-Comment[pt]=Não foi possível chamar o processo de tratamento da ligação
-Comment[pt_BR]=Não foi possível chamar o processo de controle da conexão
-Comment[ru]=Не удается запустить процесс обработки соединения
-Comment[sk]=Nemohol som zavolať proces pre spracovanie spojenia
-Comment[sl]=Ni možno poklicati procesa za upravljanje s povezavo
-Comment[sr]=Нисам могао да позовем процес да опслужи везу
-Comment[sv]=Kunde inte anropa process för att hantera anslutning
-Comment[ta]=இணைப்பை கையாள செயற்பாட்டை அழைக்க முடியவில்லை
-Comment[th]=ไม่สามารถเรียกโปรเซสเพื่อรับการเชื่อมต่อได้
-Comment[uk]=Неможливо викликати процес для обробки з'єднання
-Comment[ven]=Ingasi vhidze tshitenwa uitela u fara vhukwamani
-Comment[xh]=Ayikwazanga ukubiza inkqubo ezakuphatha uxhulumano
-Comment[xx]=xxCould not call process to handle connectionxx
-Comment[zh_CN]=无法调用进程处理连接
-Comment[zh_TW]=無法呼叫處理連線的程序
-Comment[zu]=Ayikwazanga ukubiza umsebenzi ukuzophatha ukuxhumanisa
+Comment[x-test]=xxCould not call process to handle connectionxx
 default_presentation=4

kinetd/kinetd.cpp

@@ -27,11 +27,14 @@
 #include <kstandarddirs.h>
 #include <kconfig.h>
 #include <knotifyclient.h>
-#include <ksockaddr.h>
+#include <ksocketaddress.h>
 #include <kextsock.h>
 #include <klocale.h>
 #include <kglobal.h>
 
+#include <unistd.h>
+#include <fcntl.h>
+
 PortListener::PortListener(KService::Ptr s,
 			   KConfig *config,
 			   KServiceRegistry *srvreg) :
@@ -39,7 +42,8 @@ PortListener::PortListener(KService::Ptr s,
 	m_serviceRegistered(false),
 	m_socket(0),
 	m_config(config),
-	m_srvreg(srvreg)
+	m_srvreg(srvreg),
+	m_dnssdreg(0)
 {
 	m_uuid = createUUID();
 	loadConfig(s);
@@ -61,7 +65,7 @@ bool PortListener::acquirePort() {
 	while (!m_socket->bindAndListen()) {
 		m_port++;
 		if (m_port >= (m_portBase+m_autoPortRange)) {
-			kdDebug() << "Kinetd cannot load service "<<m_serviceName
+			kDebug() << "Kinetd cannot load service "<<m_serviceName
 				  <<": unable to get port" << endl;
 			m_port = -1;
 			delete m_socket;
@@ -75,8 +79,11 @@ bool PortListener::acquirePort() {
 		SLOT(accepted(KSocket*)));
 
 	bool s = m_registerService;
+	bool sd =m_dnssdRegister;
 	setServiceRegistrationEnabledInternal(false);
+	dnssdRegister(false);
 	setServiceRegistrationEnabledInternal(s);
+	dnssdRegister(sd);
 	return true;
 }
 
@@ -86,17 +93,18 @@ void PortListener::freePort() {
 		delete m_socket;
 	m_socket = 0;
 	setServiceRegistrationEnabledInternal(m_registerService);
+	dnssdRegister(false);
 }
 
 void PortListener::loadConfig(KService::Ptr s) {
 	m_valid = true;
 	m_autoPortRange = 0;
 	m_enabled = true;
-	m_argument = QString::null;
+	m_argument.clear();
 	m_multiInstance = false;
 
 	QVariant vid, vport, vautoport, venabled, vargument, vmultiInstance, vurl,
-	  vsattributes, vslifetime;
+	  vsattributes, vslifetime, vdname, vdtype, vddata;
 
 	m_execPath = s->exec().utf8();
 	vid = s->property("X-KDE-KINETD-id");
@@ -108,16 +116,19 @@ void PortListener::loadConfig(KService::Ptr s) {
 	vurl = s->property("X-KDE-KINETD-serviceURL");
 	vsattributes = s->property("X-KDE-KINETD-serviceAttributes");
 	vslifetime = s->property("X-KDE-KINETD-serviceLifetime");
+	vdname = s->property("X-KDE-KINETD-DNSSD-Name");
+	vdtype = s->property("X-KDE-KINETD-DNSSD-Type");
+	vddata = s->property("X-KDE-KINETD-DNSSD-Properties");
 
 	if (!vid.isValid()) {
-		kdDebug() << "Kinetd cannot load service "<<m_serviceName
+		kDebug() << "Kinetd cannot load service "<<m_serviceName
 			  <<": no id set" << endl;
 		m_valid = false;
 		return;
 	}
 
 	if (!vport.isValid()) {
-		kdDebug() << "Kinetd cannot load service "<<m_serviceName
+		kDebug() << "Kinetd cannot load service "<<m_serviceName
 			  <<": invalid port" << endl;
 		m_valid = false;
 		return;
@@ -141,7 +152,7 @@ void PortListener::loadConfig(KService::Ptr s) {
 		m_registerService = true;
 	}
 	else {
-		m_serviceURL = QString::null;
+		m_serviceURL.clear();
 		m_registerService = false;
 	}
 	if (vsattributes.isValid()) {
@@ -149,24 +160,42 @@ void PortListener::loadConfig(KService::Ptr s) {
 	}
 	else
 		m_serviceAttributes = "";
+	if (vddata.isValid()) {
+		QStringList attrs = vddata.toStringList();
+		for (QStringList::iterator it=attrs.begin();
+		it!=attrs.end();it++) {
+		    QString key = (*it).section('=',0,0);
+		    QString value =  processServiceTemplate((*it).section('=',1))[0];
+		    if (!key.isEmpty()) m_dnssdData[key]=value;
+		    }
+	}
+	if (vdname.isValid() && vdtype.isValid()) {
+		m_dnssdName = processServiceTemplate(vdname.toString())[0];
+		m_dnssdType = vdtype.toString();
+		m_dnssdRegister = true;
+		kDebug() << "DNS-SD register is enabled\n";
+	}
+	else
+	        m_dnssdRegister = false;
+
 
 	m_slpLifetimeEnd = QDateTime::currentDateTime().addSecs(m_serviceLifetime);
 	m_defaultPortBase = m_portBase;
 	m_defaultAutoPortRange = m_autoPortRange;
 
 	m_config->setGroup("ListenerConfig");
-	m_enabled = m_config->readBoolEntry("enabled_" + m_serviceName,
+	m_enabled = m_config->readEntry("enabled_" + m_serviceName,
 					    m_enabled);
-	m_portBase = m_config->readNumEntry("port_base_" + m_serviceName,
+	m_portBase = m_config->readEntry("port_base_" + m_serviceName,
 					    m_portBase);
-	m_autoPortRange = m_config->readNumEntry("auto_port_range_" + m_serviceName,
+	m_autoPortRange = m_config->readEntry("auto_port_range_" + m_serviceName,
 						 m_autoPortRange);
 	QDateTime nullTime;
 	m_expirationTime = m_config->readDateTimeEntry("enabled_expiration_"+m_serviceName,
 						     &nullTime);
 	if ((!m_expirationTime.isNull()) && (m_expirationTime < QDateTime::currentDateTime()))
 		m_enabled = false;
-	m_registerService = m_config->readBoolEntry("enabled_srvreg_"+m_serviceName,
+	m_registerService = m_config->readEntry("enabled_srvreg_"+m_serviceName,
 						     m_registerService);
 }
 
@@ -179,7 +208,7 @@ void PortListener::accepted(KSocket *sock) {
 	}
 	KExtendedSocket::resolve(ksa, host, port);
 	KNotifyClient::event("IncomingConnection",
-		i18n("Connection from %1").arg(host));
+		i18n("Connection from %1", host));
 	delete ksa;
 
 	if ((!m_enabled) ||
@@ -188,13 +217,16 @@ void PortListener::accepted(KSocket *sock) {
 		return;
 	}
 
+	// disable CLOEXEC flag, fixes #77412
+	fcntl(sock->socket(), F_SETFD, fcntl(sock->socket(), F_GETFD) & ~FD_CLOEXEC);
+
 	m_process.clearArguments();
 	m_process << m_execPath << m_argument << QString::number(sock->socket());
 	if (!m_process.start(KProcess::DontCare)) {
 		KNotifyClient::event("ProcessFailed",
-			i18n("Call \"%1 %2 %3\" failed").arg(m_execPath)
-				.arg(m_argument)
-				.arg(sock->socket()));
+			i18n("Call \"%1 %2 %3\" failed", m_execPath,
+				 m_argument,
+				 sock->socket()));
 	}
 
 	delete sock;
@@ -275,6 +307,7 @@ void PortListener::setEnabledInternal(bool e, const QDateTime &ex) {
 		if (m_port < 0)
 			acquirePort();
 		m_enabled = m_port >= 0;
+
 	}
 	else {
 		freePort();
@@ -292,6 +325,7 @@ bool PortListener::isServiceRegistrationEnabled() {
 
 void PortListener::setServiceRegistrationEnabled(bool e) {
 	setServiceRegistrationEnabledInternal(e);
+	dnssdRegister(e && m_enabled);
 	m_config->setGroup("ListenerConfig");
 	m_config->writeEntry("enable_srvreg_" + m_serviceName, e);
 	m_config->sync();
@@ -316,7 +350,7 @@ void PortListener::setServiceRegistrationEnabledInternal(bool e) {
 				     *(it++),
 				     *(it2++),
 				     m_serviceLifetime))
-				 kdDebug(7021) << "Failure registering SLP service (no slpd running?)"<< endl;
+				 kDebug(7021) << "Failure registering SLP service (no slpd running?)"<< endl;
 		}
 		m_serviceRegistered = true;
 		// make lifetime 30s shorter, because the timeout is not precise
@@ -329,6 +363,23 @@ void PortListener::setServiceRegistrationEnabledInternal(bool e) {
 	}
 }
 
+void PortListener::dnssdRegister(bool e) {
+	if (m_dnssdName.isNull() || m_dnssdType.isNull())
+		return;
+	if (m_dnssdRegistered ==  e)
+		return;
+	if (e) {
+		m_dnssdRegistered=true;
+		m_dnssdreg = new DNSSD::PublicService(m_dnssdName,m_dnssdType,m_port);
+		m_dnssdreg->setTextData(m_dnssdData);
+		m_dnssdreg->publishAsync();
+	} else {
+		m_dnssdRegistered=false;
+		delete m_dnssdreg;
+		m_dnssdreg=0;
+	}
+}
+
 void PortListener::refreshRegistration() {
 	if (m_serviceRegistered && (m_slpLifetimeEnd.addSecs(-90) < QDateTime::currentDateTime())) {
 		setServiceRegistrationEnabledInternal(false);
@@ -363,7 +414,7 @@ KInetD::KInetD(QCString &n) :
 	m_config = new KConfig("kinetdrc");
 	m_srvreg = new KServiceRegistry();
 	if (!m_srvreg->available()) {
-		kdDebug(7021) << "SLP not available"<< endl;
+		kDebug(7021) << "SLP not available"<< endl;
 		delete m_srvreg;
 		m_srvreg = 0;
 	}
@@ -597,9 +648,10 @@ KInetD::~KInetD() {
 }
 
 extern "C" {
-	KDEDModule *create_kinetd(QCString &name)
+	KDE_EXPORT KDEDModule *create_kinetd(const DCOPCString &name)
 	{
-        KGlobal::locale()->insertCatalogue("kinetd");
+        KGlobal::locale()->insertCatalog("kinetd");
 		return new KInetD(name);
 	}
 }
+

kinetd/kinetd.desktop

@@ -9,99 +9,8 @@ X-KDE-FactoryName=kinetd
 X-KDE-Kded-autoload=true
 
 Name=KDE Internet Daemon
-Name[af]=Kde Internet Bediener
-Name[ar]=مراقب انترنت كيدي
-Name[bg]=Интернет демон за КДЕ
-Name[ca]=Dimoni d'Internet per al KDE
-Name[cs]=KDE Internet démon
-Name[cy]=Daemon Rhyngrwyd KDE
-Name[da]=KDE Internet-dæmon
-Name[de]=KDE Internet-Dämon
-Name[el]=Δαίμονας διαδικτύου για το KDE
-Name[eo]=Retodemono
-Name[es]=Demonio de Internet de KDE
-Name[et]=KDE internetideemon
-Name[fi]=KDE Internet palvelin
 Name[fr]=Démon Internet de KDE
-Name[gl]=O demo de Internet de KDE
-Name[he]=תהליך הרקע האינטרנטי של KDE
-Name[hi]=केडीई इंटरनेट डेमन
-Name[hu]=KDE internetes szolgáltatás
-Name[it]=Demone internet di KDE
-Name[ja]=KDE インターネットデーモン
-Name[lt]=KDE Interneto tarnyba
-Name[mn]=KDE Интернет-демон
-Name[ms]=Daemon Internet KDE
-Name[mt]=Daemon tal-internet KDE
-Name[nb]=KDEs Internett-nisse
-Name[nn]=KDE-Internett-nisse
-Name[nso]=Daemon ya Internet ya KDE
-Name[pl]=Demon internetowy KDE
-Name[pt]=Servidor de Internet do KDE
-Name[pt_BR]=Servidor Internet do do KDE
-Name[ro]=Demon internet KDE
-Name[ru]=Интернет-демон KDE
-Name[se]=KDE-Interneahtta-duogášprográmma
-Name[sk]=KDE Internet démon
-Name[sl]=Internetni strežnik za KDE
-Name[sr]=KDE-ов интернет демон
-Name[sv]=KDE:s Internetdemon
-Name[ta]=KDE இணைய டேமொன்
-Name[th]=เดมอนอินเตอร์เน็ต KDE
-Name[tr]=KDE İnternet Programı
-Name[uk]=Демон Інтернет KDE
-Name[uz]=KDE Интернет демони
-Name[xx]=xxKDE Internet Daemonxx
-Name[zh_CN]=KDE Internet 守护进程
-Name[zh_TW]=KDE Internet 伺服程式
-Name[zu]=KDE Internet ye-Daemon
+Name[x-test]=xxKDE Internet Daemonxx
 Comment=An Internet daemon that starts network services on demand
-Comment[ar]=مراقب انترنت يقوم ببدء خدمات الشبكة عند الطلب
-Comment[bg]=Интернет демон, който служи за стартиране на мрежови услуги при поискване
-Comment[bs]=Internet daemon koji pokreće mrežne servise po potrebi
-Comment[ca]=Un dimoni d'Internet que arrenca els serveis de xarxa sota demanda
-Comment[cs]=Internetový démon spouštějící síťové služby na požádání
-Comment[cy]=Daemon Rhyngrwyd sy'n cychwyn gwasanaethau rhwydwaith ar alw
-Comment[da]=En internet-dæmon der starter netværkstjenester efter forespørgsel
-Comment[de]=Ein Internet-Dämon, der Netzwerkdienste bei Bedarf startet
-Comment[el]=Ένας δαίμονας για το διαδίκτυο ο οποίος ξεκινάει τις υπηρεσίες δικτύου βάση αίτησης
-Comment[eo]=retdemono kiu lanĉas retajn servojn laŭ bezono
-Comment[es]=Un demonio de Internet que inicia los servicios de red a demanda
-Comment[et]=Internetideemon, mis käivitab nõudmisel võrguteenused
-Comment[fi]=Internet palvelin, joka käynnistää verkkopalveluita
 Comment[fr]=Un démon Internet qui démarre le service réseau à la demande
-Comment[gl]=Un demo de Internet que comenza servicios de rede según demanda
-Comment[he]=תהליך רקע של אינטרנט שמתחיל שירותי רשת לפי דרישה
-Comment[hi]=एक इंटरनेट डेमन जो मांग पर नेटवर्क सेवा प्रारंभ करता है
-Comment[hr]=Internet daemon koji pokreće mrežne usluge kada su zatražene
-Comment[hu]=A hálózati szolgáltatások vezérlését biztosító program
-Comment[it]=Un demone internet che avvia i servizi di rete a richiesta
-Comment[ja]=要求時にネットワークサービスを起動するインターネットデーモン
-Comment[lt]=Interneto tarnyba, paleidžianti tinklo tarnybas esant poreikiui
-Comment[mn]=Сүлжээ-үйлчилгээний эрэлтээр ассан Сүлжээний демон
-Comment[ms]=Daemon Internet yang memulakan servis jaringan di atas permintaan
-Comment[mt]=Proċess tal-internet li jħaddem servizzi skond il-bżonn
-Comment[nb]=Internett-nisse som starter nettverkstjenester ved behov
-Comment[nl]=Een Internetdaemon die netwerkdiensten op afroep start
-Comment[nn]=Internett-nisse som startar nettverkstenester når dei trengst
-Comment[nso]=Daemon ya Internet yeo e thomisago ditirelo tsa kgokagano ge e nyakilwe
-Comment[pl]=Demon internetowy, który uruchamia na żądanie usługi sieciowe
-Comment[pt]=Um servidor da Internet que inicia os serviços de rede a pedido
-Comment[pt_BR]=Um servidor Internet que inicia os serviços de rede por demanda
-Comment[ro]=Un demone internet care porneşte serviciile de reţea la cerere
-Comment[ru]=Сетевой демон, запускающий серверы по запросу из сети
-Comment[se]=Interneahtta-duogášprográmma mii álggaha fierpmádatbálvalusaid go dárbbašuvvo
-Comment[sk]=Internetový démon ktorý spúšťa sieťové služby na požiadanie
-Comment[sl]=Internetni strežnik, ki zažene omrežne storitve na zahtevo
-Comment[sr]=Интернет демон који покреће мрежне сервисе по захтеву
-Comment[sv]=Internetdemon som startar nätverkstjänster vid behov
-Comment[ta]=ஒரு இணைய டேமொன், டேமொன் பிணைய சேவையை ஆரம்பிகிறது
-Comment[th]=เดมอนอินเตอร์เน็ตซึ่งจะเริ่มทำงานบริการเครือข่ายเมื่อมีความต้องการ
-Comment[uk]=Демон Інтернет, що запускає служби мережі при запиті
-Comment[uz]=Талаб қилинганда тармоқ хизматларини ишга тушурувчи Интернет демони
-Comment[ven]=Internet daemon ine ya thoma tshumelo ya vhukwamani kha muthetho
-Comment[xh]=Internet daemon eqala iinkonzo zomsebenzi wonatha xa zifunwa
-Comment[xx]=xxAn Internet daemon that starts network services on demandxx
-Comment[zh_CN]=按需启动网络服务的守护进程
-Comment[zh_TW]=依要求起動網路服務的 Internet 伺服程式
-Comment[zu]=I-Internet ye-daemon eqala ama-sevisi we-network adingekayo
+Comment[x-test]=xxAn Internet daemon that starts network services on demandxx

kinetd/kinetd.h

@@ -27,7 +27,8 @@
 #include <qstring.h>
 #include <qdatetime.h>
 #include <qtimer.h>
-
+#include <dnssd/publicservice.h>
+#include <q3ptrlist.h>
 #include "kserviceregistry.h"
 
 class PortListener : public QObject {
@@ -37,6 +38,8 @@ private:
 	QString m_serviceName;
 	QString m_serviceURL, m_serviceAttributes;
 	QStringList m_registeredServiceURLs;
+	QString m_dnssdName, m_dnssdType;
+	QMap<QString,QString> m_dnssdData;
 	int m_serviceLifetime;
 	int m_port;
 	int m_portBase, m_autoPortRange;
@@ -46,6 +49,7 @@ private:
 	QString m_argument;
 	bool m_enabled;
 	bool m_serviceRegistered, m_registerService;
+	bool m_dnssdRegister, m_dnssdRegistered;
 	QDateTime m_expirationTime;
 	QDateTime m_slpLifetimeEnd;
 	QString m_uuid;
@@ -55,10 +59,12 @@ private:
 
 	KConfig *m_config;
 	KServiceRegistry *m_srvreg;
+	DNSSD::PublicService *m_dnssdreg;
 
 	void freePort();
 	void loadConfig(KService::Ptr s);
 	void setEnabledInternal(bool e, const QDateTime &ex);
+	void dnssdRegister(bool enabled);
 	void setServiceRegistrationEnabledInternal(bool enabled);
 
 public:
@@ -130,8 +136,8 @@ k_dcop:
 
 	/**
 	 * Sets the port of the service, and possibly a range of ports to try.
-	 * It will return true if a port could be found. If it didnt find one but is
-	 * enabled it will start a timer that probes that port every 30s.
+	 * It will return true if a port could be found. If it did not find one
+	 * but is enabled it will start a timer that probes that port every 30s.
 	 * @param service name of a service as specified in its .desktop file
 	 * @param port the first port number to try or -1 to restore defaults
 	 * @param autoPortRange the number of ports to try
@@ -172,7 +178,7 @@ k_dcop:
 
 	KConfig *m_config;
 	KServiceRegistry *m_srvreg;
-	QPtrList<PortListener> m_portListeners;
+	Q3PtrList<PortListener> m_portListeners;
 	QTimer m_expirationTimer;
 	QTimer m_portRetryTimer;
 	QTimer m_reregistrationTimer;
@@ -184,7 +190,7 @@ k_dcop:
 	void reregistrationTimer();
 
  public:
-	KInetD(QCString &n);
+	KInetD(const DCOPCString &n);
 	virtual ~KInetD();
 	void loadServiceList();
 	PortListener *getListenerByName(QString name);

kinetd/kinetdmodule.desktop

@@ -4,53 +4,8 @@
 Type=ServiceType
 X-KDE-ServiceType=KInetDModule
 Name=KInetD Module Type
-Name[ar]=KInetD نوع وحدة
-Name[bg]=Модул на KInetD
-Name[bs]=KInetD tip modula
-Name[ca]=Tipus de mòdul del KInetD
-Name[cs]=Typ modulu KInetD
-Name[cy]=Math Modiwl KInetD
-Name[da]=KInetD-modultype
-Name[de]=KInetD Modultyp
-Name[eo]=KInetD-modulotipo
-Name[es]=Tipo de módulo KInetD
-Name[et]=KInetD mooduli tüüp
-Name[fi]=KInetD moduulityyppi
 Name[fr]=Type de module de KInetD
-Name[gl]=Tipo de módulo KInetD
-Name[he]=סוג מודול של KInetD
-Name[hi]=के-इनिट-डी मॉड्यूल प्रकार
-Name[hr]=Tip KInetD Modula
-Name[hu]=KInetD modultípus
-Name[it]=Tipo modulo KInetD
-Name[ja]=KInetD モジュールタイプ
-Name[lt]=KInetD modulio tipas
-Name[mn]=Модуль KInetD
-Name[ms]=Jenis Modul KInetD
-Name[mt]=Tip ta' modulu KInetD
-Name[nb]=KInetd-programtillegstype
-Name[nl]=KInetD-moduletype
-Name[nn]=KInetD-programtilleggstype
-Name[nso]=Mohuta wa Seripa sa KInetD
-Name[pl]=Typ modułu KInetD
-Name[pt]=Tipo de Módulo do KInetD
-Name[pt_BR]=Módulo KInetD
-Name[ro]=Tip modul KInetD
-Name[ru]=Модуль KInetD
-Name[se]=KInetD-moduvlašládja
-Name[sk]=Typ modulu KInetD
-Name[sl]=Vrsta modula KInetD
-Name[sr]=KInetD врста модула
-Name[sv]=Kinetd-modultyp
-Name[ta]=KInetD கூறு வகை
-Name[tr]=KDED Modül Türü
-Name[uk]=Тип модулю KinetD
-Name[ven]=Lushaka lwa Modulu ya KInetD
-Name[xh]=Udidi Lomqongo womlinganiselo we KInetD
-Name[xx]=xxKInetD Module Typexx
-Name[zh_CN]=KInetD 模块类型
-Name[zh_TW]=KInetD 模組類型
-Name[zu]=KInetD Uhlobo Lokwenza
+Name[x-test]=xxKInetD Module Typexx
 
 # id to manipulate the service
 [PropertyDef::X-KDE-KINETD-id]
@@ -79,7 +34,7 @@ Type=QString
 [PropertyDef::X-KDE-KINETD-multiInstance]
 Type=bool
 
-# if set, kinetd will register the given URL at the local SLP SA while 
+# if set, kinetd will register the given URL at the local SLP SA while
 # the port is open. It will register one URL for each IP address of the
 # host.
 # The following strings will be substituted:
@@ -101,9 +56,31 @@ Type=QString
 [PropertyDef::X-KDE-KINETD-serviceAttributes]
 Type=QString
 
-# the lifetime of a service in seconds. kinets will renew the service 
+# the lifetime of a service in seconds. kinets will renew the service
 # automatically. Max 65535, never use anything under 2 min. Something like
 # 5-20 minutes is a sane value for most desktop applications.
 [PropertyDef::X-KDE-KINETD-serviceLifetime]
 Type=int
 
+# if set, kinetd will announce service with given name on local network while
+# the port is open.
+# The following strings will be substituted:
+# %h with the local IP address
+# %f with the user's full name
+# %p with the port number
+
+[PropertyDef::X-KDE-KINETD-DNSSD-Name]
+Type=QString
+
+# if kinetd announces service on network using DNS-SD, this string will be used as service
+# type. It must be in form _yourservice._udp or _yourservice._tcp
+# it uses the same substitution rules as X-KDE-KINETD-DNSSD-Name
+
+[PropertyDef::X-KDE-KINETD-DNSSD-Type]
+Type=QString
+
+# defines list of text properties for service announced via DNS-SD
+# it uses the same substitution rules as X-KDE-KINETD-DNSSD-Name
+[PropertyDef::X-KDE-KINETD-DNSSD-Properties]
+Type=QStringList
+

krfb/CMakeLists.txt

@@ -0,0 +1,79 @@
+project(krfb)
+
+include_directories( ${CMAKE_SOURCE_DIR}/krfb/libvncserver ${CMAKE_SOURCE_DIR}/krfb/srvloc  )
+
+
+########### next target ###############
+
+
+########### next target ###############
+
+set(krfb_SRCS 
+   rfbcontroller.cc 
+   xupdatescanner.cc 
+   main.cpp 
+   krfbifaceimpl.cc 
+   trayicon.cpp 
+   connectiondialog.cc )
+
+kde4_automoc(${krfb_SRCS})
+
+kde4_add_ui_files(krfb_SRCS connectionwidget.ui )
+
+kde4_add_dcop_skels(krfb_SRCS krfbiface.h )
+
+kde4_add_executable(krfb ${krfb_SRCS})
+
+target_link_libraries(krfb  ${KDE4_KIO_LIBS} krfbconfig vncserver srvloc Xtst )
+
+install(TARGETS krfb  DESTINATION ${BIN_INSTALL_DIR} )
+
+
+########### install files ###############
+
+install( FILES krfb.desktop  DESTINATION ${XDG_APPS_DIR})
+install( FILES eventsrc  DESTINATION ${DATA_INSTALL_DIR}/krfb)
+install( FILES eyes-open24.png eyes-closed24.png connection-side-image.png  DESTINATION ${DATA_INSTALL_DIR}/krfb/pics)
+install( FILES kinetd_krfb.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
+
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
+
+
+
+
+#original Makefile.am contents follow:
+
+#KDE_CXXFLAGS = $(USE_THREADS)
+#
+#METASOURCES = AUTO
+#
+#noinst_LTLIBRARIES = libkrfbconfig.la
+#libkrfbconfig_la_SOURCES = configuration.cc configuration.skel invitedialog.cc invitation.cc \
+#                           manageinvitations.ui personalinvitewidget.ui \
+#                           invitewidget.ui personalinvitedialog.cc
+#libkrfbconfig_la_LIBADD = ../srvloc/libsrvloc.la $(LIB_KDEUI)
+#
+#bin_PROGRAMS = krfb
+#krfb_SOURCES = rfbcontroller.cc xupdatescanner.cc main.cpp \
+#               connectionwidget.ui krfbifaceimpl.cc krfbiface.skel \
+#               trayicon.cpp connectiondialog.cc
+#krfb_LDADD   = libkrfbconfig.la ../libvncserver/libvncserver.la ../srvloc/libsrvloc.la -lXtst $(LIB_KDEUI) $(LIBJPEG) -lkio 
+#krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+#
+#appdatadir = $(kde_datadir)/krfb/pics
+#appdata_DATA = eyes-open24.png eyes-closed24.png connection-side-image.png
+#
+#kde_services_DATA = kinetd_krfb.desktop
+#
+#xdg_apps_DATA = krfb.desktop
+#
+#appdir = $(kde_datadir)/krfb
+#app_DATA = eventsrc
+#
+#KDE_ICON = krfb
+#
+#INCLUDES= -I$(top_srcdir)/krfb/libvncserver -I$(top_srcdir)/krfb/srvloc \
+#           $(all_includes)
+#
+#messages: rc.cpp
+#	$(XGETTEXT) rc.cpp *.cpp *.cc -o $(podir)/krfb.pot

krfb/Makefile.am

@@ -1,38 +0,0 @@
-KDE_CXXFLAGS = $(USE_THREADS)
-
-METASOURCES = AUTO
-
-noinst_LTLIBRARIES = libkrfbconfig.la
-libkrfbconfig_la_SOURCES = configuration.cc manageinvitations.ui \
-                           personalinvitation.ui invite.ui invitation.cc
-libkrfbconfig_la_LIBADD = ../srvloc/libsrvloc.la $(LIB_KDEUI)
-
-bin_PROGRAMS = krfb
-krfb_SOURCES = rfbcontroller.cc xupdatescanner.cc main.cpp \
-               newconnectiondialog.ui krfbifaceimpl.cc krfbiface.skel \
-               trayicon.cpp
-krfb_LDADD   = libkrfbconfig.la ../libvncserver/libvncserver.la ../srvloc/libsrvloc.la -lXtst $(LIB_KDEUI) $(LIBJPEG) 
-krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-krfb_COMPILE_FIRST = manageinvitations.h personalinvitation.h invite.h 
-
-noinst_HEADERS = configuration.h invitation.h invite.h krfbiface.h \
-                krfbifaceimpl.h rfbcontroller.h trayicon.h xupdatescanner.h
-
-
-appdatadir = $(kde_datadir)/krfb/pics
-appdata_DATA = eyes-open24.png eyes-closed24.png connection-side-image.png
-
-kde_services_DATA = kinetd_krfb.desktop
-
-xdg_apps_DATA = krfb.desktop
-
-appdir = $(kde_datadir)/krfb
-app_DATA = eventsrc
-
-KDE_ICON = krfb
-
-INCLUDES= -I$(top_srcdir)/krfb/libvncserver -I$(top_srcdir)/krfb/srvloc \
-           $(all_includes)
-
-messages: rc.cpp
-	$(XGETTEXT) rc.cpp *.cpp *.cc -o $(podir)/krfb.pot

krfb/Messages.sh

@@ -0,0 +1,2 @@
+#! /bin/sh
+$XGETTEXT rc.cpp *.cpp *.cc -o $podir/krfb.pot

krfb/configuration.cc

@@ -23,8 +23,9 @@
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
-#include <ksockaddr.h>
+#include <ksocketaddress.h>
 #include <kactivelabel.h>
+#include <ktoolinvocation.h>
 
 #include <qdatastream.h>
 #include <dcopclient.h>
@@ -35,6 +36,8 @@
 #include <qlineedit.h>
 #include <qcheckbox.h>
 
+#include <krun.h>
+
 /**
  * Note that this class is used and provides GUI in every mode:
  * - for the invitation dialogs
@@ -44,8 +47,8 @@
 Configuration::Configuration(krfb_mode mode) :
 	m_mode(mode),
 	invMngDlg(0, 0, true),
-	invDlg(0, 0, true),
-	persInvDlg(0, 0, true),
+	invDlg(0, "InviteDialog"),
+	persInvDlg(0, "PersonalInviteDialog"),
 	portNum(-1),
 	kinetdRef("kded", "kinetd")
 {
@@ -54,23 +57,26 @@ Configuration::Configuration(krfb_mode mode) :
 	saveToDialogs();
 	doKinetdConf();
 
+    connectDCOPSignal( 0, "KRFB::ConfigChanged", "KRFB_ConfigChanged()",
+						"updateKConfig()", false );
 	connect(invMngDlg.newPersonalInvitationButton, SIGNAL(clicked()),
 		SLOT(showPersonalInvitationDialog()));
 	connect(invMngDlg.newEmailInvitationButton, SIGNAL(clicked()), SLOT(inviteEmail()));
 	connect(invMngDlg.deleteOneButton, SIGNAL(clicked()), SLOT(invMngDlgDeleteOnePressed()));
 	connect(invMngDlg.deleteAllButton, SIGNAL(clicked()), SLOT(invMngDlgDeleteAllPressed()));
-	invMngDlg.listView->setSelectionMode(QListView::Extended);
+	invMngDlg.listView->setSelectionMode(Q3ListView::Extended);
 	invMngDlg.listView->setMinimumSize(QSize(400, 100)); // QTs size is much to small
 
-	connect(invDlg.createInvitationButton, SIGNAL(clicked()),
+	connect(&invDlg, SIGNAL(createInviteClicked()),
 		SLOT(showPersonalInvitationDialog()));
-	connect(invDlg.createInvitationEMailButton, SIGNAL(clicked()),
+	connect(&invDlg, SIGNAL(emailInviteClicked()),
 		SLOT(inviteEmail()));
-	connect(invDlg.manageInvitationsButton, SIGNAL(clicked()),
+	connect(&invDlg, SIGNAL(manageInviteClicked()),
 		SLOT(showManageInvitationsDialog()));
-	connect(invDlg.configurationButton, SIGNAL(clicked()),
+	connect(&invDlg, SIGNAL(configureClicked()),
 		SLOT(showConfigurationModule()));
-	connect(this, SIGNAL(invitationNumChanged(int)), this, SLOT(changeInvDlgNum(int)));
+	connect(this, SIGNAL(invitationNumChanged(int)),
+		&invDlg, SLOT(setInviteCount(int)));
 	connect(this, SIGNAL(invitationNumChanged(int)),
 		&invMngDlg, SLOT(listSizeChanged(int)));
         emit invitationNumChanged(invitationList.size());
@@ -83,6 +89,11 @@ Configuration::~Configuration() {
         save();
 }
 
+void Configuration::updateKConfig()
+{
+    loadFromKConfig();
+}
+
 void Configuration::setKInetdEnabled(bool enabled) {
 	kinetdRef.send("setEnabled", QString("krfb"), enabled);
 	kinetdRef.send("setEnabled", QString("krfb_httpd"), enabled);
@@ -114,7 +125,7 @@ void Configuration::setKInetdPort(int p) {
 }
 
 
-void Configuration::removeInvitation(QValueList<Invitation>::iterator it) {
+void Configuration::removeInvitation(QList<Invitation>::iterator it) {
 	invitationList.remove(it);
 	save();
 }
@@ -130,7 +141,7 @@ void Configuration::doKinetdConf() {
 	}
 
 	QDateTime lastExpiration;
-	QValueList<Invitation>::iterator it = invitationList.begin();
+	QList<Invitation>::iterator it = invitationList.begin();
 	while (it != invitationList.end()) {
 		Invitation &ix = (*it);
 		QDateTime t = ix.expirationTime();
@@ -152,13 +163,13 @@ void Configuration::doKinetdConf() {
 void Configuration::loadFromKConfig() {
 
 	KConfig c("krfbrc");
-	allowUninvitedFlag = c.readBoolEntry("allowUninvited", false);
-	enableSLPFlag = c.readBoolEntry("enableSLP", true);
-	askOnConnectFlag = c.readBoolEntry("confirmUninvitedConnection", true);
-	allowDesktopControlFlag = c.readBoolEntry("allowDesktopControl", false);
-	preferredPortNum = c.readNumEntry("preferredPort", -1);
-	disableBackgroundFlag = c.readBoolEntry("disableBackground", false);
-	disableXShmFlag = c.readBoolEntry("disableXShm", false);
+	allowUninvitedFlag = c.readEntry("allowUninvited", false);
+	enableSLPFlag = c.readEntry("enableSLP", true);
+	askOnConnectFlag = c.readEntry("confirmUninvitedConnection", true);
+	allowDesktopControlFlag = c.readEntry("allowDesktopControl", false);
+	preferredPortNum = c.readEntry("preferredPort", -1);
+	disableBackgroundFlag = c.readEntry("disableBackground", false);
+	disableXShmFlag = c.readEntry("disableXShm", false);
 	if (c.hasKey("uninvitedPasswordCrypted"))
 		passwordString = cryptStr(c.readEntry("uninvitedPasswordCrypted", ""));
 	else
@@ -167,7 +178,7 @@ void Configuration::loadFromKConfig() {
 	unsigned int invNum = invitationList.size();
 	invitationList.clear();
 	c.setGroup("invitations");
-	int num = c.readNumEntry("invitation_num", 0);
+	int num = c.readEntry("invitation_num", 0);
 	for (int i = 0; i < num; i++)
 		invitationList.push_back(Invitation(&c, i));
 
@@ -203,11 +214,11 @@ void Configuration::saveToKConfig() {
 
 void Configuration::saveToDialogs() {
 	invalidateOldInvitations();
-	QValueList<Invitation>::iterator it = invitationList.begin();
+	QList<Invitation>::iterator it = invitationList.begin();
 	while (it != invitationList.end()) {
 		Invitation &inv = *(it++);
 		if (!inv.getViewItem())
-			inv.setViewItem(new KListViewItem(invMngDlg.listView,
+			inv.setViewItem(new K3ListViewItem(invMngDlg.listView,
 				inv.creationTime().toString(Qt::LocalDate),
 				inv.expirationTime().toString(Qt::LocalDate)));
 	}
@@ -232,7 +243,7 @@ Invitation Configuration::createInvitation() {
 }
 
 void Configuration::invalidateOldInvitations() {
-	QValueList<Invitation>::iterator it = invitationList.begin();
+	QList<Invitation>::iterator it = invitationList.begin();
 	while (it != invitationList.end()) {
 		if (!(*it).isValid())
 			it = invitationList.remove(it);
@@ -251,7 +262,7 @@ void Configuration::refreshTimeout() {
 
 QString Configuration::hostname() const
 {
-  	KInetSocketAddress *a = KInetInterface::getPublicInetAddress();
+		KNetwork::KInetSocketAddress *a = KInetInterface::getPublicInetAddress();
 	QString hostName;
 	if (a) {
 		hostName = a->nodeName();
@@ -288,7 +299,7 @@ QString Configuration::password() const {
 	return passwordString;
 }
 
-QValueList<Invitation> &Configuration::invitations() {
+QList<Invitation> &Configuration::invitations() {
 	return invitationList;
 }
 
@@ -359,10 +370,10 @@ void Configuration::showManageInvitationsDialog() {
 }
 
 void Configuration::invMngDlgDeleteOnePressed() {
-	QValueList<Invitation>::iterator it = invitationList.begin();
+	QList<Invitation>::iterator it = invitationList.begin();
 	while (it != invitationList.end()) {
 		Invitation &ix = (*it);
-		KListViewItem *iv = ix.getViewItem();
+		K3ListViewItem *iv = ix.getViewItem();
 		if (iv && iv->isSelected())
 			it = invitationList.remove(it);
 		else
@@ -388,10 +399,6 @@ void Configuration::showInvitationDialog() {
 	saveToKConfig();
 }
 
-void Configuration::changeInvDlgNum(int newNum) {
-	invDlg.manageInvitationsButton->setText( i18n("&Manage Invitations (%1)...").arg(newNum) );
-}
-
 ////////////// personal invitation dialog //////////////////////////
 
 void Configuration::showPersonalInvitationDialog() {
@@ -400,16 +407,15 @@ void Configuration::showPersonalInvitationDialog() {
 	save();
 	emit invitationNumChanged(invitationList.size());
 
-	invDlg.createInvitationButton->setEnabled(false);
+	invDlg.enableInviteButton(false);
 	invMngDlg.newPersonalInvitationButton->setEnabled(false);
 
-	persInvDlg.hostLabel->setText(QString("%1:%2").arg(hostname()).arg(port()));
-	persInvDlg.passwordLabel->setText(inv.password());
-	persInvDlg.expirationLabel->setText(
-		inv.expirationTime().toString(Qt::LocalDate));
+	persInvDlg.setHost(hostname(), port());
+	persInvDlg.setPassword(inv.password());
+	persInvDlg.setExpiration(inv.expirationTime());
 
 	persInvDlg.exec();
-	invDlg.createInvitationButton->setEnabled(true);
+	invDlg.enableInviteButton(true);
 	invMngDlg.newPersonalInvitationButton->setEnabled(true);
 }
 
@@ -419,7 +425,7 @@ void Configuration::inviteEmail() {
 	int r = KMessageBox::warningContinueCancel(0,
 	   i18n("When sending an invitation by email, note that everybody who reads this email "
 		"will be able to connect to your computer for one hour, or until the first "
-		"successful connection took place, whatever comes first. \n"
+		"successful connection took place, whichever comes first. \n"
 		"You should either encrypt the email or at least send it only in a "
 		"secure network, but not over the Internet."),
 						   i18n("Send Invitation via Email"),
@@ -433,10 +439,9 @@ void Configuration::inviteEmail() {
 	save();
 	emit invitationNumChanged(invitationList.size());
 
-	KApplication *app = KApplication::kApplication();
-	app->invokeMailer(QString::null, QString::null, QString::null,
+	KToolInvocation::invokeMailer(QString::null, QString::null, QString::null,
 		i18n("Desktop Sharing (VNC) invitation"),
-		i18n("You have been invited to a VNC session. If you have the KDE Remote "
+		ki18n("You have been invited to a VNC session. If you have the KDE Remote "
                      "Desktop Connection installed, just click on the link below.\n\n"
 		     "vnc://invitation:%1@%2:%3\n\n"
                      "Otherwise you can use any VNC client with the following parameters:\n\n"
@@ -448,23 +453,22 @@ void Configuration::inviteEmail() {
 		     "	http://%7:%8/\n"
 		     "\n"
 		     "For security reasons this invitation will expire at %9.")
-			.arg(inv.password())
-			.arg(hostname())
-			.arg(port())
-			.arg(hostname())
-			.arg(port())
-			.arg(inv.password())
-			.arg(hostname())
-			.arg(5800) // determine with dcop ... later ...
-			.arg(KGlobal::locale()->formatDateTime(inv.expirationTime())));
+			.subs(inv.password())
+			.subs(hostname())
+			.subs(port())
+			.subs(hostname())
+			.subs(port())
+			.subs(inv.password())
+			.subs(hostname())
+			.subs(5800) // determine with dcop ... later ...
+			.subs(KGlobal::locale()->formatDateTime(inv.expirationTime()))
+			.toString());
 }
 
 ////////////// invoke kcontrol module //////////////////////////
 
 void Configuration::showConfigurationModule() {
-	KProcess p;
-	p << "kcmshell" << "Network/kcmkrfb";
-	p.start(KProcess::DontCare);
+		KRun::run( "kcmshell kcmkrfb", KUrl::List() );
 }
 
 

krfb/configuration.h

@@ -21,8 +21,8 @@
 #include "invitation.h"
 
 #include "manageinvitations.h"
-#include "personalinvitation.h"
-#include "invite.h"
+#include "personalinvitedialog.h"
+#include "invitedialog.h"
 
 #include <dcopref.h>
 #include <kconfig.h>
@@ -31,6 +31,8 @@
 #include <qvalidator.h>
 #include <qstring.h>
 
+#include <dcopobject.h>
+
 enum krfb_mode {
 	KRFB_UNKNOWN_MODE = 0,
 	KRFB_KINETD_MODE,
@@ -44,11 +46,12 @@ enum krfb_mode {
  * standalone-config-dialog and all the invitation dialogs
  * @author Tim Jansen
  */
-class Configuration : public QObject {
+class Configuration : public QObject, public DCOPObject {
+		K_DCOP
    	Q_OBJECT
 public:
 	Configuration(krfb_mode mode);
-	~Configuration();
+	virtual ~Configuration();
 
 	krfb_mode mode() const;
 	bool askOnConnect() const;
@@ -72,8 +75,8 @@ public:
 	void save();
 	void update();
 
-	QValueList<Invitation> &invitations();
-	void removeInvitation(QValueList<Invitation>::iterator it);
+	QList<Invitation> &invitations();
+	void removeInvitation(QList<Invitation>::iterator it);
 signals:
 	void invitationFinished();
 	void invitationNumChanged(int num);
@@ -104,8 +107,8 @@ private:
 	krfb_mode m_mode;
 
 	ManageInvitationsDialog invMngDlg;
-	InvitationDialog invDlg;
-	PersonalInvitationDialog persInvDlg;
+	InviteDialog invDlg;
+	PersonalInviteDialog persInvDlg;
 	QTimer refreshTimer;
 
 	bool askOnConnectFlag;
@@ -118,17 +121,19 @@ private:
 	DCOPRef kinetdRef;
 
 	QString passwordString;
-	QValueList<Invitation> invitationList;
+	QList<Invitation> invitationList;
 
 	bool disableBackgroundFlag;
 	bool disableXShmFlag;
+
+k_dcop:
+    // Connected to the DCOP signal
+    void updateKConfig();	
 private slots:
         void refreshTimeout();
 
 	void invMngDlgDeleteOnePressed();
 	void invMngDlgDeleteAllPressed();
-
-	void changeInvDlgNum(int newNum);
 };
 
 #endif

krfb/connectiondialog.cc

@@ -0,0 +1,63 @@
+/* This file is part of the KDE project
+   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "connectiondialog.h"
+#include "connectionwidget.h"
+
+#include <qcheckbox.h>
+#include <qlabel.h>
+
+#include <kiconloader.h>
+#include <klocale.h>
+
+ConnectionDialog::ConnectionDialog( QWidget *parent, const char *name )
+    : KDialogBase( parent, name, true, i18n( "New Connection" ),
+                   Ok|Cancel, Cancel, true )
+{
+  m_connectWidget = new ConnectionWidget( this, "ConnectWidget" );
+  m_connectWidget->pixmapLabel->setPixmap(
+      UserIcon( "connection-side-image.png" ) );
+
+  KGuiItem accept = KStdGuiItem::ok();
+  accept.setText( i18n( "Accept Connection" ) );
+  setButtonOK( accept );
+
+  KGuiItem refuse = KStdGuiItem::cancel();
+  refuse.setText( i18n( "Refuse Connection" ) );
+  setButtonCancel( refuse );
+
+  setMainWidget( m_connectWidget );
+}
+
+void ConnectionDialog::setRemoteHost( const QString &host )
+{
+  m_connectWidget->remoteHost->setText( host );
+}
+
+void ConnectionDialog::setAllowRemoteControl( bool b )
+{
+  m_connectWidget->cbAllowRemoteControl->setChecked( b );
+}
+
+bool ConnectionDialog::allowRemoteControl()
+{
+  return m_connectWidget->cbAllowRemoteControl->isChecked();
+}
+
+#include "connectiondialog.moc"

krfb/connectiondialog.h

@@ -0,0 +1,44 @@
+/* This file is part of the KDE project
+   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef CONNECTIONDIALOG_H
+#define CONNECTIONDIALOG_H
+
+#include <kdialogbase.h>
+
+class ConnectionWidget;
+
+class ConnectionDialog : public KDialogBase
+{
+  Q_OBJECT
+
+  public:
+    ConnectionDialog( QWidget *parent, const char *name );
+    ~ConnectionDialog() {};
+
+    void setRemoteHost( const QString &host );
+    void setAllowRemoteControl( bool b );
+    bool allowRemoteControl();
+
+  protected:
+    ConnectionWidget *m_connectWidget;
+};
+
+#endif // CONNECTIONDIALOG_H
+

krfb/connectionwidget.ui

@@ -0,0 +1,211 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>ConnectionWidget</class>
+<widget class="QWidget">
+    <property name="name">
+        <cstring>NewConnectWidget</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>521</width>
+            <height>328</height>
+        </rect>
+    </property>
+    <grid>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>0</number>
+        </property>
+        <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>TextLabel5</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>1</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="font">
+                <font>
+                    <pointsize>13</pointsize>
+                    <bold>1</bold>
+                </font>
+            </property>
+            <property name="text">
+                <string>Attention</string>
+            </property>
+            <property name="indent">
+                <number>0</number>
+            </property>
+        </widget>
+        <widget class="QLabel" row="1" column="1" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>mainTextLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="lineWidth">
+                <number>-1</number>
+            </property>
+            <property name="margin">
+                <number>0</number>
+            </property>
+            <property name="midLineWidth">
+                <number>5</number>
+            </property>
+            <property name="text">
+                <string>Somebody is requesting a connection to your computer. Granting this will allow the remote user to watch your desktop. </string>
+            </property>
+            <property name="textFormat">
+                <enum>Qt::AutoText</enum>
+            </property>
+            <property name="alignment">
+                <set>Qt::AlignVCenter|Qt::AlignLeft</set>
+            </property>
+            <property name="wordWrap" >
+              <bool>true</bool>
+            </property>
+            <property name="indent">
+                <number>0</number>
+            </property>
+            <property name="wordwrap" stdset="0">
+            </property>
+        </widget>
+        <widget class="QLabel" row="0" column="0" rowspan="6" colspan="1">
+            <property name="name">
+                <cstring>pixmapLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>0</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>108</width>
+                    <height>318</height>
+                </size>
+            </property>
+            <property name="maximumSize">
+                <size>
+                    <width>108</width>
+                    <height>318</height>
+                </size>
+            </property>
+            <property name="frameShape">
+                <enum>WinPanel</enum>
+            </property>
+            <property name="frameShadow">
+                <enum>Sunken</enum>
+            </property>
+            <property name="lineWidth">
+                <number>0</number>
+            </property>
+            <property name="margin">
+                <number>0</number>
+            </property>
+            <property name="scaledContents">
+                <bool>true</bool>
+            </property>
+            <property name="indent">
+                <number>0</number>
+            </property>
+        </widget>
+        <widget class="QLabel" row="3" column="2">
+            <property name="name">
+                <cstring>remoteHost</cstring>
+            </property>
+            <property name="font">
+                <font>
+                    <bold>1</bold>
+                </font>
+            </property>
+            <property name="text">
+                <string>123.234.123.234</string>
+            </property>
+        </widget>
+        <widget class="QCheckBox" row="5" column="1" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>cbAllowRemoteControl</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>1</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="text">
+                <string>Allow remote user to &amp;control keyboard and mouse</string>
+            </property>
+            <property name="whatsThis" stdset="0">
+                <string>If you turn this option on, the remote user can enter keystrokes and use your mouse pointer. This gives them full control over your computer, so be careful. When the option is disabled the remote user can only watch your screen.</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="3" column="1">
+            <property name="name">
+                <cstring>TextLabel1</cstring>
+            </property>
+            <property name="font">
+                <font>
+                    <bold>1</bold>
+                </font>
+            </property>
+            <property name="text">
+                <string>Remote system:</string>
+            </property>
+        </widget>
+        <spacer row="4" column="1">
+            <property name="name">
+                <cstring>spacer23</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Minimum</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>84</height>
+                </size>
+            </property>
+        </spacer>
+        <spacer row="2" column="1">
+            <property name="name">
+                <cstring>spacer22</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Minimum</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>80</height>
+                </size>
+            </property>
+        </spacer>
+    </grid>
+</widget>
+<layoutdefaults spacing="6" margin="11"/>
+</UI>

krfb/eventsrc

@@ -1,954 +1,88 @@
 [!Global!]
 IconName=krfb
 Comment=Desktop Sharing
-Comment[af]=Werkskerm Deeling
-Comment[ar]=مشاركة سطح المكتب
-Comment[bg]=Споделяне на работно място
-Comment[bs]=Dijeljenje desktopa
-Comment[ca]=Compartició de l'escriptori
-Comment[cs]=Sdílení pracovní plochy
-Comment[cy]=Rhannu Penbwrdd
-Comment[da]=Skrivebordsdeling
-Comment[de]=Arbeitsfläche freigeben
-Comment[el]=Μοίρασμα επιφάνειας εργασίας
-Comment[eo]=Tabula fordonado
-Comment[es]=Compartición de escritorio
-Comment[et]=Töölaua jagamine
-Comment[fi]=Työpöydän jakaminen
 Comment[fr]=Partage du bureau
-Comment[gl]=Compartición do escritorio
-Comment[he]=שיתוף שולחנות עבודה
-Comment[hi]=डेस्कटॉप साझा
-Comment[hr]=Dijeljenje radne površine
-Comment[hu]=Munkaasztal-megosztás
-Comment[it]=Condivisione desktop
-Comment[ja]=デスクトップ共有
-Comment[lt]=Dalinimasis darbastaliu
-Comment[mn]=Ажлын байрыг хамтран эзэмших
-Comment[ms]=Perkongsian Ruang Kerja
-Comment[mt]=Qsim tad-desktop
-Comment[nb]=Skrivebordsdeling
-Comment[nl]=Bureaubladvrijgave
-Comment[nn]=Skrivebordsdeling
-Comment[nso]=Kabagano ya Desktop
-Comment[pl]=Współdzielenie pulpitu
-Comment[pt]=Partilha do Ecrã
-Comment[pt_BR]=Compartilhamento do Ambiente de Trabalho
-Comment[ro]=Partajare ecran
-Comment[ru]=Параметры общего рабочего стола
-Comment[sk]=Zdieľanie pracovnej plochy
-Comment[sl]=Deljenje namizja
-Comment[sr]=Дељење радне површине
-Comment[sv]=Dela ut skrivbord
-Comment[ta]=மேஜைமேல் பகிர்வு
-Comment[th]=ใช้งานพื้นที่ทำงานร่วมกัน
-Comment[tr]=Masaüstü Paylaşımı
-Comment[uk]=Спільні стільниці
-Comment[ven]=U kovhekana ha desikithopo
-Comment[xh]=Ulwahlulelano lwe Desktop
-Comment[xx]=xxDesktop Sharingxx
-Comment[zh_CN]=桌面共享
-Comment[zh_TW]=桌面分享
-Comment[zu]=Ukuhlukaniselana kwe-Desktop
+Comment[x-test]=xxDesktop Sharingxx
 
 [UserAcceptsConnection]
 Name=UserAcceptsConnection
-Name[ar]=المستخدم قبل الاتصال
-Name[bg]=Потребителят прие връзката
-Name[ca]=L'usuari accepta la connexió
-Name[cs]=Uživatel přijímá spojení
-Name[cy]=DefnyddiwrDerbynCysylltiad
-Name[da]=BrugerAcceptererForbindelse
-Name[de]=BenutzerBestätigtVerbindung
-Name[el]=Ο χρήστης δέχεται σύνδεση
-Name[eo]=UzantoAkceptasKonektojn
-Name[es]=El usuario acepta la conexión
-Name[et]=Kasutaja ühendusega nõus
 Name[fr]=L'utilisateur accepte les connexions
-Name[gl]=O usuario acepta a conexión
-Name[he]=משתמש מקבל חיבור
-Name[hi]=उपयोगकर्ता-कनेक्शन-स्वीकारा
-Name[hr]=KorisnikPrihvaćaVezu
-Name[hu]=KapcsolatElfogadva
-Name[it]=L'utente accetta la connessione
-Name[ja]=ユーザが許可した接続
-Name[lt]=Vartotojas priima prisijungima
-Name[mn]=Хэрэглэгч зөвшөөрсөн холболт
-Name[ms]=Pengguna Menerima Sambungan
-Name[mt]=UserJaċċettaKonnessjoni
-Name[nb]=Bruker tar i mot oppkobling
-Name[nl]=Gebruiker accepteert verbinding
-Name[nn]=Brukar godtek samband
-Name[nso]=Modirisi o Amogela Kgokagano
-Name[pl]=Połączenie akceptowane przez użytkownika
-Name[pt_BR]=Aceita Conexões do Usuário
-Name[ro]=Conexiune acceptată de utilizator
-Name[ru]=Пользователь принимает соединения
-Name[se]=Geavaheaddji dohkkeha oktavuođa
-Name[sk]=Užívateľ akceptoval spojenie
-Name[sl]=Uporabnik sprejema povezavo
-Name[sr]=Корисник прихвата везе
-Name[sv]=Användare accepterar anslutning
-Name[ta]=பயணர் இணைப்பு ஏற்றுக்கொள்ளப்ப்ட்டது
-Name[th]=ผู้ใช้ยอมรับการเชื่อมต่อ
-Name[uk]=КористувачПриймаєЗ'єднання
-Name[ven]=Mushumisi o tanganedza vhukwamani
-Name[xh]=Umsebenzisi Wamkela Uxhulumaniso
-Name[xx]=xxUserAcceptsConnectionxx
-Name[zh_CN]=用户接受连接
-Name[zh_TW]=使用者接受連線
-Name[zu]=UmsebenziUvumelaUkuxhumana
+Name[x-test]=xxUserAcceptsConnectionxx
 Comment=User accepts connection
-Comment[af]=Gebruiker aanvaar verbinding
-Comment[ar]=المستخدم قبل الإتصال
-Comment[bg]=Потребителят прие връзката
-Comment[bs]=Korisnik prihvata konekciju
-Comment[ca]=L'usuari accepta la connexió
-Comment[cs]=Uživatel přijímá spojení
-Comment[cy]=Mae'r defnyddiwr yn derbyn y cysylltiad
-Comment[da]=Bruger accepterer forbindelse
-Comment[de]=Der Benutzer bestätigt die Verbindung
-Comment[el]=Ο χρήστης δέχεται σύνδεση
-Comment[eo]=Uzanto akceptas konektojn
-Comment[es]=El usuario acepta la conexión
-Comment[et]=Kasutaja nõustub ühendusega
-Comment[fi]=Käyttäjä hyväksyy yhteyden
 Comment[fr]=l'utilisateur accepte les connexions
-Comment[gl]=O usuario aceptou a conexión
-Comment[he]=המשתמש מקבל את החיבור
-Comment[hi]=उपयोगकर्ता कनेक्शन स्वीकारा
-Comment[hr]=Korisnik prihvaća vezu
-Comment[hu]=A felhasználó elfogadja a csatlakozási kérést
-Comment[it]=L'utente accetta la connessione
-Comment[ja]=ユーザが接続を許可
-Comment[lt]=Vartotojas priima prisijungimą
-Comment[mn]=Хэрэглэгч зөвшөөрсөн холболт
-Comment[ms]= Pengguna menerima sambungan
-Comment[mt]=User jaċċetta l-konnessjoni
-Comment[nb]=Bruker tar imot oppkobling
-Comment[nl]=Gebruiker accepteert verbinding
-Comment[nn]=Brukar godtek samband
-Comment[nso]=Modirisi o Amogela Kgokagano
-Comment[pl]=Użytkownik akceptuje połączenie
-Comment[pt]=O utilizador aceita a ligação
-Comment[pt_BR]=O usuário aceita a conexão
-Comment[ro]=Utilizatorul acceptă conexiunea
-Comment[ru]=Пользователь принимает соединения
-Comment[se]=Geavaheaddji dohkkeha oktavuođa
-Comment[sk]=Užívateľ akceptoval spojenie
-Comment[sl]=Uporabnik sprejema povezavo
-Comment[sr]=Корисник прихвата везу
-Comment[sv]=Användaren accepterar anslutning
-Comment[ta]=பயணர் இணைப்பு ஏற்றுக்கொள்ளப்ப்ட்டது
-Comment[th]=ผู้ใช้ยอมรับการเชื่อมต่อ
-Comment[tr]=Kullanıcı bağlantıyı kabul etti
-Comment[uk]=Користувач приймає з'єднання
-Comment[ven]=Mushumisi o tanganedza vhukwamani
-Comment[xh]=Umsebenzisi wamkela uxhulumaniso
-Comment[xx]=xxUser accepts connectionxx
-Comment[zh_CN]=用户接受连接
-Comment[zh_TW]=使用者接受的連線
-Comment[zu]=Umsebenzi uyakuvumela ukuxhumana
+Comment[x-test]=xxUser accepts connectionxx
 default_presentation=4
 
 [UserRefusesConnection]
 Name=UserRefusesConnection
-Name[ar]=المستخدم رفض الاتصال
-Name[bg]=Потребителят отказа връзката
-Name[ca]=L'usuari refusa la connexió
-Name[cs]=Uživatel odmítá spojení
-Name[cy]=DefnyddiwrGwrthodCysylltiad
-Name[da]=BrugerAfslårForbindelse
-Name[de]=BenutzerLehntVerbindungAb
-Name[el]=Ο χρήστης απορρίπτει σύνδεση
-Name[eo]=UzantoRifuzasKonektojn
-Name[es]=El usuario rechaza la conexión
-Name[et]=Kasutaja keeldub ühendusest
 Name[fr]=L'utilisateur refuse les connexions
-Name[gl]=O usuario rexeita a conexión
-Name[he]=משתמש דוחה חיבור
-Name[hi]=उपयोगकर्ता-कनेक्शन-अस्वीकारा
-Name[hr]=KorisnikOdbijaVezu
-Name[hu]=KapcsolatVisszautasítva
-Name[it]=L'utente rifiuta la connessione
-Name[ja]=ユーザが拒否した接続
-Name[lt]=Vartotojas atmeta prisijungimą
-Name[mn]=Хэрэглэгч зөвшөөрөөгүй холболт
-Name[ms]=Pengguna Menolak Sambungan
-Name[mt]=UserJirrifjutaKonnessjoni
-Name[nb]=Bruker avviser oppkobling
-Name[nl]=Gebruiker weigert verbinding
-Name[nn]=Brukar nektar samband
-Name[nso]=Modirisi o Gana Kgokagano
-Name[pl]=Połączenie odrzucone przez użytkownika
-Name[pt_BR]=Rejeita Conexões do Usuário
-Name[ro]=Conexiune respinsă de utilizator
-Name[ru]=Пользователь не принимает соединения
-Name[se]=Geavaheaddji hilgo oktavuođa
-Name[sk]=Užívateľ zamietol spojenie
-Name[sl]=Uporabnik zavrača povezavo
-Name[sr]=Корисник одбија везе
-Name[sv]=Användaren vägrar anslutning
-Name[ta]=பயணர் இணைப்பு ஏற்க்கமறுக்கப்பட்டது
-Name[th]=ผู้ใช้ปฏิเสธการเชื่อมต่อ
-Name[tr]=Kullanıcı Bağlantıyı Reddetti
-Name[uk]=КористувачВідмовляєУЗ'єднанні
-Name[ven]=Mushumisi o hana Vhukwamani
-Name[xh]=Umsebenzisi Uyalwala Uxhulumaniso
-Name[xx]=xxUserRefusesConnectionxx
-Name[zh_CN]=用户拒绝连接
-Name[zh_TW]=使用者拒絕連線
-Name[zu]=UmsebenzisiWalaUxhumaniso
+Name[x-test]=xxUserRefusesConnectionxx
 Comment=User refuses connection
-Comment[af]=Gebruiker weier verbinding
-Comment[ar]=المستخدم رفض الاتصال
-Comment[bg]=Потребителят отказа връзката
-Comment[bs]=Korisnik odbija konekciju
-Comment[ca]=L'usuari refusa la connexió
-Comment[cs]=Uživatel odmítá spojení
-Comment[cy]=Mae'r defnyddiwr yn gwrthod y cysylltiad
-Comment[da]=Bruger afslår forbindelse
-Comment[de]=Der Benutzer lehnt die Verbindung ab
-Comment[el]=Ο χρήστης απορρίπτει σύνδεση
-Comment[eo]=Uzanto rifuzas konektojn
-Comment[es]=El usuario rechaza la conexión
-Comment[et]=Kasutaja keeldub ühendusest
-Comment[fi]=Käyttäjä hylkää yhteyden
 Comment[fr]=L'utilisateur refuse les connexions
-Comment[gl]=O usuario rexeitou a conexión
-Comment[he]=המשתמש מסרב לחיבור
-Comment[hi]=उपयोगकर्ता कनेक्शन अस्वीकारा
-Comment[hr]=Korisnik odbija vezu
-Comment[hu]=A felhasználó visszautasítja a csatlakozási kérést
-Comment[it]=L'utente rifiuta la connessione
-Comment[ja]=ユーザが接続を拒否
-Comment[lt]=Vartotojas atmeta prisijungimą
-Comment[mn]=Хэрэглэгч зөвшөөрөөгүй холболт
-Comment[ms]=Pengguna menolak sambungan
-Comment[mt]=User jiċħad il-konnessjoni
-Comment[nb]=Bruker avviser oppkobling
-Comment[nl]=Gebruiker weigert verbinding
-Comment[nn]=Brukar nektar samband
-Comment[nso]=Modirisi o gana kgokagano
-Comment[pl]=Użytkownik odrzuca połączenie
-Comment[pt]=O utilizador recusa a ligação
-Comment[pt_BR]=O usuário rejeita a conexão
-Comment[ro]=Utilizatorul refuză conexiunea
-Comment[ru]=Пользователь не принимает соединения
-Comment[se]=Geavaheaddji hilgo oktavuođa
-Comment[sk]=Užívateľ odmietol spojenie
-Comment[sl]=Uporabnik zavrnil povezavo
-Comment[sr]=Корисник одбија везу
-Comment[sv]=Användaren vägrar anslutning
-Comment[ta]=பயணர் இணைப்பு ஏற்க்கமறுக்கப்பட்டது
-Comment[th]=ผู้ใช้ปฏิเสธการเชื่อมต่อ
-Comment[tr]=Kullanıcı bağlantıyı iptal etti
-Comment[uk]=Користувач відмовляє у з'єднанні
-Comment[ven]=Mushumisi o hana vhukwamani
-Comment[xh]=Umsebenzisi wala uxhulumaniso
-Comment[xx]=xxUser refuses connectionxx
-Comment[zh_CN]=用户拒绝连接
-Comment[zh_TW]=使用者拒絕的連線
-Comment[zu]=Umsebenzi awukuvumeli ukuxhumana
+Comment[x-test]=xxUser refuses connectionxx
 default_presentation=4
 
 [ConnectionClosed]
 Name=ConnectionClosed
-Name[ar]=اتصال مغلق
-Name[bg]=Връзката е прекъсната
-Name[ca]=Connexió tancada
-Name[cs]=Spojení ukončeno
-Name[cy]=CysylltiadArGau
-Name[da]=ForbindelseLukket
-Name[de]=VerbindungGeschlossen
-Name[el]=Σύνδεση έκλεισε
-Name[eo]=KonektoFermita
-Name[es]=Conexión cerrada
-Name[et]=Ühendus suletud
 Name[fr]=Connexion fermée
-Name[gl]=Conexión pechada
-Name[he]=חיבור נסגר
-Name[hi]=कनेक्शन-बन्द
-Name[hr]=VezaPrekinuta
-Name[hu]=KapcsolatBezárva
-Name[it]=Connessione chiusa
-Name[ja]=接続切断
-Name[lt]=Prisijungimas uždarytas
-Name[mn]=Холболт хаагдав
-Name[ms]=Sambungan Ditutup
-Name[mt]=KonnessjonijiMagħluqa
-Name[nb]=Kobling stengt
-Name[nl]=Verbinding gesloten
-Name[nn]=Samband stengt
-Name[nso]=Kgokagano e Tswaletswe
-Name[pl]=Połączenia zakończone
-Name[pt_BR]=Conexão fechada
-Name[ro]=Conexiune închisă
-Name[ru]=Соединение закрыто
-Name[se]=Oktavuohta giddejuvui
-Name[sk]=Spojenie ukončené
-Name[sl]=Povezava zaprta
-Name[sr]=Веза је затворена
-Name[sv]=Anslutning stängd
-Name[ta]=இணைப்புக்கள்
-Name[th]=การเชื่อมต่อยุติ
-Name[tr]=Bağlantı Kapatıldı
-Name[uk]=З'єднанняЗакрито
-Name[ven]=Vhukwamani ho valwa
-Name[xh]=Uxhulumaniso Luvaliwe
-Name[xx]=xxConnectionClosedxx
-Name[zh_CN]=连接关闭
-Name[zh_TW]=連線已關閉
-Name[zu]=UkuxhumanisaKuvaliwe
+Name[x-test]=xxConnectionClosedxx
 Comment=Connection closed
-Comment[af]=Verbinding gesluit
-Comment[ar]=الاتصال قُطع
-Comment[bg]=Връзката е прекъсната
-Comment[bs]=Konekcija prekinuta
-Comment[ca]=Connexió tancada
-Comment[cs]=Spojení ukončeno
-Comment[cy]=Mae'r cysylltiad ar gau
-Comment[da]=Forbindelse lukket
-Comment[de]=Verbindung geschlossen
-Comment[el]=Σύνδεση έκλεισε
-Comment[eo]=Konekto fermita
-Comment[es]=Conexión rechazada
-Comment[et]=Ühendus suletud
-Comment[fi]=Yhteys suljettu
 Comment[fr]=Connexion coupée
-Comment[gl]=Conexión pechada
-Comment[he]=החיבור נסגר
-Comment[hi]=कनेक्शन बन्द
-Comment[hr]=Veza prekinuta
-Comment[hu]=A kapcsolat bezárva
-Comment[it]=Connessione chiusa
-Comment[ja]=接続が閉じられました
-Comment[lt]=Prisijungimas uždarytas
-Comment[mn]=Холболт хаагдав
-Comment[ms]=Sambungan ditutup
-Comment[mt]=Konnessjoni magħluqa
-Comment[nb]=Oppkobling stengt
-Comment[nl]=Verbinding verbroken
-Comment[nn]=Samband stengt
-Comment[nso]=Kopantsho e tswaletswe
-Comment[pl]=Połączenie zakończone
-Comment[pt]=Ligação fechada
-Comment[pt_BR]=conexão encerrada
-Comment[ro]=Conexiune închisă
-Comment[ru]=Соединение закрыто
-Comment[se]=Oktavuohta giddejuvvui
-Comment[sk]=Spojenie ukončené
-Comment[sl]=Povezava zaprta
-Comment[sr]=Веза је затворена
-Comment[sv]=Anslutning stängd
-Comment[ta]=இணைப்புகள் மூடப்பட்டது
-Comment[th]=การเชื่อมต่อยุติ
-Comment[tr]=Bağlantı kesildi
-Comment[uk]=З'єднання закрито
-Comment[uz]=Алоқа узилди
-Comment[ven]=Vhukwamani ho valwa
-Comment[xh]=Uxhulumaniso luvaliwe
-Comment[xx]=xxConnection closedxx
-Comment[zh_CN]=连接关闭
-Comment[zh_TW]=連線已關閉
-Comment[zu]=Ukuxhumana kuvaliwe
+Comment[x-test]=xxConnection closedxx
 default_presentation=4
 
 [InvalidPassword]
 Name=InvalidPassword
-Name[ar]=كلمة مرور غير صالحة
-Name[be]=Некарэктны пароль
-Name[bg]=Невалидна парола
-Name[ca]=Contrasenya no vàlida
-Name[cs]=Neplatné heslo
-Name[cy]=CyfrinairAnnilys
-Name[da]=UgyldigtKodeord
-Name[de]=UngültigesPasswort
-Name[el]=Λάθος κωδικός πρόσβασης
-Name[eo]=NevalidaPasvorto
-Name[es]=Contraseña errónea
-Name[et]=Vale parool
 Name[fr]=Mots de passe non valable
-Name[gl]=Contraseña inválida
-Name[he]=סיסמה לא תקפה
-Name[hi]=अवैध-पासवर्ड
-Name[hr]=NevažećaLozinka
-Name[hu]=ÉrvénytelenJelszó
-Name[it]=Password non valida
-Name[ja]=不正なパスワード
-Name[lt]=Neteisingas slaptažodžis
-Name[mn]=Буруу нууц үг
-Name[ms]=Kata Laluan Tidak Sah
-Name[mt]=PasswordĦażin
-Name[nb]=Ugyldig passord
-Name[nl]=Ongeldig wachtwoord
-Name[nn]=Ugyldig passord
-Name[nso]=Lentsuphetiso gase la Nnete
-Name[pl]=Błędne hasło
-Name[pt_BR]=Senha inválida
-Name[ro]=Parolă eronată
-Name[ru]=Неверный пароль
-Name[se]=Gustomeahttun beassansátni
-Name[sk]=Zlé heslo
-Name[sl]=Nepravilno geslo
-Name[sr]=Погрешна лозинка
-Name[sv]=Ogiltigt lösenord
-Name[ta]=செல்லாத கடவுச்சொற்கள்
-Name[th]=รหัสผ่านไม่ถูกต้อง
-Name[tr]=Geçersiz Parola
-Name[uk]=НевірнийПароль
-Name[ven]=Phasiwede asi yone
-Name[xh]=Igama lokugqitha Elingasebenziyo
-Name[xx]=xxInvalidPasswordxx
-Name[zh_CN]=无效口令
-Name[zh_TW]=無效的密碼
-Name[zu]=IgamaEliyimfihloLokudlulaOkungasiyilona
+Name[x-test]=xxInvalidPasswordxx
 Comment=Invalid password
-Comment[af]=Ongeldige wagwoord
-Comment[ar]=كلمة مرور غير صالحة
-Comment[be]=Некарэктны пароль
-Comment[bg]=Невалидна парола
-Comment[bs]=Neispravna šifra
-Comment[ca]=Contrasenya no vàlida
-Comment[cs]=Neplatné heslo
-Comment[cy]=Cyfrinair annilys
-Comment[da]=Ugyldigt kodeord
-Comment[de]=Ungültiges Passwort
-Comment[el]=Λάθος κωδικός πρόσβασης
-Comment[eo]=nevalida pasvorto
-Comment[es]=Contraseña errónea
-Comment[et]=Vale parool
-Comment[fi]=Virheellinen salasana
 Comment[fr]=Mot de passe non valable
-Comment[gl]=Contraseña errónea
-Comment[he]=הסיסמה אינה תקפה
-Comment[hi]=अवैध पासवर्ड
-Comment[hr]=Nevažeća šifra
-Comment[hu]=Érvénytelen jelszó
-Comment[it]=Password non valida
-Comment[ja]=不正なパスワード
-Comment[lt]=Neteisingas slaptažodis
-Comment[mn]=Буруу нууц үг
-Comment[ms]=Kata laluan tidak sah
-Comment[mt]=Password ħażin
-Comment[nb]=Ugyldig passord
-Comment[nl]=Ongeldig wachtwoord
-Comment[nn]=Ugyldig passord
-Comment[nso]=Lentsuphetiso gase la nnete
-Comment[pl]=Błędne hasło
-Comment[pt]=Senha inválida
-Comment[pt_BR]=senha inválida
-Comment[ro]=Parolă eronată
-Comment[ru]=Неверный пароль
-Comment[se]=Gustomeahttun beassansátni
-Comment[sk]=Zlé heslo
-Comment[sl]=Nepravilno geslo
-Comment[sr]=Погрешна лозинка
-Comment[sv]=Ogiltigt lösenord
-Comment[ta]=செல்லாத கடவுச்சொல்
-Comment[th]=รหัสผ่านไม่ถูกต้อง
-Comment[tr]=Geçersiz parola
-Comment[uk]=Невірний пароль
-Comment[uz]=Махфий сўз ҳақиқий эмас
-Comment[ven]=Phasiwede isa shumi
-Comment[wa]=Sicret nén valide
-Comment[xh]=Igama lokugqitha elingasebenziyo
-Comment[xx]=xxInvalid passwordxx
-Comment[zh_CN]=无效口令
-Comment[zh_TW]=無效的密碼
-Comment[zu]=Igama elifihlikeli
+Comment[x-test]=xxInvalid passwordxx
 default_presentation=4
 
 [InvalidPasswordInvitations]
 Name=InvalidPasswordInvitations
-Name[ar]=دعوات كلمات مرور غير صالحة
-Name[bg]=Невалидна подкана за парола
-Name[ca]=Contrasenya convidats no vàlides
-Name[cs]=Neplatné hesla výzev
-Name[cy]=GwahoddiadauCyfrinairAnnilys
-Name[da]=UgyldigtKodeordInvitationer
-Name[de]=UngültigePasswortAnfragen
-Name[eo]=NevalidaPasvortoInvito
-Name[es]=Invitación de contraseñas erróneas
-Name[et]=Vale parool kutsed
 Name[fr]=Invitations de mot de passe non valable
-Name[gl]=Invitación  de Contraseñas inválidas
-Name[he]=סיסמת לא תקפה - הזמנות
-Name[hi]=अवैध-पासवर्ड-निमंत्रण
-Name[hr]=KrivePizovniceŠifri
-Name[hu]=ÉrvénytelenJelszóMeghívások
-Name[it]=Invito password non valida
-Name[ja]=不正なパスワードの招待
-Name[lt]=Neteisingo slaptažodžio kvietimai
-Name[mn]=Буруу нууц үгээр орох
-Name[ms]=Jemputan Kata Laluan Tidak Sah
-Name[mt]=PasswordĦażinaStediniet
-Name[nb]=Ugyldig passord ved invitasjon
-Name[nl]=Ongeldige wachtwoordaanvragen
-Name[nn]=Ugyldige passordinvitasjonar
-Name[nso]=Ditaletso tsa Mantsuphetiso tseo esego tsa Nnete
-Name[pl]=Informacja o błędnym haśle
-Name[pt_BR]=Aviso de senha inválida
-Name[ru]=Неверный запрос пароля
-Name[se]=Gustomeahttun beassansátnebovdehusat
-Name[sk]=Zlé heslo pozvánky
-Name[sl]=Povabila z nepravilnimi gesli
-Name[sr]=Погрешни позиви са лозинкама
-Name[sv]=Ogiltigt lösenord vid inbjudan
-Name[ta]=செல்லாத கடவுச்சொற்கள் அழைப்பிதழ்
-Name[uk]=ЗапрошенняЗНевірнимПаролем
-Name[ven]=Mbidzo ya phasiwede isi yone
-Name[xh]=IzimemoZegamalokugqithaEzingasebebenziyo
-Name[xx]=xxInvalidPasswordInvitationsxx
-Name[zh_CN]=无效口令邀请
-Name[zh_TW]=無效的密碼邀請函
-Name[zu]=IsimemoSegamaEliyimfihloLokudlulaOkungasiyilona
+Name[x-test]=xxInvalidPasswordInvitationsxx
 Comment=The invited party sent an invalid password. Connection refused.
-Comment[af]=Die uitgenooi party gestuur 'n ongeldige wagwoord. Verbinding geweier.
-Comment[ar]=الجهة المدعوة أرسلت كلمة مرور غير صالحة. الاتصال رُفض
-Comment[bg]=Поканената страна изпрати невалидна парола. Връзката е отказана.
-Comment[bs]=Pozvana strana je poslala neispravnu šifru. Konekcija je odbijena.
-Comment[ca]=La part invitada ha enviat una contrasenya no vàlida. Connexió refusada.
-Comment[cs]=Pozvaná strana poslala neplatné heslo. Spojení odmítnuto.
-Comment[cy]=Anfonodd y person gwahodd cyfrinair annilys.  Gwrthodwyd y cysylltiad.
-Comment[da]=Den inviterede part sendte et ugyldigt kodeord. Forbindelse afslået.
-Comment[de]=Die eingeladene Partei hat ein ungültiges Passwort gesendet: Verbindung abgelehnt.
-Comment[el]=Η προσκαλεσμένη ομάδα έστειλε άκυρο κωδικό πρόσβασης. Η σύνδεση απορρίφθηκε.
-Comment[eo]=La invitita kliento sendis nevalidan pasvorton. Konekto rifuzita.
-Comment[es]=La parte invitada envió una contraseña incorrecta. Conexión rechazada
-Comment[et]=Kutsutu saatis vigase parooli. Ühendusest keelduti.
-Comment[fi]=Kutsuttu taho lähetti virheellisen salasanan. Yhteys hylättiin.
 Comment[fr]=La partie invitée a envoyé un mot de passe non valable. Connexion refusée.
-Comment[gl]=O invitado mandou unha contraseña inválida. A conexión foi rexeitada
-Comment[he]=הצד המוזמן שלח סיסמה לא תקפה. החיבור נדחה.
-Comment[hi]=निमंत्रित पार्टी ने अवैध पासवर्ड भेजा. कनेक्शन अस्वीकृत.
-Comment[hr]=Stranka koju ste pozvali je poslala nevažeću šifru. Veza odbijena.
-Comment[hu]=A meghívott fél érvénytelen jelszót küldött. A csatlakozás nem sikerült.
-Comment[it]=La parte invitata ha inviato una password non valida. Connessione rifiutata.
-Comment[ja]=招待された人が不正なパスワードを送って来ました。接続は拒否されました。
-Comment[lt]=Kviečiančioji pusė atsiuntė blogą slaptažodį.  Prisijungimas atmestas.
-Comment[mn]=Буруу нууц үгийг уригдсан хэсэг илгээв. Холболт зөвшөөрөгдсөнгүй
-Comment[ms]=Pihak yang dijemput telah menghantar kata laluan yang salah. Sambungan ditolak.
-Comment[mt]=Il-persuna mistiedna bagħtet password ħażin. Konnessjoni miċħuda.
-Comment[nb]=Den inviterte parten sendte ugyldig passord. Oppkobling avvist.
-Comment[nl]=De uitgenodigde partij stuurde een ongeldig wachtwoord. Verbinding geweigerd.
-Comment[nn]=Den inviterte parten sende eit ugyldig passord. Sambandet vart nekta.
-Comment[nso]=Sehlopha seo se memilwego se romela lentsuphetiso leo esego la nnete. Kgokagano e gannwe.
-Comment[pl]=Z drugiej strony podano błędne hasło. Połączenie odrzucone.
-Comment[pt]=O convidado enviou uma senha inválida. A ligação foi recusada.
-Comment[pt_BR]=A parte "convidada" enviou uma senha inválida. Conexão recusada.
-Comment[ru]=Удалённый пользователь ввёл неверный пароль. В доступе отказано.
-Comment[se]=Bovdejuvvon bealli sáddii gustomeahttun beassansáni. Oktavuohta hilgojuvui.
-Comment[sk]=Pozvaný účastnik poslal zlé heslo. Spojenie zamietnuté.
-Comment[sl]=Povabljena stranka je poslala nepravilno geslo. Povezava zavrnjena.
-Comment[sr]=Позвана странка је послала погрешну лозинку. Веза је одбијена.
-Comment[sv]=Den inbjudna personen skickade ett ogiltigt lösenord. Anslutning vägrades.
-Comment[ta]=அழைத்த நபர் தவறான கடவுச்சொல்லை அணுப்பியுள்ளார். இணைப்பு நிராகரிக்கப் பட்டது.
-Comment[th]=ผู้เข้าร่วมการเชิญชวนส่งรหัสผ่านมาไม่ถูกต้อง ทำการปฏิเสธการเชื่อมต่อ
-Comment[uk]=Запрошена сторона надіслала невірний пароль. У з'єднанні відмовлено.
-Comment[ven]=Murado o rambiwaho o rumela phasiwede isa shumi. Vhukwamani ho hanwa.
-Comment[xh]=Umhlangano omenyiweyo uthumele igama lokugqitha elisebenzayo. Uxhulumano lwa liwe.
-Comment[xx]=xxThe invited party sent an invalid password. Connection refused.xx
-Comment[zh_CN]=受邀请方发送的口令不对。连接被拒绝。
-Comment[zh_TW]=被邀請的一方送出無效的密碼。已拒絕連線。
-Comment[zu]=Ingxenye emenyiwe ithumele igama lokungena alivunyelwanga. Ukuxhumana kwaliwe.
+Comment[x-test]=xxThe invited party sent an invalid password. Connection refused.xx
 default_presentation=2
 
 [NewConnectionOnHold]
 Name=NewConnectionOnHold
-Name[ar]=اتصال جديد على الانتظار
-Name[bg]=Има задържана нова връзка
-Name[ca]=Nova connexió en espera
-Name[cs]=Nové spojení pozdrženo
-Name[cy]=CysylltiadNewyddArArfael
-Name[da]=NyForbindelseSatPåHold
-Name[de]=NeueVerbindungWartet
-Name[el]=Νέα σύνδεση σε αναμονή
-Name[eo]=NovaKonektoAtendante
-Name[es]=Nueva conexión en espera
-Name[et]=Uus ühendus ootel
 Name[fr]=Nouvelle connexion au raccroché
-Name[gl]=Conexión en espera
-Name[he]=חיבור חדש בהמתנה
-Name[hi]=नया-कनेक्शन-आन-होल्ड
-Name[hr]=NovaVezaNaČekanju
-Name[hu]=ÚjKapcsolatTartva
-Name[it]=Nuova connessione da tenere
-Name[ja]=維持中の新規接続
-Name[lt]=Naujas prisijungimas sulaikytas
-Name[mn]=Шинэ холболт тогтоов
-Name[ms]=Sambungan Baru Menunggu
-Name[mt]=KonnessjoniĠdidaMiżmuma
-Name[nb]=Ny oppkobling venter
-Name[nl]=Nieuwe verbinding is wachtende
-Name[nn]=Nytt samband ventar
-Name[nso]=Kgokagano ye Ntshwa e Emisitswe
-Name[pl]=Nowe połączenie wstrzymane
-Name[pt_BR]=Nova Conexão
-Name[ro]=Conexiune nouă în aşteptare
-Name[ru]=Новое соединение отключено
-Name[se]=Ođđa oktavuohta vuordimin
-Name[sk]=Nové spojenie podržané
-Name[sl]=Nova povezava na čakanju
-Name[sr]=Нова веза је на чекању
-Name[sv]=Ny anslutning väntar
-Name[ta]=புதிய இணைப்பு வைக்கப்பட்டது
-Name[uk]=ОчікуютьНовіЗ'єднання
-Name[ven]=Vhukwamani vhuswa ho imiswa
-Name[xh]=Uxhulumano Olutsha Lumisiwe
-Name[xx]=xxNewConnectionOnHoldxx
-Name[zh_CN]=新连接暂时搁置
-Name[zh_TW]=保持的新連線
-Name[zu]=UkuxhumanisaOkushaKubanjiwe
+Name[x-test]=xxNewConnectionOnHoldxx
 Comment=Connection requested, user must accept
-Comment[af]=Verbinding versoekte, gebruiker moet aanvaar
-Comment[ar]=طلب اتصال, يجب أن يقبل المستخدم
-Comment[bg]=Заявена е връзка, потребителят трябва да я приеме
-Comment[bs]=Zatražena konekcija, korisnik mora prihvatiti
-Comment[ca]=Connexió sol·licitada, l'usuari ha d'acceptar-la
-Comment[cs]=Vyžadováno spojení, uživatel musí přijmout
-Comment[cy]=Cais wedi'i wneud am gysylltiad,rhaid i'r ddefnyddiwr ei dderbyn
-Comment[da]=Forbindelse forespurgt, bruger skal acceptere
-Comment[de]=Verbindungsanfrage, Benutzer muss bestätigen
-Comment[el]=Ζητήθηκε σύνδεση, ο χρήστης πρέπει να αποδεχθεί
-Comment[eo]=Konekto pridemandita, uzanto devas akcepti
-Comment[es]=Conexión solicitada, el usuario debe aceptar
-Comment[et]=Nõutakse ühendust, kasutaja peab seda lubama
-Comment[fi]=Yhteyttä pyydettiin, käyttäjän tulee hyväksyä
 Comment[fr]=Connexion demandée, l'utilisateur doit accepter
-Comment[gl]=Petición de conexión en curo. O usuario ten que aceptar
-Comment[he]=נתבקש חיבור, על המשתמש לקבלו
-Comment[hi]=कनेक्शन निवेदित. उपयोगकर्ता को स्वीकार होना चाहिए
-Comment[hr]=Veza je zatražena, korisnik mora prihvatiti
-Comment[hu]=Csatlakozási kérés, megerősítés szükséges
-Comment[it]=Connessione richiesta, l'utente deve accettare
-Comment[ja]=接続が要求されています。ユーザは受け入れなければなりません。
-Comment[lt]=Paprašyta prisijungimo, vartotojas turėtų priimti prašymą
-Comment[mn]=Холболт хүсэж байна, хэрэглэгч зөвшөөрөх ёстой
-Comment[ms]=Sambungan diminta, pengguna mesti menerima
-Comment[mt]=Konnessjoni mitluba, user irid jaċċetta
-Comment[nb]=Oppkobling ønskes, bruker må akseptere.
-Comment[nl]=Verbinding verzocht, gebruiker dient te accepteren
-Comment[nn]=Samband førespurd, brukar må godta
-Comment[nso]=Kgokagano e kgopetswe, modirisi o swanetse go dumela
-Comment[pl]=Próba połączenia, musi być zaakceptowana przez użytkownika
-Comment[pt]=A ligação foi pedida e o utilizador deve aceitar
-Comment[pt_BR]=Conexão requisitada; o usuário deve aceitar
-Comment[ro]=Cerere de conectare; utilizatorul trebuie să accepte
-Comment[ru]=Запрос на соединение, требуется подтверждение пользователя
-Comment[se]=Oktavuohta jearahuvui, geavaheaddji ferte dohkkehit
-Comment[sk]=Vyžiadané spojenie, užívateľ musí akceptovať
-Comment[sl]=Povezava vzpostavljena, uporabnik mora sprejeti
-Comment[sr]=Захтевана је веза, корисник мора да је прихвати
-Comment[sv]=Anslutning begärd, användaren måste acceptera
-Comment[ta]=இணைப்பு கோரிக்கப்பட்டது, பயணர் கண்டிப்பாக ஏற்றுக்கொள்ள வேண்டும்
-Comment[th]=มีการร้องขอเชื่อมต่อ ผู้ใช้ต้องทำการยอมรับ
-Comment[uk]=Запрошено з'єднання, користувач має прийняти
-Comment[ven]=Vhukwamani ho humbelwa, mushumisi u fanela u tanganedza
-Comment[xh]=Uxhulumaniso luceliwe, umsebenzisi kufanele amkele
-Comment[xx]=xxConnection requested, user must acceptxx
-Comment[zh_CN]=连接已请求，用户必须接受
-Comment[zh_TW]=已請求連線，使用者必須接受
-Comment[zu]=Ukuxhumanisa kuceliwe, umsebenzi kumele ivunyelwe
+Comment[x-test]=xxConnection requested, user must acceptxx
 default_presentation=4
 
 [NewConnectionAutoAccepted]
 Name=NewConnectionAutoAccepted
-Name[ar]=اتصال جديد مقبول تلقائياً
-Name[bg]=Има приета нова връзка автоматично
-Name[ca]=Nova connexió auto-acceptada
-Name[cs]=Nové spojení automaticky přijato
-Name[cy]=CysylltiadNewyddAwtoDerbyn
-Name[da]=NyForbindelseAutomatiskAccepteret
-Name[de]=NeueVerbindungAutomatischAkzeptiert
-Name[el]=Αυτόματη αποδοχή νέας σύνδεσης
-Name[eo]=NovaKonektoAŭtomateAkceptita
-Name[es]=Nueva conexión auto aceptada
-Name[et]=Uue ühendusega automaatselt nõus
 Name[fr]=Nouvelle connexion auto-acceptée
-Name[gl]=Nova conexión aceptada automáticamente
-Name[he]=חיבור חדש נתקבל אוטומטית
-Name[hi]=नया-कनेक्शन-स्वचालित-स्वीकारा
-Name[hr]=NovaVezaAutoPrihvaćena
-Name[hu]=ÚjKapcsolatAutoElfogadva
-Name[it]=Accettata nuova connessione automatica
-Name[ja]=新規接続の新規受け入れ
-Name[lt]=Naujas prisijungimas automatiškai priimtas
-Name[mn]=Шинэ холболтыг автоматаар зөвшөөрөв
-Name[ms]=Sambungan Baru Diterima Auto
-Name[mt]=KonnessjoniĠdidaAwtoAċċettata
-Name[nb]=Ny oppkobling tas imot automatisk
-Name[nl]=Nieuwe verbinding automatisch geaccepteerd
-Name[nn]=Nytt samband automatisk godteke
-Name[nso]=Kgokagano ye Ntshwa yago Itirisa e Amogetswe
-Name[pl]=Nowe połączenie automatycznie przyjęte
-Name[pt_BR]=Nova Conexão com aceitação automática
-Name[ro]=Conexiune nouă acceptată automat
-Name[ru]=Соединение создается автоматически
-Name[se]=Ođđa oktavuohta dohkkehuvui automáhtalaččat
-Name[sk]=Nové spojenie automaticky akceptované
-Name[sl]=Nova povezava samodejno sprejeta
-Name[sr]=Нова веза је аутоматски прихваћена
-Name[sv]=Ny anslutning accepterades automatiskt
-Name[ta]=இணைப்புக்கள்
-Name[th]=รับการเชื่อมต่ออัตโนมัติ
-Name[uk]=НовіЗ'єднанняАвтоматичноПрийняті
-Name[ven]=Vhukwamani vhuswa ho tanganedzhwa
-Name[xh]=Uxhulumano Olutsha Lwamkelwe Ngokuzenzekelayo
-Name[xx]=xxNewConnectionAutoAcceptedxx
-Name[zh_CN]=新连接自动接受
-Name[zh_TW]=自動接受的新連線
-Name[zu]=UkuxhumanisaOkushaKokuzenzakalelaKuvunyelwe
+Name[x-test]=xxNewConnectionAutoAcceptedxx
 Comment=New connection automatically established
-Comment[af]=Nuwe verbinding automaties vasgestel
-Comment[ar]=اتصالات جديدة أُنشئت تلقائياً
-Comment[bg]=Автоматично е установена нова връзка
-Comment[bs]=Automatski uspostavljena nova konekcija
-Comment[ca]=Nova connexió establerta automàticament
-Comment[cs]=Automaticky navázáno nové spojení
-Comment[cy]=Sefydlwyd cysylltiad newydd yn awtomatig
-Comment[da]=Ny forbindelse automatisk etableret
-Comment[de]=Neue Verbindung automatisch hergestellt
-Comment[el]=Νέα σύνδεση αυτόματα αποκαταστάθηκε
-Comment[eo]=Nova konekto aŭtomate akceptita
-Comment[es]=Nueva conexión establecida automáticamente
-Comment[et]=Uus ühendus automaatselt loodud
-Comment[fi]=Uisi yhteys muodostettu automaattisesti
 Comment[fr]=Nouvelle connexion établie automatiquement
-Comment[gl]=Nova conexión automáticamente establecida
-Comment[he]=נוצר חיבור חדש באופן אוטומטי
-Comment[hi]=नया कनेक्शन स्वचालित स्थापित
-Comment[hr]=Nova veza automatski prihvaćena
-Comment[hu]=Automatikusan létrejött az új kapcsolat
-Comment[it]=Stabilita nuova connessione automaticamente
-Comment[ja]=新規接続は自動的に確立されます
-Comment[lt]=Naujas prisijungimas sukurtas automatiškai
-Comment[mn]=Шинэ холболт автоматаар тавигдав
-Comment[ms]=Sambungan baru secara automatik terjalin
-Comment[mt]=Konnessjoni ġdida aċċettata awtomatikament
-Comment[nb]=Ny oppkobling automatisk opprettet
-Comment[nl]=Nieuwe verbinding automatisch opgebouwd
-Comment[nn]=Nytt samband automatisk oppretta
-Comment[nso]=Kgokagano ye ntshwa e hlagisitswe kago itirsa
-Comment[pl]=Nowe połączenie ustanowiono automatycznie
-Comment[pt]=A nova ligação foi estabelecida automaticamente
-Comment[pt_BR]=Nova conexão estabelecida automaticamente
-Comment[ro]=Conexiune nouă stabilită automat
-Comment[ru]=Новое соединение устанавливается автоматически
-Comment[se]=Ođđa oktavuohta automáhtalaččat váldui
-Comment[sk]=Nové spojenie automaticky vytvorené
-Comment[sl]=Nova povezava samodejno vzpostavljena
-Comment[sr]=Нова веза је аутоматски успостављена
-Comment[sv]=Ny anslutning automatiskt upprättad
-Comment[ta]=இணைப்புகள் மூடப்பட்டது
-Comment[th]=เปิดการเชื่อมต่อใหม่อัตโนมัติ
-Comment[uk]=Автоматично встановлено нове з'єднання
-Comment[ven]=Vhukwamani vhuswa ho itwa na zwenezwo
-Comment[xh]=Uxhulumaniso olutsha lufunyenwe ngokuzenzekelayo
-Comment[xx]=xxNew connection automatically establishedxx
-Comment[zh_CN]=自动建立新连接
-Comment[zh_TW]=已自動建立新連線
-Comment[zu]=Ukuxhumana okusha kuyazisungulela
+Comment[x-test]=xxNew connection automatically establishedxx
 default_presentation=4
 
 [TooManyConnections]
 Name=TooManyConnections
-Name[ar]=اتصالات عديدة جداً
-Name[bg]=Твърде много връзки
-Name[ca]=Masses connexions
-Name[cs]=Příliš mnoho spojení
-Name[cy]=GormodOGysylltiadau
-Name[da]=ForMangeForbindelser
-Name[de]=ZuVieleVerbindungen
-Name[el]=Πάρα πολλές συνδέσεις
-Name[eo]=TroMultajKonektoj
-Name[es]=Demasiadas conexiones
-Name[et]=Liiga palju ühendusi
 Name[fr]=Trop de connexions
-Name[gl]=Demasiadas conexións
-Name[he]=יותר מדיי חיבורים
-Name[hi]=Tबहुत-सारे-कनेक्शन
-Name[hr]=PrevišeVeza
-Name[hu]=TúlSokKapcsolat
-Name[it]=Troppe Connessioni
-Name[ja]=多すぎる接続
-Name[lt]=Per daug prisijungimų
-Name[mn]=Дэндүү олон холболт
-Name[ms]=Terlalu Banyak Sambungan
-Name[mt]=WisqKonnessjonijiet
-Name[nb]=For mange oppkoblinger
-Name[nl]=Teveel verbindingen
-Name[nn]=For mange samband
-Name[nso]=Dikgokagano tse Ntshi Kudu
-Name[pl]=Zbyt wiele połączeń
-Name[pt_BR]=Conexões em excesso
-Name[ro]=Prea multe conexiuni
-Name[ru]=Слишком много соединений
-Name[se]=Menddo ollu oktavuođat
-Name[sk]=Príliš veľa spojení
-Name[sl]=Preveč povezav
-Name[sr]=Исувише много веза
-Name[sv]=För många anslutningar
-Name[ta]=பல இணைப்புக்கள்
-Name[th]=มีการเชื่อมต่อมากเกินไป
-Name[tr]=ÇokFazlaBağlantı
-Name[uk]=ЗабагатоЗ'єднань
-Name[ven]=Vhukwamani vhunzhi
-Name[xh]=Uxhulumaniso Oluninzi Kakhulu
-Name[xx]=xxTooManyConnectionsxx
-Name[zh_CN]=连接太多
-Name[zh_TW]=太多連線
-Name[zu]=UkuxhumanaOkuningi
+Name[x-test]=xxTooManyConnectionsxx
 Comment=Busy, connection refused
-Comment[af]=Besig, verbinding geweier
-Comment[ar]=مشغول , الاتصال رُفض
-Comment[bg]=Заето, връзката е отказана
-Comment[bs]=Zauzet, konekcija odbijena
-Comment[ca]=Ocupat, connexió refusada
-Comment[cs]=Zaneprázdněn, spojení odmítnuto
-Comment[cy]=Prysur, gwrthodwyd y cysylltiad
-Comment[da]=Optaget, forbindelse afslået
-Comment[de]=Beschäftigt, Verbindung abgelehnt
-Comment[el]=Απασχολημένο, η σύνδεση απορρίφθηκε
-Comment[eo]=Laborante, konekto rifuzita
-Comment[es]=Ocupado, conexión rechazada
-Comment[et]=Hõivatud, ühendusest keelduti
-Comment[fi]=Varattu, yhteys hylättiin
 Comment[fr]=Occupé, connexion refusée
-Comment[gl]=Ocupado, conexión rexeitada
-Comment[he]=תפוס, החיבור נדחה
-Comment[hi]=व्यस्त, कनेक्शन अस्वीकृत
-Comment[hr]=Zauzeto, veza odbijena
-Comment[hu]=Foglalt, a csatlakozási kérés visszautasítva
-Comment[it]=Occupato, connessione rifiutata
-Comment[ja]=ビジーです。接続は拒否されました
-Comment[lt]=Užimtas, prisijungimas atmestas
-Comment[mn]=Шугам Чөлөөгүй, холболт зөвшөөрөгдсөнгүй
-Comment[ms]=Sibuk, sambungan ditolak
-Comment[mt]=Okkupat, konnessjoni miċħuda
-Comment[nb]=Opptatt, oppkobling avvist
-Comment[nl]=Bezig, verbinding geweigerd
-Comment[nn]=Oppteken, samband nekta
-Comment[nso]=E swaregile, kgokagano e gannwe
-Comment[pl]=Zajęte, połączenie odrzucone
-Comment[pt]=Ocupado, a ligação foi recusada
-Comment[pt_BR]=Ocupado; conexão recusada
-Comment[ro]=Ocupat; conexiune refuzată
-Comment[ru]=Занято, соединение закрыто
-Comment[sk]=Zaneprázdneny, spojenie odmietnuté
-Comment[sl]=zaposlen, povezava zavrnjena
-Comment[sr]=Заузето, веза је одбијена
-Comment[sv]=Upptagen, anslutning vägras
-Comment[ta]=இணைப்புக் மேலாளர்
-Comment[th]=ยังไม่ว่าง ทำการปฏิเสธการเชื่อมต่อ
-Comment[uk]=Зайнято, у з'єднанні відмовлено
-Comment[uz]=Банд, алоқа рад этилди
-Comment[ven]=U farakanea, vhukwamani ho hanwa
-Comment[xh]=Uxhulumaniso, olu xakekileyo lwaliwe
-Comment[xx]=xxBusy, connection refusedxx
-Comment[zh_CN]=占线，连接拒绝
-Comment[zh_TW]=忙碌，已拒絕連線
-Comment[zu]=Imatasa,ukuxhumana kwaliwe
+Comment[x-test]=xxBusy, connection refusedxx
 default_presentation=4
 default_logfile=
 
 [UnexpectedConnection]
 Name=UnexpectedConnection
-Name[ar]=اتصال غير متوقع
-Name[bg]=Неочаквана връзка
-Name[ca]=Connexió inesperada
-Name[cs]=Neočekávané spojení
-Name[cy]=CysylltiadAnnisgwyl
-Name[da]=UventetForbindelse
-Name[de]=UnerwarteteVerbindung
-Name[el]=Μη αναμενόμενη σύνδεση
-Name[eo]=NeatenditaKonekto
-Name[es]=Conexión inesperada
-Name[et]=Ootamatu ühendus
 Name[fr]=Connexion inattendue
-Name[gl]=Conexión inesperada
-Name[he]=חיבור בלתי צפוי
-Name[hi]=अप्रत्याशित-कनेक्शन
-Name[hr]=NeočekivanaVeza
-Name[hu]=NemVártKapcsolat
-Name[it]=Connessione inaspettata
-Name[ja]=予期しない接続
-Name[lt]=Netikėtas prisijungimas
-Name[mn]=Гэнэтийн Холболт
-Name[ms]=Sambungan Luar Jangka
-Name[mt]=KonnessjonijietMhuxMistennija
-Name[nb]=Uventet oppkobling
-Name[nl]=Onverwachte verbinding
-Name[nn]=Uventa samband
-Name[nso]=Kgokagano yeo ebego esa Emelwa
-Name[pl]=Niespodziewane połączenie
-Name[pt_BR]=Conexão não-aceita
-Name[ro]=Conexiune neaşteptată
-Name[ru]=Неожиданное соединение
-Name[se]=Vuordekeahtes oktavuohta
-Name[sk]=Neočakávane spojenie
-Name[sl]=Nepričakovana povezava
-Name[sr]=Неочекивана веза
-Name[sv]=Oväntad anslutning
-Name[ta]=பயணர் இணைப்பு ஏற்றுக்கொள்ளப்ப்ட்டது
-Name[th]=การเชื่อมต่อที่ไม่คาดหวัง
-Name[tr]=Beklenmedik Bağlantı
-Name[uk]=НеочікуванеЗ'єднання
-Name[ven]=Vhukwamani vhu songo lavhelelwaho
-Name[xh]=Uxhulumaniso Olungalindelwanga
-Name[xx]=xxUnexpectedConnectionxx
-Name[zh_CN]=未料到的连接
-Name[zh_TW]=非預期的連線
-Name[zu]=UkuxhumanaOkungalindelwe
+Name[x-test]=xxUnexpectedConnectionxx
 Comment=Received unexpected connection, abort
-Comment[af]=Ontvang onverwagte verbinding, staak
-Comment[ar]=تم استلام اتصال غير متوقع , اقطع
-Comment[bg]=Получи се неочаквана връзка, прекъсване
-Comment[bs]=Primio neočekivanu konekciju, prekidam
-Comment[ca]=Rebuda una connexió inesperada, avortant
-Comment[cs]=Obdrženo neočekávané spojení, přerušeno
-Comment[cy]=Derbynwyd cysylltiad annisgwyl,terfynu
-Comment[da]=Modtog uventet forbindelse, afbrød
-Comment[de]=Unerwartete Verbindung hergestallt, Abbruch
-Comment[el]=Λήψη μη αναμενόμενης σύνδεσης, διακοπή
-Comment[eo]=Ricevis neatenditan konekton, haltis
-Comment[es]=Recibida conexión inesperada, abortar
-Comment[et]=Saadi ootamatu ühendus, loobuti
-Comment[fi]=Vastaanotettiin odottamaton yhteys, lopeta
 Comment[fr]=Reçu une connexion inattendue, interruption
-Comment[gl]=Recibíuse unha conexión inesperada. 
-Comment[he]=נתקבל חיבור בלתי צפוי, בוטל
-Comment[hi]=अप्रत्याशित कनेक्शन प्राप्त. छोड़ा
-Comment[hr]=Primio sam neočekivanu vezu, prekid
-Comment[hu]=Nem várt csatlakozási kérés, kilépés
-Comment[it]=Ricevuta connessione inaspettata, termina
-Comment[ja]=予期しない接続を受信しました。廃棄します。
-Comment[lt]=Gautas netikėtas prisijungimas, nutraukiama
-Comment[mn]=Гэнэтийн холболтийг хүлээн авав.Аборт
-Comment[ms]=Menerima sambungan luar jangka, menamatkan
-Comment[mt]=Irċevejt konnessjoni mhux mistennija, ieqaf
-Comment[nb]=Mottok uventet oppkobling, avbryt
-Comment[nl]=Ontving een onverwachte verbinding, gestopt
-Comment[nn]=Mottok uventa samband, avbryt
-Comment[nso]=Amogetse kgokagano yeo ebego esa emelwa, bolaya
-Comment[pl]=Otrzymano niespodziewane połączenie. Przerwane.
-Comment[pt]=Foi recebida uma ligação inesperada, a interromper
-Comment[pt_BR]=conexão recebida inesperadamente; abortar
-Comment[ro]=A fost recepţionată o conexiune neaşteptată şi a fost anulată
-Comment[ru]=Получено неожиданное соединение. Отключение
-Comment[se]=Oaččui vuordekeahtes oktavuođa, gaskkalduhte
-Comment[sk]=Prijaté neočakávane spojenie, ukončujem
-Comment[sl]=Prejeta nepričakovana povezava, prekinjam
-Comment[sr]=Примљена је неочекивана веза, прекидам
-Comment[sv]=Tog emot oväntad anslutning, avbryter
-Comment[ta]=எதிர்பாராத இணைப்பு ஏற்க்கப்ப்ட்டது
-Comment[th]=ได้รับการเชื่อมต่อที่ไม่คาดหวัง ทำการยกเลิก
-Comment[uk]=Отримано неочікуване з'єднання, скасовую
-Comment[ven]=Vhukwamani vhu songo lavhelelwaho ho tanganedzhwaho, litsha
-Comment[xh]=Ufumene uxhulumaniso olungalindelekanga, lahla
-Comment[xx]=xxReceived unexpected connection, abortxx
-Comment[zh_CN]=收到未料到连接，中止
-Comment[zh_TW]=接收到非預期的連線，放棄
-Comment[zu]=Isithole ukuxhumana okungalindelekanga, hushula
+Comment[x-test]=xxReceived unexpected connection, abortxx
 default_presentation=4
 

krfb/invitation.cc

@@ -1,10 +1,6 @@
 /***************************************************************************
-                               invitation.cpp
-                             -------------------
-    begin                : Sat Mar 30 2002
-    copyright            : (C) 2002 by Tim Jansen
-                           (C) Stefan Taferner (password encryption)
-    email                : tim@tjansen.de
+     Copyright 2002 Tim Jansen <tim@tjansen.de>
+     Copyright 2002 Stefan Taferner <taferner@kde.org>
  ***************************************************************************/
 
 /***************************************************************************
@@ -17,26 +13,26 @@
  ***************************************************************************/
 
 #include "invitation.h"
-
+#include <krandom.h>
 /*
  * Function for (en/de)crypting strings for config file, taken from KMail
  * Author: Stefan Taferner <taferner@alpin.or.at>
  */
 QString cryptStr(const QString &aStr) {
         QString result;
-        for (unsigned int i = 0; i < aStr.length(); i++)
+        for ( int i = 0; i < aStr.length(); i++)
                 result += (aStr[i].unicode() < 0x20) ? aStr[i] :
                                 QChar(0x1001F - aStr[i].unicode());
         return result;
 }
 
 // a random string that doesn't contain i, I, o, O, 1, 0
-// based on KApplication::randomString()
+// based on KRandom::randomString()
 static QString readableRandomString(int length) {
    QString str;
    while (length)
    {
-      int r = KApplication::random() % 62;
+      int r = KRandom::random() % 62;
       r += 48;
       if (r > 57) 
 	      r += 7;
@@ -58,7 +54,7 @@ static QString readableRandomString(int length) {
 
 Invitation::Invitation() :
 	m_viewItem(0) {
-	m_password = readableRandomString(4)+"-"+readableRandomString(3);
+	m_password = readableRandomString(4)+'-'+readableRandomString(3);
 	m_creationTime = QDateTime::currentDateTime();
 	m_expirationTime = QDateTime::currentDateTime().addSecs(INVITATION_DURATION);
 }
@@ -71,7 +67,7 @@ Invitation::Invitation(const Invitation &x) :
 }
 
 Invitation::Invitation(KConfig* config, int num) {
-	m_password = cryptStr(config->readEntry(QString("password%1").arg(num), ""));
+	m_password = cryptStr(config->readEntry(QString("password%1").arg(num), QString()));
 	m_creationTime = config->readDateTimeEntry(QString("creation%1").arg(num));
 	m_expirationTime = config->readDateTimeEntry(QString("expiration%1").arg(num));
 	m_viewItem = 0;
@@ -114,12 +110,12 @@ bool Invitation::isValid() const {
 	return m_expirationTime > QDateTime::currentDateTime();
 }
 
-void Invitation::setViewItem(KListViewItem *i) {
+void Invitation::setViewItem(K3ListViewItem *i) {
 	if (m_viewItem)
 		delete m_viewItem;
 	m_viewItem = i;
 }
 
-KListViewItem *Invitation::getViewItem() const{
+K3ListViewItem *Invitation::getViewItem() const{
 	return m_viewItem;
 }

krfb/invitation.h

@@ -19,7 +19,7 @@
 #define INVITATION_H
 
 #include <kapplication.h>
-#include <klistview.h>
+#include <k3listview.h>
 #include <kconfig.h>
 #include <qobject.h>
 #include <qstring.h>
@@ -43,15 +43,15 @@ public:
 	QDateTime creationTime() const;
 	bool isValid() const;
 
-	void setViewItem(KListViewItem*);
-	KListViewItem* getViewItem() const;
+	void setViewItem(K3ListViewItem*);
+	K3ListViewItem* getViewItem() const;
 	void save(KConfig *config, int num) const;
 private:
 	QString m_password;
 	QDateTime m_creationTime;
 	QDateTime m_expirationTime;
 
-	KListViewItem *m_viewItem;
+	K3ListViewItem *m_viewItem;
 };
 
 #endif

krfb/invite.ui.h

@@ -1,7 +0,0 @@
-#include <kapplication.h>
-
-void InvitationDialog::helpClicked()
-{
-	KApplication::kApplication()->invokeHelp();
-}
-

krfb/invitedialog.cc

@@ -0,0 +1,65 @@
+/* This file is part of the KDE project
+   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "invitedialog.h"
+#include "invitewidget.h"
+
+#include <kiconloader.h>
+#include <klocale.h>
+#include <kstdguiitem.h>
+
+#include <qlabel.h>
+#include <qpushbutton.h>
+
+InviteDialog::InviteDialog( QWidget *parent, const char *name )
+    : KDialogBase( parent, name, true, i18n( "Invitation" ),
+      User1|Close|Help, NoDefault, true )
+{
+  m_inviteWidget = new InviteWidget( this, "InviteWidget" );
+  m_inviteWidget->pixmapLabel->setPixmap(
+      UserIcon( "connection-side-image.png" ) );
+  setMainWidget( m_inviteWidget );
+
+  setButtonGuiItem( User1, KStdGuiItem::configure() );
+
+  connect( m_inviteWidget->btnCreateInvite, SIGNAL( clicked() ),
+           SIGNAL( createInviteClicked() ) );
+  connect( m_inviteWidget->btnEmailInvite, SIGNAL( clicked() ),
+           SIGNAL( emailInviteClicked() ) );
+  connect( m_inviteWidget->btnManageInvite, SIGNAL( clicked() ),
+           SIGNAL( manageInviteClicked() ) );
+}
+
+void InviteDialog::slotUser1()
+{
+  emit configureClicked();
+}
+
+void InviteDialog::enableInviteButton( bool enable )
+{
+  m_inviteWidget->btnCreateInvite->setEnabled( enable );
+}
+
+void InviteDialog::setInviteCount( int count )
+{
+  m_inviteWidget->btnManageInvite->setText(
+      i18n( "&Manage Invitations (%1)...", count ) );
+}
+
+#include "invitedialog.moc"

krfb/invitedialog.h

@@ -0,0 +1,54 @@
+/* This file is part of the KDE project
+   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef INVITEDIALOG_H
+#define INVITEDIALOG_H
+
+class InviteWidget;
+
+#include <kdialogbase.h>
+
+class InviteDialog : public KDialogBase
+{
+  Q_OBJECT
+
+  public:
+    InviteDialog( QWidget *parent, const char *name );
+    ~InviteDialog() {}
+
+    void enableInviteButton( bool enable );
+
+  public slots:
+    void setInviteCount( int count );
+
+  signals:
+    void createInviteClicked();
+    void emailInviteClicked();
+    void manageInviteClicked();
+    void configureClicked();
+
+  protected slots:
+    void slotUser1();
+
+  protected:
+    InviteWidget *m_inviteWidget;
+};
+
+#endif // INVITEDIALOG_H
+

krfb/invitewidget.ui

@@ -0,0 +1,197 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>InviteWidget</class>
+<widget class="QWidget">
+    <property name="name">
+        <cstring>InviteWidget</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>521</width>
+            <height>328</height>
+        </rect>
+    </property>
+    <property name="windowTitle">
+        <string></string>
+    </property>
+    <grid>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>0</number>
+        </property>
+        <widget class="QLabel" row="0" column="1" rowspan="1" colspan="3">
+            <property name="name">
+                <cstring>TextLabel2</cstring>
+            </property>
+            <property name="font">
+                <font>
+                    <bold>1</bold>
+                </font>
+            </property>
+            <property name="text">
+                <string>Welcome to KDE Desktop Sharing</string>
+            </property>
+        </widget>
+        <widget class="KActiveLabel" row="1" column="1" rowspan="1" colspan="3">
+            <property name="name">
+                <cstring>kActiveLabel1</cstring>
+            </property>
+            <property name="focusPolicy">
+                <enum>Qt::NoFocus</enum>
+            </property>
+            <property name="text">
+                <string>KDE Desktop Sharing allows you to invite somebody at a remote location to watch and possibly control your desktop.
+&lt;a href="whatsthis:&lt;p&gt;An invitation creates a one-time password that allows the receiver to connect to your desktop. It is valid for only one successful connection and will expire after an hour if it has not been used. When somebody connects to your computer a dialog will appear and ask you for permission. The connection will not be established before you accept it. In this dialog you can also restrict the other person to view your desktop only, without the ability to move your mouse pointer or press keys.&lt;/p&gt;&lt;p&gt;If you want to create a permanent password for Desktop Sharing, allow 'Uninvited Connections' in the configuration.&lt;/p&gt;"&gt;More about invitations...&lt;/a&gt;</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="0" column="0" rowspan="7" colspan="1">
+            <property name="name">
+                <cstring>pixmapLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>0</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>108</width>
+                    <height>318</height>
+                </size>
+            </property>
+            <property name="maximumSize">
+                <size>
+                    <width>108</width>
+                    <height>318</height>
+                </size>
+            </property>
+            <property name="frameShape">
+                <enum>WinPanel</enum>
+            </property>
+            <property name="frameShadow">
+                <enum>Sunken</enum>
+            </property>
+            <property name="scaledContents">
+                <bool>true</bool>
+            </property>
+            <property name="alignment">
+                <set>Qt::AlignTop</set>
+            </property>
+        </widget>
+        <spacer row="4" column="3">
+            <property name="name">
+                <cstring>spacer4</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>40</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <widget class="QPushButton" row="3" column="2">
+            <property name="name">
+                <cstring>btnCreateInvite</cstring>
+            </property>
+            <property name="text">
+                <string>Create &amp;Personal Invitation...</string>
+            </property>
+            <property name="toolTip" stdset="0">
+                <string></string>
+            </property>
+            <property name="whatsThis" stdset="0">
+                <string>Create a new invitation and display the connection data. Use this option if you want to invite somebody personally, for example, to give the connection data over the phone.</string>
+            </property>
+        </widget>
+        <spacer row="6" column="2">
+            <property name="name">
+                <cstring>spacer5</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Fixed</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>24</height>
+                </size>
+            </property>
+        </spacer>
+        <spacer row="4" column="1">
+            <property name="name">
+                <cstring>spacer3</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>40</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <widget class="QPushButton" row="5" column="2">
+            <property name="name">
+                <cstring>btnManageInvite</cstring>
+            </property>
+            <property name="text">
+                <string>&amp;Manage Invitations (%1)...</string>
+            </property>
+        </widget>
+        <widget class="QPushButton" row="4" column="2">
+            <property name="name">
+                <cstring>btnEmailInvite</cstring>
+            </property>
+            <property name="text">
+                <string>Invite via &amp;Email...</string>
+            </property>
+            <property name="whatsThis" stdset="0">
+                <string>This button will start your email application with a pre-configured text that explains to the recipient how to connect to your computer. </string>
+            </property>
+        </widget>
+        <spacer row="2" column="2">
+            <property name="name">
+                <cstring>spacer2</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>MinimumExpanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>89</height>
+                </size>
+            </property>
+        </spacer>
+    </grid>
+</widget>
+<signals>
+    <signal>createInviteClicked()</signal>
+    <signal>emailInviteClicked()</signal>
+    <signal>manageInviteClicked()</signal>
+</signals>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</UI>

krfb/kinetd_krfb.desktop

@@ -14,102 +14,13 @@ X-KDE-KINETD-multiInstance=false
 X-KDE-KINETD-serviceURL=service:remotedesktop.kde:vnc://%h:%p;(type=shared),(username=%u),(fullname=%f),(serviceid=%i)
 X-KDE-KINETD-serviceAttributes=(type=shared),(username=%u),(fullname=%f),(serviceid=%i)
 X-KDE-KINETD-serviceLifetime=1200
+X-KDE-KINETD-DNSSD-Name=Remote Desktop of %u
+X-KDE-KINETD-DNSSD-Type=_rfb._tcp
+X-KDE-KINETD-DNSSD-Properties=type=shared,u=%u,fullname=%f
 
 Name=KRfb Desktop Sharing
-Name[ar]=KRfb مشاركة سطح المكتب
-Name[bg]=Споделяне на работно място (KRfb)
-Name[bs]=KRfb dijeljenje desktopa
-Name[ca]=Compartició de l'escriptori KRfb
-Name[cs]=Sdílení pracovní plochy KRfb
-Name[cy]=Rhannu Penbwrdd KRfb
-Name[da]=KRfb Skrivebordsdeling
-Name[de]=KRfb Arbeitsfläche freigeben
-Name[el]=KRfb μοίρασμα επιφάνειας εργασίας
-Name[eo]=KRfb Tabula fordonado
-Name[es]=Compartición de escritorio KRfb
-Name[et]=KRfb Töölaua jagamine
-Name[fi]=Työpöydän jakaminen
 Name[fr]=Partage de bureau KRfb
-Name[gl]=KRfb Compartición de Escritorios
-Name[he]=שיתוף שולחנות עבודה של KRfb
-Name[hi]=KRfb डेस्कटॉप साझा
-Name[hr]=KRfb dijeljenje radne površine
-Name[hu]=KRfb munkaasztal-megosztás
-Name[it]=Condivisione desktop KRfb
-Name[ja]=KRfb デスクトップ共有
-Name[lt]=KRfb dalinimasis darbastaliu
-Name[mn]=KRfb ажлын байр
-Name[ms]=Perkongsian Ruang Kerja KRfb
-Name[mt]=Qsim tad-desktop KRfb
-Name[nb]=KRfb skrivebordsdeling
-Name[nn]=KRfb-skrivebordsdeling
-Name[nso]=Kabagano ya Desktop ya KRfp
-Name[pl]=KRfb Współdzielenie pulpitu
-Name[pt]=Partilha do Ecrã KRfb
-Name[pt_BR]=Compartilhamento do Ambiente de Trabalho KRfb
-Name[ro]=Partajare ecran KRfb
-Name[ru]=Общий рабочий стол KRfb
-Name[sk]=KRfb zdieľanie pracovnej plochy
-Name[sl]=Deljenje namizja z KRfb
-Name[sr]=KRfb дељење радне површине
-Name[sv]=Krfb dela ut skrivbord
-Name[ta]=மேசைமேல் பகிர்வு
-Name[th]=แบ่งการใช้งานพื้นที่ทำงานร่วมกัน
-Name[tr]=KRfb Masaüstü Paylaşımı
-Name[uk]=Спільні стільниця KRfb
-Name[ven]=U kovhekana ha Desikithopo ya KRfb
-Name[xh]=Desktop ye KRfb Isebenza ngokuhlangeneyo
-Name[xx]=xxKRfb Desktop Sharingxx
-Name[zh_CN]=KRfb 桌面共享
-Name[zh_TW]=KRfb 桌面分享
-Name[zu]=KRfb ukwahlukanisela kwe-Desktop Sharing
+Name[x-test]=xxKRfb Desktop Sharingxx
 Comment=A daemon that allows you to share your desktop
-Comment[af]='n bediener wat laat toe jy na deel jou werkskerm
-Comment[ar]=مراقب يسمح لك بمشاركة سطح مكتبك
-Comment[bg]=Демон за споделяне на работното място
-Comment[bs]=Daemon koji vam omogućuje da dijelite vaš desktop
-Comment[ca]=Un dimoni que us permetrà compartir el vostre escriptori
-Comment[cs]=Démon umožňující sdílení vaší plochy
-Comment[cy]=Daemon sy'n gadael i chi rannu eich penbwrdd
-Comment[da]=En dæmon der tillader dig at dele dit skrivebord
-Comment[de]=Ein Dämon, der die Freigabe der Arbeitsfläche erlaubt
-Comment[el]=Ένας δαίμονας που σας επιτρέπει να μοιραστείτε την επιφάνεια εργασίας σας
-Comment[eo]=demono por permesi retan fordonadon de via tabulo
-Comment[es]=Un demonio que le permite compartir su escritorio
-Comment[et]=Deemon, mis lubab sul töölauda jagada
-Comment[fi]=Palvelin joka mahdollistaa työpöydän jakamisen
 Comment[fr]=Un démon qui vous permet de partager votre bureau
-Comment[gl]=Un demo que permite a compartición do teu escritorio
-Comment[he]=תהליך רקע שמאפשר לך לשתף את שולחן העבודה שלך
-Comment[hi]=आपके डेस्कटॉप को साझा करने देने वाला डेमन
-Comment[hr]=Daemon koji vam omogućuje da dijelite svoju radnu površinu s drugima
-Comment[hu]=Munkaasztal-megosztási szolgáltatás
-Comment[it]=Un demone che permette di condividere il tuo desktop
-Comment[ja]=デスクトップ共有を可能にするデーモン
-Comment[lt]=Tarnyba, leidžianti jums dalintis savo darbastaliu
-Comment[mn]=Таны ажлын байрыг хамтран эзэмшихийгзөвшөөрсөн демон
-Comment[ms]=Daemon yang membenarkan anda berkongsi ruang kerja
-Comment[mt]=Daemon li jħallik taqsam id-desktop ma' ħaddieħor
-Comment[nb]=En programnisse som tillater deling av ditt skrivebord med andre
-Comment[nl]=Een daemon waarmee u uw bureaublad kunt vrijgeven om te delen
-Comment[nn]=Ein nisse som let deg dela skrivebordet
-Comment[nso]=Daemon yeo ego dumelelago go abelana ka desktop ya gago
-Comment[pl]=Usługa, która pozwala na współdzielenie pulpitu
-Comment[pt]=Um servidor que lhe permite partilhar o seu ecrã
-Comment[pt_BR]=Um servidor que permite a você compartilhar o seu ambiente de trabalho
-Comment[ro]=Un demon care vă permite saă partajaţi sistemul dumneavoastră
-Comment[ru]=Демон общего доступа к рабочему столу
-Comment[se]=Duogášprográmma mii diktá du juohkit čállinbeavddi earáiguin
-Comment[sk]=Démon ktorý umožní zdieľať vašu pracovnú plochu
-Comment[sl]=Demon, s katerim lahko delite vaše namizje
-Comment[sr]=Демон који вам дозвољава да делите вашу радну површину
-Comment[sv]=Demon som låter dig dela ut skrivbordet
-Comment[ta]=ஒரு டேமொன் உங்கள் மேஜைமேல் பகிர்வை அளிக்கும்
-Comment[th]=เดมอนอนุญาตให้คุณแบ่งการใช้งานพื้นที่ทำงานร่วมกัน
-Comment[uk]=Демон, що дозволяє спільне використання стільниць
-Comment[ven]=Daemon ine yani tendela nitshi kovhekana desktop yanu
-Comment[xh]=Daemon ekuvumela ukuba wabe i desktop yakho
-Comment[xx]=xxA daemon that allows you to share your desktopxx
-Comment[zh_CN]=允许您共享桌面的守护进程
-Comment[zh_TW]=讓您分享您的桌面的伺服程式
-Comment[zu]=I-daemoni ekuvumela uhlukaniselana nge-desktop
+Comment[x-test]=xxA daemon that allows you to share your desktopxx

krfb/krfb.desktop

@@ -1,58 +1,13 @@
-# KDE Config File  
+# KDE Config File
 [Desktop Entry]
 Type=Application
-Exec=krfb -caption "%c" %i %m
+Exec=krfb -caption "%c"
 Icon=krfb
 DocPath=krfb/index.html
-Terminal=0
-Name=Desktop Sharing
-Name[af]=Werkskerm Deeling
-Name[ar]=مشاركة سطح المكتب
-Name[bg]=Споделяне на работно място
-Name[bs]=Dijeljenje desktopa
-Name[ca]=Compartició de l'escriptori
-Name[cs]=Sdílení pracovní plochy
-Name[cy]=Rhannu Penbwrdd
-Name[da]=Skrivebordsdeling
-Name[de]=Arbeitsfläche freigeben
-Name[el]=Μοίρασμα επιφάνειας εργασίας
-Name[eo]=Tabuloj komunaj
-Name[es]=Compartición de escritorio
-Name[et]=Töölaua jagamine
-Name[fi]=Työpöydän jakaminen
-Name[fr]=Partage de bureau
-Name[gl]=Compartición do escritorio
-Name[he]=שיתוף שולחנות עבודה
-Name[hi]=डेस्कटॉप साझा
-Name[hr]=Dijeljenje radne površine
-Name[hu]=Munkaasztal-megosztás
-Name[it]=Condivisione Desktop
-Name[ja]=デスクトップ共有
-Name[lt]=Dalinimasis darbastaliu
-Name[mn]=Ажлын байрыг хамтран эзэмших
-Name[ms]=Perkongsian Ruang Kerja
-Name[mt]=Qsim tad-desktop
-Name[nb]=Delte skrivebord
-Name[nl]=Bureaubladvrijgave
-Name[nn]=Skrivebordsdeling
-Name[nso]=Kabagano ya Desktop
-Name[pl]=Współdzielenie pulpitu
-Name[pt]=Partilha do Ambiente de Trabalho
-Name[pt_BR]=Compartilhamento do Desktop
-Name[ro]=Partajare ecran
-Name[ru]=Общий рабочий стол
-Name[sk]=Zdieľanie pracovnej plochy
-Name[sl]=Deljenje namizja
-Name[sr]=Дељење радне површине
-Name[sv]=Dela ut skrivbordet
-Name[ta]=மேசைமேல் பகிர்வு
-Name[th]=ใช้งานพื้นที่ทำงานร่วมกัน
-Name[tr]=Masaüstü Paylaşımı
-Name[uk]=Спільні стільниці
-Name[ven]=U kovhekana ha Desikithopo
-Name[xh]=Ukwehlulelana kwe Desktop
-Name[xx]=xxDesktop Sharingxx
-Name[zh_CN]=桌面共享
-Name[zh_TW]=桌面分享
-Name[zu]=Ukwahlulelana kwe-Desktop
-Categories=Qt;KDE;System
+Terminal=false
+Name=Krfb
+Name[x-test]=xxKrfbxx
+GenericName=Desktop Sharing
+GenericName[fr]=Partage de bureau
+GenericName[x-test]=xxDesktop Sharingxx
+Categories=Qt;KDE;System;

krfb/krfbiface.h

@@ -1,3 +1,15 @@
+/*
+     Copyright 2002 Tim Jansen <tim@tjansen.de>
+*/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
 #ifndef __KRFB_IFACE_H
 #define __KRFB_IFACE_H
 

krfb/krfbifaceimpl.cc

@@ -1,3 +1,7 @@
+/*
+     Copyright 2002 Tim Jansen <tim@tjansen.de>
+*/
+
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *

krfb/krfbifaceimpl.h

@@ -1,3 +1,16 @@
+/*
+     Copyright 2002 Tim Jansen <tim@tjansen.de>
+*/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+ 
 #ifndef __KRFB_IFACE_IMPL_H
 #define __KRFB_IFACE_IMPL_H
 

krfb/main.cpp

@@ -33,7 +33,7 @@
 #include <kmessagebox.h>
 #include <qobject.h>
 #include <qwindowdefs.h>
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qdatastream.h>
 #include <dcopref.h>
 
@@ -48,7 +48,7 @@ static const char description[] = I18N_NOOP("VNC-compatible server to share "
 
 static KCmdLineOptions options[] =
 {
-	{ ARG_KINETD " ", I18N_NOOP("Used for calling from kinetd."), 0},
+	{ ARG_KINETD " ", I18N_NOOP("Used for calling from kinetd"), 0},
 	KCmdLineLastOption
 };
 
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
 	RFBController controller(config);
 	KRfbIfaceImpl dcopiface(&controller);
 
-	QObject::connect(&app, SIGNAL(lastWindowClosed()), // dont show passivepopup
+	QObject::connect(&app, SIGNAL(lastWindowClosed()), // do not show passivepopup
 			 &trayicon, SLOT(prepareQuit()));
 	QObject::connect(&app, SIGNAL(lastWindowClosed()),
 			 &controller, SLOT(closeConnection()));
@@ -180,7 +180,7 @@ int main(int argc, char *argv[])
 	bool ok;
 	int fdNum = fdString.toInt(&ok);
 	if (!ok) {
-	  kdError() << "kinetd fd was not numeric." << endl;
+	  kError() << "kinetd fd was not numeric." << endl;
 	  return 2;
 	}
 	controller.startServer(fdNum);

krfb/manageinvitations.ui

@@ -12,7 +12,7 @@
             <height>350</height>
         </rect>
     </property>
-    <property name="caption">
+    <property name="windowTitle">
         <string>Manage Invitations - Desktop Sharing</string>
     </property>
     <property name="icon">
@@ -33,7 +33,7 @@
                 <cstring>Spacer10</cstring>
             </property>
             <property name="orientation">
-                <enum>Horizontal</enum>
+                <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeType">
                 <enum>Expanding</enum>
@@ -50,7 +50,7 @@
                 <cstring>Spacer7</cstring>
             </property>
             <property name="orientation">
-                <enum>Vertical</enum>
+                <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeType">
                 <enum>Expanding</enum>
@@ -62,7 +62,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="KListView" row="0" column="0" rowspan="5" colspan="1">
+        <widget class="K3ListView" row="0" column="0" rowspan="5" colspan="1">
             <column>
                 <property name="text">
                     <string>Created</string>
@@ -202,7 +202,7 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">klistview.h</include>
+    <include location="global" impldecl="in declaration">k3listview.h</include>
     <include location="local" impldecl="in implementation">manageinvitations.ui.h</include>
 </includes>
 <slots>
@@ -211,6 +211,6 @@
 </slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>k3listview.h</includehint>
 </includehints>
 </UI>

krfb/manageinvitations.ui.h

@@ -1,9 +1,22 @@
+/*
+     Copyright 2002 Tim Jansen <tim@tjansen.de>
+*/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+ 
 void ManageInvitationsDialog::listSizeChanged(int i) {
 	deleteAllButton->setEnabled(i);
 }
 
 void ManageInvitationsDialog::listSelectionChanged() {
-	QListViewItem *i = listView->firstChild();
+	Q3ListViewItem *i = listView->firstChild();
 	while(i) {
 		if (i->isSelected()) {
 			deleteOneButton->setEnabled(true);

krfb/personalinvitedialog.cc

@@ -0,0 +1,54 @@
+/* This file is part of the KDE project
+   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "personalinvitedialog.h"
+#include "personalinvitewidget.h"
+
+#include <qlabel.h>
+
+#include <kactivelabel.h>
+#include <kiconloader.h>
+#include <klocale.h>
+
+PersonalInviteDialog::PersonalInviteDialog( QWidget *parent, const char *name )
+    : KDialogBase( parent, name, true, i18n( "Personal Invitation" ),
+                   Close, Close, true )
+{
+  m_inviteWidget = new PersonalInviteWidget( this, "PersonalInviteWidget" );
+  m_inviteWidget->pixmapLabel->setPixmap( 
+      UserIcon( "connection-side-image.png" ) );
+
+  setMainWidget( m_inviteWidget );
+}
+
+void PersonalInviteDialog::setHost( const QString &host, uint port )
+{
+  m_inviteWidget->hostLabel->setText( QString( "%1:%2" )
+      .arg( host ).arg( port ) );
+}
+
+void PersonalInviteDialog::setPassword( const QString &passwd )
+{
+  m_inviteWidget->passwordLabel->setText( passwd );
+}
+
+void PersonalInviteDialog::setExpiration( const QDateTime &expire )
+{
+  m_inviteWidget->expirationLabel->setText( expire.toString( Qt::LocalDate ) );
+}

krfb/personalinvitedialog.h

@@ -0,0 +1,44 @@
+/* This file is part of the KDE project
+   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef PERSONALINVITEDIALOG_H
+#define PERSONALINVITEDIALOG_H
+
+class PersonalInviteWidget;
+
+#include <qdatetime.h>
+
+#include <kdialogbase.h>
+
+class PersonalInviteDialog : public KDialogBase
+{
+  public:
+    PersonalInviteDialog( QWidget *parent, const char *name );
+    virtual ~PersonalInviteDialog() {}
+
+    void setHost( const QString &host, uint port );
+    void setPassword( const QString &passwd );
+    void setExpiration( const QDateTime &expire );
+
+  protected:
+    PersonalInviteWidget *m_inviteWidget;
+};
+
+#endif // PERSONALINVITEDIALOG_H
+

krfb/personalinvitewidget.ui

@@ -0,0 +1,241 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>PersonalInviteWidget</class>
+<widget class="QWidget">
+    <property name="name">
+        <cstring>Form1</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>519</width>
+            <height>328</height>
+        </rect>
+    </property>
+    <property name="windowTitle">
+        <string></string>
+    </property>
+    <grid>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>0</number>
+        </property>
+        <property name="resizeMode">
+            <enum>Fixed</enum>
+        </property>
+        <widget class="KActiveLabel" row="0" column="1" rowspan="1" colspan="3">
+            <property name="name">
+                <cstring>mainTextLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="focusPolicy">
+                <enum>Qt::NoFocus</enum>
+            </property>
+            <property name="text">
+                <string>&lt;h2&gt;Personal Invitation&lt;/h2&gt;
+Give the information below to the person that you want to invite (&lt;a href="whatsthis:Desktop Sharing uses the VNC protocol. You can use any VNC client to connect. In KDE the client is called 'Remote Desktop Connection'. Enter the host information into the client and it will connect.."&gt;how to connect&lt;/a&gt;). Note that everybody who gets the password can connect, so be careful.</string>
+            </property>
+        </widget>
+        <spacer row="1" column="2">
+            <property name="name">
+                <cstring>spacer9</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>34</height>
+                </size>
+            </property>
+        </spacer>
+        <widget class="QLabel" row="0" column="0" rowspan="6" colspan="1">
+            <property name="name">
+                <cstring>pixmapLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>0</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>108</width>
+                    <height>318</height>
+                </size>
+            </property>
+            <property name="maximumSize">
+                <size>
+                    <width>108</width>
+                    <height>318</height>
+                </size>
+            </property>
+            <property name="frameShape">
+                <enum>WinPanel</enum>
+            </property>
+            <property name="frameShadow">
+                <enum>Sunken</enum>
+            </property>
+            <property name="scaledContents">
+                <bool>true</bool>
+            </property>
+        </widget>
+        <spacer row="5" column="2">
+            <property name="name">
+                <cstring>spacer10</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>30</height>
+                </size>
+            </property>
+        </spacer>
+        <widget class="KActiveLabel" row="2" column="2">
+            <property name="name">
+                <cstring>hostLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="focusPolicy">
+                <enum>Qt::NoFocus</enum>
+            </property>
+            <property name="text">
+                <string>cookie.tjansen.de:0</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="3" column="1">
+            <property name="name">
+                <cstring>kActiveLabel6</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="text">
+                <string>&lt;b&gt;Password:&lt;/b&gt;</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="4" column="1">
+            <property name="name">
+                <cstring>kActiveLabel7</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="text">
+                <string>&lt;b&gt;Expiration time:&lt;/b&gt;</string>
+            </property>
+        </widget>
+        <widget class="KActiveLabel" row="3" column="2">
+            <property name="name">
+                <cstring>passwordLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="focusPolicy">
+                <enum>Qt::NoFocus</enum>
+            </property>
+            <property name="text">
+                <string>12345</string>
+            </property>
+        </widget>
+        <widget class="KActiveLabel" row="4" column="2">
+            <property name="name">
+                <cstring>expirationLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="focusPolicy">
+                <enum>Qt::NoFocus</enum>
+            </property>
+            <property name="text">
+                <string>17:12</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="2" column="1">
+            <property name="name">
+                <cstring>kActiveLabel5</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="text">
+                <string>&lt;b&gt;Host:&lt;/b&gt;</string>
+            </property>
+        </widget>
+        <widget class="KActiveLabel" row="2" column="3">
+            <property name="name">
+                <cstring>hostHelpLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="text">
+                <string>(&lt;a href="whatsthis:This field contains the address of your computer and the display number, separated by a colon. The address is just a hint - you can use any address that can reach your computer. Desktop Sharing tries to guess your address from your network configuration, but does not always succeed in doing so. If your computer is behind a firewall it may have a different address or be unreachable for other computers."&gt;Help&lt;/a&gt;)</string>
+            </property>
+        </widget>
+    </grid>
+</widget>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</UI>

krfb/rfbcontroller.cc

@@ -41,7 +41,6 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kextsock.h>
 #include <qstring.h>
 #include <qcursor.h>
 #include <qwindowdefs.h>
@@ -51,12 +50,16 @@
 #include <qglobal.h>
 #include <qlabel.h>
 #include <qmutex.h>
-#include <qdeepcopy.h>
+#include <q3deepcopy.h>
 #include <qclipboard.h>
 #include <qdesktopwidget.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3PtrList>
 
 #include <X11/Xutil.h>
 #include <X11/extensions/XTest.h>
+#include <QX11Info>
 
 #ifndef ASSERT
 #define ASSERT(x) Q_ASSERT(x)
@@ -170,17 +173,11 @@ static void clipboardHook(char* str,int len, rfbClientPtr)
 	self->clipboardToServer(QString::fromUtf8(str, len));
 }
 
-
-void ConnectionDialog::closeEvent(QCloseEvent *)
-{
-	emit closed();
-}
-
 VNCEvent::~VNCEvent() {
 }
 
 Display *KeyboardEvent::dpy;
-char KeyboardEvent::modifiers[0x100];
+signed char KeyboardEvent::modifiers[0x100];
 KeyCode KeyboardEvent::keycodes[0x100];
 KeyCode KeyboardEvent::leftShiftCode;
 KeyCode KeyboardEvent::rightShiftCode;
@@ -199,7 +196,7 @@ void KeyboardEvent::initKeycodes() {
 	KeySym key,*keymap;
 	int i,j,minkey,maxkey,syms_per_keycode;
 
-	dpy = qt_xdisplay();
+	dpy = QX11Info::display();
 
 	memset(modifiers,-1,sizeof(modifiers));
 
@@ -228,7 +225,7 @@ void KeyboardEvent::initKeycodes() {
 }
 
 /* this function adjusts the modifiers according to mod (as from modifiers) and ModifierState */
-void KeyboardEvent::tweakModifiers(char mod, bool down) {
+void KeyboardEvent::tweakModifiers(signed char mod, bool down) {
 
 	bool isShift = ModifierState & (LEFTSHIFT|RIGHTSHIFT);
 	if(mod < 0)
@@ -290,7 +287,7 @@ PointerEvent::PointerEvent(int b, int _x, int _y) :
 	y(_y) {
 	if (!initialized) {
 		initialized = true;
-		dpy = qt_xdisplay();
+		dpy = QX11Info::display();
 		buttonMask = 0;
 	}
 }
@@ -351,23 +348,19 @@ void SessionEstablishedEvent::exec() {
         controller->sendSessionEstablished();
 }
 
-
-
 RFBController::RFBController(Configuration *c) :
 	allowDesktopControl(false),
 	lastClipboardDirection(LAST_SYNC_TO_SERVER),
 	configuration(c),
+	dialog( 0, "ConnectionDialog" ),
 	disableBackgroundPending(false),
 	disableBackgroundState(false),
 	closePending(false),
 	forcedClose(false)
 {
 	self = this;
-	connect(dialog.acceptConnectionButton, SIGNAL(clicked()),
-		SLOT(dialogAccepted()));
-	connect(dialog.refuseConnectionButton, SIGNAL(clicked()),
-		SLOT(dialogRefused()));
-	connect(&dialog, SIGNAL(closed()), SLOT(dialogRefused()));
+	connect(&dialog, SIGNAL(okClicked()), SLOT(dialogAccepted()));
+	connect(&dialog, SIGNAL(cancelClicked()), SLOT(dialogRefused()));
 	connect(&initIdleTimer, SIGNAL(timeout()), SLOT(checkAsyncEvents()));
 	connect(&idleTimer, SIGNAL(timeout()), SLOT(idleSlot()));
 
@@ -383,7 +376,7 @@ RFBController::RFBController(Configuration *c) :
 	if (gethostname(hostname, 255))
 		hostname[0] = 0;
 	hostname[255] = 0;
-	desktopName = QString(i18n("%1@%2 (shared desktop)")).arg(KUser().loginName()).arg(hostname);
+	desktopName = i18n("%1@%2 (shared desktop)", KUser().loginName(), hostname);
 }
 
 RFBController::~RFBController()
@@ -395,7 +388,7 @@ RFBController::~RFBController()
 
 void RFBController::startServer(int inetdFd, bool xtestGrab)
 {
-	framebufferImage = XGetImage(qt_xdisplay(),
+	framebufferImage = XGetImage(QX11Info::display(),
 				     QApplication::desktop()->winId(),
 				     0,
 				     0,
@@ -465,7 +458,7 @@ void RFBController::startServer(int inetdFd, bool xtestGrab)
 
 	passwordChanged();
 
-	scanner = new XUpdateScanner(qt_xdisplay(),
+	scanner = new XUpdateScanner(QX11Info::display(),
 				     QApplication::desktop()->winId(),
 				     (unsigned char*)fb, w, h,
 				     server->rfbServerFormat.bitsPerPixel,
@@ -477,7 +470,7 @@ void RFBController::startServer(int inetdFd, bool xtestGrab)
 
 	if (xtestGrab) {
 		disabler.disable = false;
-		XTestGrabControl(qt_xdisplay(), true);
+		XTestGrabControl(QX11Info::display(), true);
 	}
 
 	rfbRunEventLoop(server, -1, TRUE);
@@ -517,8 +510,8 @@ void RFBController::connectionAccepted(bool aRC)
 void RFBController::acceptConnection(bool aRemoteControl)
 {
 	KNotifyClient::event("UserAcceptsConnection",
-			     i18n("User accepts connection from %1")
-			     .arg(remoteIp));
+			     i18n("User accepts connection from %1",
+			      remoteIp));
 
 	if (state != RFB_CONNECTING)
 		return;
@@ -530,8 +523,8 @@ void RFBController::acceptConnection(bool aRemoteControl)
 void RFBController::refuseConnection()
 {
 	KNotifyClient::event("UserRefusesConnection",
-			     i18n("User refuses connection from %1")
-			     .arg(remoteIp));
+			     i18n("User refuses connection from %1",
+			      remoteIp));
 
 	if (state != RFB_CONNECTING)
 		return;
@@ -578,8 +571,8 @@ void RFBController::disableBackground(bool state) {
 void RFBController::connectionClosed()
 {
 	KNotifyClient::event("ConnectionClosed",
-			     i18n("Closed connection: %1.")
-			     .arg(remoteIp));
+			     i18n("Closed connection: %1.",
+			      remoteIp));
 
 	idleTimer.stop();
 	initIdleTimer.stop();
@@ -623,7 +616,7 @@ void RFBController::idleSlot()
 
 	rfbUndrawCursor(server);
 
-	QPtrList<Hint> v;
+	Q3PtrList<Hint> v;
 	v.setAutoDelete(true);
 	QPoint p = QCursor::pos();
 	scanner->searchUpdates(v, p.y());
@@ -647,7 +640,7 @@ void RFBController::idleSlot()
 void RFBController::dialogAccepted()
 {
 	dialog.hide();
-	acceptConnection(dialog.allowRemoteControlCB->isChecked());
+	acceptConnection(dialog.allowRemoteControl());
 }
 
 void RFBController::dialogRefused()
@@ -690,7 +683,7 @@ bool RFBController::handleCheckPassword(rfbClientPtr cl,
 			cl->authChallenge, response, len);
 
 	if (!authd) {
-		QValueList<Invitation>::iterator it =
+		QList<Invitation>::iterator it =
 			configuration->invitations().begin();
 		while (it != configuration->invitations().end()) {
 			if (checkPassword((*it).password(),
@@ -707,13 +700,13 @@ bool RFBController::handleCheckPassword(rfbClientPtr cl,
 	if (!authd) {
 		if (configuration->invitations().size() > 0) {
 			sendKNotifyEvent("InvalidPasswordInvitations",
-					i18n("Failed login attempt from %1: wrong password")
-					.arg(remoteIp));
+					i18n("Failed login attempt from %1: wrong password",
+					 remoteIp));
 }
 		else
 			sendKNotifyEvent("InvalidPassword",
-					i18n("Failed login attempt from %1: wrong password")
-					.arg(remoteIp));
+					i18n("Failed login attempt from %1: wrong password",
+					 remoteIp));
 		return FALSE;
 	}
 
@@ -748,8 +741,8 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl)
 
 	if (state != RFB_WAITING) {
 		sendKNotifyEvent("TooManyConnections",
-					i18n("Connection refused from %1, already connected.")
-					.arg(host));
+					i18n("Connection refused from %1, already connected.",
+					 host));
 		return RFB_CLIENT_REFUSE;
 	}
 	remoteIp = host;
@@ -758,19 +751,19 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl)
 	if ((!configuration->askOnConnect()) &&
 	    (configuration->invitations().size() == 0)) {
 		sendKNotifyEvent("NewConnectionAutoAccepted",
-					i18n("Accepted uninvited connection from %1")
-					.arg(remoteIp));
+					i18n("Accepted uninvited connection from %1",
+					 remoteIp));
 
 		connectionAccepted(configuration->allowDesktopControl());
 		return RFB_CLIENT_ACCEPT;
 	}
 
 	sendKNotifyEvent("NewConnectionOnHold",
-				i18n("Received connection from %1, on hold (waiting for confirmation)")
-				.arg(remoteIp));
+				i18n("Received connection from %1, on hold (waiting for confirmation)",
+				 remoteIp));
 
-	dialog.ipLabel->setText(remoteIp);
-	dialog.allowRemoteControlCB->setChecked(true);
+	dialog.setRemoteHost(remoteIp);
+	dialog.setAllowRemoteControl( true );
 	dialog.setFixedSize(dialog.sizeHint());
 	dialog.show();
 	return RFB_CLIENT_ON_HOLD;
@@ -835,7 +828,7 @@ void RFBController::clipboardChanged() {
 
 	lastClipboardDirection = LAST_SYNC_TO_CLIENT;
 	lastClipboardText = text;
-	QCString ctext = text.utf8();
+	Q3CString ctext = text.utf8();
 	rfbSendServerCutText(server, ctext.data(), ctext.length());
 }
 
@@ -855,7 +848,7 @@ void RFBController::selectionChanged() {
 
 	lastClipboardDirection = LAST_SYNC_TO_CLIENT;
 	lastClipboardText = text;
-	QCString ctext = text.utf8();
+	Q3CString ctext = text.utf8();
 	rfbSendServerCutText(server, ctext.data(), ctext.length());
 }
 
@@ -887,7 +880,7 @@ extern "C" Bool XShmQueryExtension(Display*);
 
 bool RFBController::checkX11Capabilities() {
 	int bp1, bp2, majorv, minorv;
-	Bool r = XTestQueryExtension(qt_xdisplay(), &bp1, &bp2,
+	Bool r = XTestQueryExtension(QX11Info::display(), &bp1, &bp2,
 				     &majorv, &minorv);
 	if ((!r) || (((majorv*1000)+minorv) < 2002)) {
 		KMessageBox::error(0,
@@ -906,7 +899,7 @@ XTestDisabler::XTestDisabler() :
 
 void XTestDisabler::exec() {
 	if (disable)
-		XTestDiscard(qt_xdisplay());
+		XTestDiscard(QX11Info::display());
 }
 
 #include "rfbcontroller.moc"

krfb/rfbcontroller.h

@@ -24,12 +24,15 @@
 #define RFBCONTROLLER_H
 
 #include "configuration.h"
-#include "newconnectiondialog.h"
+#include "connectiondialog.h"
 #include "xupdatescanner.h"
 #include <ksock.h>
 #include <qobject.h>
 #include <qtimer.h>
 #include <qmutex.h>
+//Added by qt3to4:
+#include <QCloseEvent>
+#include <Q3PtrList>
 
 #define HAVE_PTHREADS
 #include "rfb.h"
@@ -49,15 +52,6 @@ typedef enum {
 	RFB_CONNECTED
 } RFBState;
 
-class ConnectionDialog : public KRFBConnectionDialog {
-	Q_OBJECT
-public:
-	virtual void closeEvent(QCloseEvent *);
-
-signals:
-	void closed();
-};
-
 class VNCEvent {
 public:
 	virtual void exec() = 0;
@@ -70,14 +64,14 @@ class KeyboardEvent : public VNCEvent {
 	KeySym keySym;
 
 	static Display *dpy;
-	static char modifiers[0x100];
+	static signed char modifiers[0x100];
 	static KeyCode keycodes[0x100], leftShiftCode, rightShiftCode, altGrCode;
 	static const int LEFTSHIFT;
 	static const int RIGHTSHIFT;
 	static const int ALTGR;
 	static char ModifierState;
 
-	static void tweakModifiers(char mod, bool down);
+	static void tweakModifiers(signed char mod, bool down);
 public:
 	static void initKeycodes();
 
@@ -198,7 +192,7 @@ private:
 	XImage *framebufferImage;
 
 	QMutex asyncMutex;
-	QPtrList<VNCEvent> asyncQueue;
+	Q3PtrList<VNCEvent> asyncQueue;
 
 	bool disableBackgroundPending; // background, as desired by libvncserver
 	bool disableBackgroundState; // real background state

krfb/trayicon.cpp

@@ -17,13 +17,17 @@
 
 #include "trayicon.h"
 #include <qtooltip.h>
+//Added by qt3to4:
+#include <QHideEvent>
+#include <QPixmap>
+#include <QMouseEvent>
 #include <kstdaction.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <kmenu.h>
 
 KPassivePopup2::KPassivePopup2(QWidget *parent) :
    KPassivePopup(parent){
@@ -47,7 +51,7 @@ KPassivePopup2 *KPassivePopup2::message( const QString &caption, const QString &
 }
 
 
-TrayIcon::TrayIcon(KDialog *d, Configuration *c) : 
+TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
 	KSystemTray(0, "krfb trayicon"),
 	configuration(c),
 	aboutDialog(d),
@@ -55,19 +59,20 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
 	quitting(false)
 {
 	KIconLoader *loader = KGlobal::iconLoader();
-	trayIconOpen = loader->loadIcon("eyes-open24", KIcon::User);
-	trayIconClosed = loader->loadIcon("eyes-closed24", KIcon::User);
+	trayIconOpen = loader->loadIcon("eyes-open24", K3Icon::User);
+	trayIconClosed = loader->loadIcon("eyes-closed24", K3Icon::User);
 	setPixmap(trayIconClosed);
 	QToolTip::add(this, i18n("Desktop Sharing - connecting"));
 
-	manageInvitationsAction = new KAction(i18n("Manage &Invitations"), QString::null, 
-					      0, this, SIGNAL(showManageInvitations()), 
+	manageInvitationsAction = new KAction(i18n("Manage &Invitations"), QString::null,
+					      0, this, SIGNAL(showManageInvitations()),
 					      &actionCollection);
 	manageInvitationsAction->plug(contextMenu());
 
 	contextMenu()->insertSeparator();
 
 	enableControlAction = new KToggleAction(i18n("Enable Remote Control"));
+	enableControlAction->setCheckedState(i18n("Disable Remote Control"));
 	enableControlAction->plug(contextMenu());
 	enableControlAction->setEnabled(false);
 	connect(enableControlAction, SIGNAL(toggled(bool)), SIGNAL(enableDesktopControl(bool)));
@@ -96,11 +101,11 @@ void TrayIcon::prepareQuit() {
 void TrayIcon::showConnectedMessage(QString host) {
 
         setPixmap(trayIconOpen);
-        KPassivePopup2::message(i18n("Desktop Sharing"), 
-				i18n("The remote user has been authenticated and is now connected."), 
+        KPassivePopup2::message(i18n("Desktop Sharing"),
+				i18n("The remote user has been authenticated and is now connected."),
 				trayIconOpen,
 				this);
-	QToolTip::add(this, i18n("Desktop Sharing - connected with %1").arg(host));
+	QToolTip::add(this, i18n("Desktop Sharing - connected with %1", host));
 }
 
 void TrayIcon::showDisconnectedMessage() {
@@ -109,8 +114,8 @@ void TrayIcon::showDisconnectedMessage() {
 
 	QToolTip::add(this, i18n("Desktop Sharing - disconnected"));
         setPixmap(trayIconClosed);
-        KPassivePopup2 *p = KPassivePopup2::message(i18n("Desktop Sharing"), 
-						    i18n("The remote user has closed the connection."), 
+        KPassivePopup2 *p = KPassivePopup2::message(i18n("Desktop Sharing"),
+						    i18n("The remote user has closed the connection."),
 						    trayIconClosed,
 						    this);
 	connect(p, SIGNAL(hidden()), this, SIGNAL(diconnectedMessageDisplayed()));

krfb/trayicon.h

@@ -21,7 +21,11 @@
 #include "configuration.h"
 
 #include <qwidget.h>
-#include <kpixmap.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QHideEvent>
+#include <QMouseEvent>
+#include <QPixmap>
 #include <kaction.h>
 #include <ksystemtray.h>
 #include <kpassivepopup.h>
@@ -73,8 +77,8 @@ protected:
 
 private:
 
-  	KPixmap trayIconOpen;
-  	KPixmap trayIconClosed;
+  	QPixmap trayIconOpen;
+  	QPixmap trayIconClosed;
 	Configuration *configuration;
 	KDialog* aboutDialog;
 	KActionCollection actionCollection;

krfb/xupdatescanner.cc

@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 /*
@@ -43,6 +43,8 @@
 #include <assert.h>
 
 #include "xupdatescanner.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 /* ../../krfb/libvncserver/rfb.h */
 #ifdef Bool
@@ -352,11 +354,11 @@ static void printStatistics(Hint &hint) {
 	ssum += p;
 	snum++;
 	float avg = ssum / snum;
-	kdDebug() << "avg size: "<< avg <<"%"<<endl;
+	kDebug() << "avg size: "<< avg <<"%"<<endl;
 }
 
 void XUpdateScanner::flushHint(int x, int y, int &x0,
-			       Hint &hint, QPtrList<Hint> &hintList)
+			       Hint &hint, Q3PtrList<Hint> &hintList)
 {
 	if (x0 < 0)
 		return;
@@ -371,7 +373,7 @@ void XUpdateScanner::flushHint(int x, int y, int &x0,
 	hintList.append(new Hint(hint));
 }
 
-void XUpdateScanner::createHints(QPtrList<Hint> &hintList)
+void XUpdateScanner::createHints(Q3PtrList<Hint> &hintList)
 {
 	Hint hint;
 	int x0 = -1;
@@ -441,7 +443,7 @@ void XUpdateScanner::testScanline(int y, bool rememberHits) {
 	recentHitScanlines[MAX_RECENT_HITS-1] = y;
 }
 
-void XUpdateScanner::searchUpdates(QPtrList<Hint> &hintList, int ptrY)
+void XUpdateScanner::searchUpdates(Q3PtrList<Hint> &hintList, int ptrY)
 {
 	count++;
 	count %= SCANLINES;

krfb/xupdatescanner.h

@@ -14,14 +14,14 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 
 #ifndef _hexonet_rfb_XUpdateScanner_h_
 #define _hexonet_rfb_XUpdateScanner_h_
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/XShm.h>
 
@@ -76,15 +76,15 @@ class XUpdateScanner
 
 	// hitList: returns list of changes
 	// ptrY: ptrY: position of the cursor
-	void searchUpdates( QPtrList<Hint> &hintList, int ptrY);
+	void searchUpdates( Q3PtrList<Hint> &hintList, int ptrY);
 
  private:
 	void testScanline(int y, bool rememberHits);
 	bool copyTile(int x, int y, int tx, int ty);
 	void copyAllTiles();
 	void flushHint(int x, int y, int &x0, Hint &hint,
-		       QPtrList<Hint> &hintList);
-	void createHints(QPtrList<Hint> &hintList);
+		       Q3PtrList<Hint> &hintList);
+	void createHints(Q3PtrList<Hint> &hintList);
 	void addTileToHint(int x, int y, int th, Hint &hint);
 	void createHintFromTile(int x, int y, int th, Hint &hint);
 

krfb_httpd/CMakeLists.txt

@@ -0,0 +1,3 @@
+
+install( FILES kinetd_krfb_httpd.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
+install(PROGRAMS krfb_httpd DESTINATION ${BIN_INSTALL_DIR})

krfb_httpd/Makefile.am

@@ -1,3 +0,0 @@
-bin_SCRIPTS = krfb_httpd
-kde_services_DATA = kinetd_krfb_httpd.desktop
-

krfb_httpd/kinetd_krfb_httpd.desktop

@@ -14,49 +14,8 @@ X-KDE-KINETD-multiInstance=false
 X-KDE-KINETD-serviceLifetime=1200
 
 Name=KRfb Micro Httpd
-Name[bg]=Микро уеб сървър (KRfb - httpd)
-Name[cy]=Meicro-Httpd KRfb
-Name[da]=KRfb Micro-Httpd
-Name[de]=KRfb Mikro-Httpd
-Name[et]=KRfb mikro-httpd
 Name[fr]=Micro serveur httpd de KRfb
-Name[gl]=KRfg Micro-Httpd
-Name[hu]=KRfb mini-httpd
-Name[ms]=Httpd Mikro KRfb
-Name[nb]=KRfb mikro- http-nisse
-Name[nl]=KRfb micro webserver
-Name[pl]=Mikroskopijny serwer HTTP dla KRfb
-Name[pt]=Micro Httpd do KRfb
-Name[sv]=Krfb mikro-HTTP demon
-Name[tr]=KRfb Mini Httpd
-Name[xx]=xxKRfb Micro Httpdxx
-Name[zh_CN]=KRfb 微 Httpd
+Name[x-test]=xxKRfb Micro Httpdxx
 Comment=A micro http daemon for krfb that serves the VNC viewer applet.
-Comment[bg]=Малък уеб сървър, който обслужва аплета за преглед на VNC
-Comment[ca]=Un micro-dimoni http per a krfb que serveix l'applet visor VNC.
-Comment[cy]=Meicro-daemon http sy'n gwasanaethu'r rhaglennig gwelydd VNC
-Comment[da]=En mikro http-dæmon for krfb der betjener VNC visningsappletten.
-Comment[de]=Ein Mikro-HTTP-Dämon für krfb, der als VNC-Anzeige-Applet dient.
-Comment[el]=Ένας μικρός δαίμονας http για το krfb που εξυπηρετεί το εφαρμογίδιο προβολής VNC.
-Comment[es]=Un micro demonio http para krfb que sirve de applet de visor VNC.
-Comment[et]=Mikro-HTTP deemon KRfb jaoks, mis teenindab VNC apletti.
-Comment[fi]=Pieni http-palvelin krfb ohjelmalle, joka jakaa VNC-näyttäjäsovelmaa
 Comment[fr]=Un mini serveur http pour KRfb dédié à l'applet d'affichage de bureaux VNC.
-Comment[gl]=Un micro demo de HTTP para krfb que serve unha applet de visualización de VNC
-Comment[he]=שרת http זעיר עבור krfb שמשרת את יישומון תצוגת VNC.
-Comment[hu]=Mini HTTP-szolgáltatás a KRfb-hez, a VNC nézegető használatához.
-Comment[it]=Un micro demone http per krfb che server l'applet di VNC viewer. 
-Comment[ms]=Daemon http miKro untuk krfb yang melayan aplet pelihat VNC.
-Comment[nb]=En bitteliten http-nisse for krfb som hjelper visningsprogrammet for VNC.
-Comment[nl]=Een micro webserver voor krfb dat de VNC weergave-applet beschikbaar stelt.
-Comment[pl]=Mikroskopijny serwer HTTP dla KRfb obsługującego aplet przeglądarki VNC.
-Comment[pt]=Um micro-servidor de HTTP para o krfb que serve a 'applet' de visualização de VNC.
-Comment[pt_BR]=Um micro daemon de http, para o krfb, que serve o miniaplicativo de visualização do VNC.
-Comment[sk]=Mikro http démon pre krfb ktorý ovláda prehliadací applet VNC.
-Comment[sl]=Mikro http demon za krfb, ki streže pregledovalniku vstavkov VNC.
-Comment[sr]=Микро http демон за krfb који опслужује аплет VNC приказивача.
-Comment[sv]=En mikro-HTTP demon för Krfb som hanterar VNC-visningsminiprogrammet
-Comment[ta]=krfb க்காண நுண்ணிய http அது VNC சேவையை குறுப்பயன் பார்வையாளர்.
-Comment[tr]=VNC izleyici programcığını çalıştıran mini bir web sunucu.
-Comment[xx]=xxA micro http daemon for krfb that serves the VNC viewer applet.xx
-Comment[zh_CN]=支持 VNC 查看器小程序的 krfb 小 http 守护程序
+Comment[x-test]=xxA micro http daemon for krfb that serves the VNC viewer applet.xx

krfb_httpd/krfb_httpd

@@ -1,72 +1 @@
-#!/bin/bash
-
-if [ "$1" = "--kinetd" ]; then
-	# redirect stdin and stdout to the inetd socket.
-	exec <&$2 >&$2
-fi
-
-read request url httptype || exit 0
-url="${url/
-/}"
-httptype="${httptype/
-/}"
-
-if [ "x$httptype" != "x" ]; then
-	line="x"
-	while [ -n "$line" ]; do
-		read line || exit 0
-		line="${line/
-/}"
-	done
-fi
-# echo "url = $url, request = $request" >> /tmp/httpd.log
-case "$url" in
-/)
-	# We need the size of the display for the current applet.
-	size=`xdpyinfo -display :0| grep dimensions:|head -1|sed -e "s/.*dimensions: *//" -e "s/ pixels.*//"`
-	width=`echo $size|sed -e "s/x.*//"`
-	height=`echo $size|sed -e "s/.*x//"`
-	# The VNC menubar is 20 pixels high ...
-	height=$((height+20))
-
-	port=`dcop kded kinetd port krfb`
-	if [ "$port" == "-1" ]; then
-		port=5900
-	fi
-
-	ctype="text/html"
-	content="
-<HTML><HEAD><TITLE>$LOGNAME's desktop</TITLE></HEAD>
-<BODY>
-<APPLET CODE=vncviewer.class ARCHIVE=vncviewer.jar WIDTH=$width HEIGHT=$height>
-	<param name=PORT value=$port>
-</APPLET>
-</BODY></HTML>"
-	;;
-*.jar|*.class)
-	# Use basename to make sure we have just a filename, not ../../...
-	url="`basename "$url"`"
-	ctype="application/octet-stream"
-	cfile="/usr/share/vnc/classes/$url"
-	content="FILE"
-	;;
-esac
-
-if [ "x$httptype" != "x" ]; then
-	echo "HTTP/1.0 200 OK"
-	echo "Content-Type: $ctype"
-	if [ "$content" == "FILE" ]; then
-		clen=`wc -c "$cfile"`
-	else
-		clen=`echo "$content"|wc -c`
-	fi
-	echo "Content-Length: $clen"
-	echo "Connection: close"
-	echo
-fi
-
-if [ "$request" == "GET" ]; then
-	if [ "$content" == "FILE" ]; then
-		cat "$cfile"
-	else
-		echo "$content"
+#! /usr/bin/env bash

libvncserver/CMakeLists.txt

@@ -0,0 +1,29 @@
+
+
+
+
+########### next target ###############
+
+
+########### install files ###############
+
+
+
+
+
+#original Makefile.am contents follow:
+
+#INCLUDES = $(all_includes)
+#
+#noinst_LTLIBRARIES = libvncserver.la
+#
+#libvncserver_la_SOURCES = main.c rfbserver.c sraRegion.c auth.c sockets.c \
+#	stats.c corre.c hextile.c rre.c translate.c cutpaste.c \
+#	zlib.c tight.c httpd.c cursor.c font.c \
+#	draw.c selbox.c d3des.c vncauth.c cargs.c
+#
+#EXTRA_DIST = CHANGES COPYING README TODO
+#
+#AM_CPPFLAGS = -DHAVE_PTHREADS -DALLOW24BPP
+#AM_CFLAGS = -Wno-unused
+#

libvncserver/COPYING

@@ -2,8 +2,8 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          59 Temple Place - Suite 330, Boston, MA
-                          02111-1307, USA.
+                          51 Franklin Steet, Fifth Floor, Boston, MA
+                          02110-1301, USA.
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -306,7 +306,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
 
 Also add information on how to contact you by electronic and paper mail.
 

libvncserver/Makefile.am

@@ -1,14 +0,0 @@
-INCLUDES = $(all_includes)
-
-noinst_LTLIBRARIES = libvncserver.la
-
-libvncserver_la_SOURCES = main.c rfbserver.c sraRegion.c auth.c sockets.c \
-	stats.c corre.c hextile.c rre.c translate.c cutpaste.c \
-	zlib.c tight.c httpd.c cursor.c font.c \
-	draw.c selbox.c d3des.c vncauth.c cargs.c
-
-EXTRA_DIST = CHANGES COPYING README TODO
-
-AM_CPPFLAGS = -DHAVE_PTHREADS -DALLOW24BPP
-AM_CFLAGS = -Wno-unused
-

libvncserver/README

@@ -409,7 +409,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.dfdf
+Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.dfdf
 
 Contact
 -------

libvncserver/auth.c

@@ -22,7 +22,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 

libvncserver/cargs.c

@@ -1,12 +1,12 @@
 /*
- *  This parses the command line arguments. It was seperated from main.c by 
+ *  This parses the command line arguments. It was separated from main.c by
  *  Justin Dearing <jdeari01@longisland.poly.edu>.
  */
 
 /*
  *  LibVNCServer (C) 2001 Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
  *  Original OSXvnc (C) 2001 Dan McGuirk <mcguirk@incompleteness.net>.
- *  Original Xvnc (C) 1999 AT&T Laboratories Cambridge.  
+ *  Original Xvnc (C) 1999 AT&T Laboratories Cambridge.
  *  All Rights Reserved.
  *
  *  see GPL (latest version) for full details
@@ -46,13 +46,13 @@ void rfbPurgeArguments(int* argc,int* position,int count,char *argv[])
   (*position)--;
 }
 
-void 
+void
 rfbProcessArguments(rfbScreenInfoPtr rfbScreen,int* argc, char *argv[])
 {
     int i,i1;
 
     if(!argc) return;
-    
+
     for (i = i1 = 1; i < *argc; i++) {
         if (strcmp(argv[i], "-help") == 0) {
 	    rfbUsage();
@@ -107,7 +107,7 @@ void rfbSizeUsage()
     exit(1);
 }
 
-void 
+void
 rfbProcessSizeArguments(int* width,int* height,int* bpp,int* argc, char *argv[])
 {
     int i,i1;

libvncserver/corre.c

@@ -22,7 +22,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 

libvncserver/cursor.c

@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 
@@ -248,8 +248,8 @@ rfbSendSoftCursor(rfbClientPtr cl, Bool cursorWasChanged)
     /* Send buffer contents if needed. */
 
     if ( cl->ublen + sizeof(rfbSoftCursorMove) + 
-	 ((scNindex >= 0) ? 
-	 (sizeof(rfbSoftCursorSetImage) + imgLen) : 0)) {
+	 ((scNindex >= 0 && cursorWasChanged) ? 
+	 (sizeof(rfbSoftCursorSetImage) + imgLen) : 0) > UPDATE_BUF_SIZE) {
 			    
 	if (!rfbSendUpdateBuf(cl))
 	    return FALSE;
@@ -257,7 +257,7 @@ rfbSendSoftCursor(rfbClientPtr cl, Bool cursorWasChanged)
 
     saved_ublen = cl->ublen;
 
-    if (scNindex >= 0) {
+    if (scNindex >= 0 && cursorWasChanged) {
 	rect.encoding = Swap32IfLE(rfbEncodingSoftCursor);
 	if (pCursor) {
 	    rect.r.x = Swap16IfLE(pCursor->xhot);

libvncserver/cutpaste.c

@@ -19,7 +19,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 

libvncserver/d3des.h

@@ -14,6 +14,9 @@
  */
 
 /* d3des.h -
+ *
+ *
+ * A portable, public domain, version of the Data Encryption Standard.
  *
  *	Headers and defines for d3des.c
  *	Graven Imagery, 1992.

libvncserver/example.c

@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 

libvncserver/fontsel.c

@@ -57,12 +57,12 @@ int main(int argc,char** argv)
     fprintf(stderr,"Couldn't find %s\n",DEFAULTFONT);
     exit(1);
   }
-  
+
   for(j=0;j<0;j++)
     rfbProcessEvents(s,900000);
 
   i = rfbSelectBox(s,font,fontlist,10,20,200,300,0xffdfdf,0x602040,2,showFont);
-  fprintf(stderr,"Selection: %d: %s\n",i,(i>=0)?fontlist[i]:"cancelled");
+  fprintf(stderr,"Selection: %d: %s\n",i,(i>=0)?fontlist[i]:"canceled");
 
   rfbFreeFont(font);
 

libvncserver/hextile.c

@@ -21,7 +21,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 

libvncserver/httpd.c

@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 

libvncserver/rfb.h

@@ -22,7 +22,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 
@@ -242,7 +242,7 @@ typedef struct _rfbScreenInfo
      */
     void* screenData;
 
-    /* The following two members are used to minimise the amount of unnecessary
+    /* The following two members are used to minimize the amount of unnecessary
        drawing caused by cursor movement.  Whenever any drawing affects the
        part of the screen where the cursor is, the cursor is removed first and
        then the drawing is done (this is what the sprite routines test for).
@@ -794,7 +794,7 @@ void rfbDrawLine(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,Pixel col);
 
 /* this opens a modal select box. list is an array of strings, the end marked
    with a NULL.
-   It returns the index in the list or -1 if cancelled or something else
+   It returns the index in the list or -1 if canceled or something else
    wasn't kosher. */
 typedef void (*SelectionChangedHookPtr)(int _index);
 extern int rfbSelectBox(rfbScreenInfoPtr rfbScreen,

libvncserver/rfbproto.h

@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 

libvncserver/rfbserver.c

@@ -19,7 +19,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 

libvncserver/rre.c

@@ -22,7 +22,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 

libvncserver/sockets.c

@@ -35,7 +35,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 

libvncserver/stats.c

@@ -19,7 +19,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */
 

libvncserver/storepasswd.c

@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  *  USA.
  */