SVN_SILENT made messages (.desktop file)

svn path=/branches/KDE/4.2/kdenetwork/krfb/; revision=914113

.krazy

@@ -1,2 +1 @@
 SKIP /kinetd/
-

CMakeLists.txt

@@ -6,6 +6,12 @@ macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-krfb.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krfb.h )
 include_directories(${CMAKE_CURRENT_BINARY_DIR}) # for config-krfb.h
 
+if(Q_WS_X11)
+  if(NOT X11_XTest_FOUND)
+    macro_log_feature(X11_XTest_FOUND "libXtst" "X11 Testing Resource extension library" "http://xorg.freedesktop.org" FALSE "" "useful for automated testing of X clients.")
+  endif(NOT X11_XTest_FOUND)
+endif(Q_WS_X11)
+
 #add_subdirectory(kinetd)
 #add_subdirectory(kcm_krfb)
 if (HAVE_LIBVNCSERVER)
@@ -27,7 +33,6 @@ set(krfb_SRCS
    x11framebuffer.cpp
 )
 
-
 kde4_add_kcfg_files(krfb_SRCS krfbconfig.kcfgc)
 
 kde4_add_ui_files(krfb_SRCS connectionwidget.ui
@@ -40,9 +45,12 @@ kde4_add_ui_files(krfb_SRCS connectionwidget.ui
 
 kde4_add_executable(krfb ${krfb_SRCS})
 
-target_link_libraries(krfb  ${JPEG_LIBRARIES} ${SLP_LIBRARIES} ${LIBVNCSERVER_LIBRARIES} ${X11_Xdamage_LIB} ${KDE4_KDNSSD_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS})
+target_link_libraries(krfb ${JPEG_LIBRARIES}  ${LIBVNCSERVER_LIBRARIES} ${X11_Xdamage_LIB} ${KDE4_KDNSSD_LIBS})
+if(X11_XTest_FOUND)
+  target_link_libraries(krfb ${X11_XTest_LIB})
+endif(X11_XTest_FOUND)
 
-install(TARGETS krfb  DESTINATION ${BIN_INSTALL_DIR})
+install(TARGETS krfb  ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
 

connectioncontroller.cpp

@@ -4,8 +4,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 #include "connectioncontroller.h"
 #include "connectioncontroller.moc"
@@ -22,6 +22,7 @@
 #include <KUser>
 #include <KNotification>
 #include <KLocale>
+#include <KDebug>
 
 
 #include "invitationmanager.h"
@@ -153,7 +154,7 @@ bool ConnectionController::handleCheckPassword(rfbClientPtr cl, const char *resp
     if (!authd) {
         QList<Invitation> invlist = InvitationManager::self()->invitations();
 
-        foreach(Invitation it, invlist) {
+        foreach(const Invitation &it, invlist) {
             kDebug() << "checking password";
             if (checkPassword(it.password(), cl->authChallenge, response, len) && it.isValid()) {
                 authd = true;

connectioncontroller.h

@@ -3,8 +3,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 
 #ifndef CONNECTIONCONTROLLER_H

events.cpp

@@ -4,8 +4,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 
 #include "events.h"

events.h

@@ -4,8 +4,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 
 #ifndef EVENTS_H

framebuffer.cpp

@@ -3,8 +3,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 
 #include "framebuffer.h"

framebuffer.h

@@ -3,8 +3,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 
 #ifndef FRAMEBUFFER_H

invitation.cpp

@@ -14,6 +14,8 @@
 
 #include "invitation.h"
 
+#include <KConfigGroup>
+#include <KDebug>
 #include <KRandom>
 #include <KStringHandler>
 
@@ -72,11 +74,11 @@ Invitation &Invitation::operator= (const Invitation&x) {
 	return *this;
 }
 
-void Invitation::save(KConfigGroup &config) const {
-    kDebug() << "write: " << m_password << ": " << KStringHandler::obscure(m_password);
+void Invitation::save(KConfigGroup &config) const 
+{
     config.writeEntry("password", KStringHandler::obscure(m_password));
-	config.writeEntry("creation", m_creationTime);
-	config.writeEntry("expiration", m_expirationTime);
+    config.writeEntry("creation", m_creationTime);
+    config.writeEntry("expiration", m_expirationTime);
 }
 
 QString Invitation::password() const {

invitationmanager.cpp

@@ -3,24 +3,28 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 #include "invitationmanager.h"
 #include "invitationmanager.moc"
 
-#include <K3StaticDeleter>
 #include <KConfigGroup>
 #include <KConfig>
 #include <KGlobal>
 
 #include <QTimer>
 
-static K3StaticDeleter<InvitationManager> sd;
-InvitationManager * InvitationManager::_self = 0;
+class InvitationManagerPrivate
+{
+public:
+    InvitationManager instance;
+};
+
+K_GLOBAL_STATIC(InvitationManagerPrivate, invitationManagerPrivate)
+
 InvitationManager * InvitationManager::self() {
-    if (!_self) sd.setObject(_self, new InvitationManager);
-    return _self;
+    return &invitationManagerPrivate->instance;
 }
 
 InvitationManager::InvitationManager()

invitationmanager.h

@@ -3,8 +3,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 #ifndef INVITATIONMANAGER_H
 #define INVITATIONMANAGER_H
@@ -14,13 +14,14 @@
 #include "invitation.h"
 
 
-class InvitationManager;
+class InvitationManagerPrivate;
 /**
 	@author Alessandro Praduroux <pradu@pradu.it>
 */
 class InvitationManager : public QObject
 {
 Q_OBJECT
+friend class InvitationManagerPrivate;
 public:
     static InvitationManager *self();
 

invitedialog.cpp

@@ -33,8 +33,8 @@ InviteDialog::InviteDialog( QWidget *parent )
 {
   setCaption(i18n("Invitation"));
   setButtons(User1|Close|Help);
+  setHelp(QString(), "krfb");
   setDefaultButton(NoDefault);
-  setModal(true);
 
   setMinimumSize(500, 300);
 

invitewidget.ui

@@ -9,9 +9,6 @@
     <height>364</height>
    </rect>
   </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
   <layout class="QHBoxLayout" >
    <item>
     <widget class="QLabel" name="pixmapLabel" >
@@ -50,10 +47,7 @@
      <item>
       <widget class="QLabel" name="helpLabel" >
        <property name="text" >
-        <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">KDE Desktop Sharing allows you to invite somebody at a remote location to watch and possibly control your desktop. &lt;a href="whatsthis">More about invitations...&lt;/a>&lt;/p>&lt;/body>&lt;/html></string>
+        <string>KDE Desktop Sharing allows you to invite somebody at a remote location to watch and possibly control your desktop. &lt;a href="whatsthis">More about invitations...&lt;/a></string>
        </property>
        <property name="textFormat" >
         <enum>Qt::RichText</enum>
@@ -61,11 +55,8 @@ p, li { white-space: pre-wrap; }
        <property name="wordWrap" >
         <bool>true</bool>
        </property>
-       <property name="openExternalLinks" >
-        <bool>false</bool>
-       </property>
        <property name="textInteractionFlags" >
-        <set>Qt::LinksAccessibleByMouse</set>
+        <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::NoTextInteraction</set>
        </property>
       </widget>
      </item>

kcm_krfb/kcmkrfb.desktop

@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Icon=krfb
-Exec=kcmshell kcmkrfb
+Exec=kcmshell4 kcmkrfb
 Type=Service
-DocPath=krfb/krfb-configuration.html
-ServiceTypes=KCModule
+X-DocPath=krfb/krfb-configuration.html
+X-KDE-ServiceTypes=KCModule
 
 
 X-KDE-Library=kcm_krfb
@@ -13,7 +12,9 @@ X-KDE-ParentApp=kcontrol
 
 Name=Desktop Sharing
 Name[af]=Werkskerm Deeling
+Name[ar]=مشاركة سطح المكتب
 Name[bg]=Споделяне на работното място
+Name[bn]=ডেস্কটপ ভাগাভাগি
 Name[br]=Rannañ ar vurev
 Name[ca]=Compartició de l'escriptori
 Name[cs]=Sdílení pracovní plochy
@@ -21,7 +22,7 @@ Name[cy]=Rhannu Penbwrdd
 Name[da]=Desktopdeling
 Name[de]=Arbeitsflächen-Freigabe
 Name[el]=Κοινή χρήση επιφάνειας εργασίας
-Name[eo]=Tabuloj komunaj
+Name[eo]=Tabula komunigado
 Name[es]=Escritorio compartido
 Name[et]=Töölaua jagamine
 Name[eu]=Mahaigain partekatzea
@@ -29,32 +30,38 @@ Name[fa]=اشتراک رومیزی
 Name[fi]=Työpöydän jakaminen
 Name[fr]=Partage de bureau
 Name[ga]=Roinnt Deisce
-Name[gl]=Compartición do escritorio
+Name[gl]=Compartilla do escritorio
 Name[he]=שיתוף שולחנות עבודה
+Name[hi]=डेस्कटॉप साझेदारी
 Name[hr]=Dijeljenje radne površine
 Name[hu]=Munkaasztal-megosztás
 Name[is]=Skjáborðamiðlun
-Name[it]=Condivisione Desktop
+Name[it]=Condivisione desktop
 Name[ja]=デスクトップ共有
 Name[kk]=Үстелді ортақтастыру
 Name[km]=ការ​ចែក​រំលែក​ផ្ទៃ​តុ
+Name[ko]=데스크톱 공유
 Name[lt]=Dalinimasis darbastaliu
+Name[lv]=Darbvirsmas koplietošana
 Name[mk]=Делење на работната површина
+Name[ml]=പണിയിടം പങ്കുവെക്കല്‍
 Name[ms]=Perkongsian Ruang Kerja
 Name[nb]=Delte skrivebord
 Name[nds]=Schriefdisch-Freegaav
 Name[ne]=डेस्कटप साझेदारी
 Name[nl]=Bureaublad delen
 Name[nn]=Skrivebordsdeling
+Name[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ
 Name[pl]=Współdzielenie pulpitu
 Name[pt]=Partilha do Ecrã
 Name[pt_BR]=Compartilhamento do Desktop
-Name[ro]=Partajare ecran
+Name[ro]=Partajare birou
 Name[ru]=Общий рабочий стол
 Name[se]=Čállinbeavdejuohkkin
+Name[sk]=Zdieľanie pracovnej plochy
 Name[sl]=Deljenje namizja
-Name[sr]=Дељење радне површине
-Name[sr@latin]=Deljenje radne površine
+Name[sr]=Дељење површи
+Name[sr@latin]=Deljenje površi
 Name[sv]=Dela ut skrivbordet
 Name[ta]=பணிமேடை பகிர்வு
 Name[tg]=Истифодабарии муштараки Мизи корӣ
@@ -63,12 +70,15 @@ Name[uk]=Спільні стільниці
 Name[vi]=Chia sẻ màn hình nền
 Name[x-test]=xxDesktop Sharingxx
 Name[xh]=Ukwehlulelana kwe Desktop
+Name[zh_CN]=桌面共享
 Name[zh_HK]=桌面分享
 Name[zh_TW]=桌面分享
 
 Comment=Configure Desktop Sharing
 Comment[af]=Konfigureer Werkskerm Deeling
+Comment[ar]=تعديل مشاركة سطح المكتب
 Comment[bg]=Настройване споделянето на работното място
+Comment[bn]=ডেস্কটপ ভাগাভাগি কনফিগার করুন
 Comment[br]=Kefluniañ rannañ ar vurev
 Comment[ca]=Lupa de l'escriptori
 Comment[cs]=Nastavit sdílení pracovní plochy
@@ -76,7 +86,7 @@ Comment[cy]=Ffurfweddu Rhannu Penbwrdd
 Comment[da]=Indstil desktopdeling
 Comment[de]=Freigabe der Arbeitsfläche einrichten
 Comment[el]=Ρύθμιση της κοινής χρήσης της επιφάνειας εργασίας
-Comment[eo]=Agordu fordonadon de viaj tabuloj
+Comment[eo]=Agordi la tabulan komunigadon
 Comment[es]=Configure su escritorio compartido
 Comment[et]=Töölaua jagamise seadistamine
 Comment[eu]=Konfiguratu mahaigain partekatzea
@@ -84,8 +94,9 @@ Comment[fa]=پیکربندی اشتراک رومیزی
 Comment[fi]=Aseta työpöydän jakaminen
 Comment[fr]=Configuration du partage du bureau
 Comment[ga]=Cumraigh Roinnt Deisce
-Comment[gl]=Configura-la compartición do escritorio
+Comment[gl]=Configurar a compartilla do escritorio
 Comment[he]=שינוי הגדרות שיתוף שולחנות העבודה
+Comment[hi]=डेस्कटॉप साझेदारी कॉन्फ़िगर करें
 Comment[hr]=Podešavanje dijeljenja radne površine
 Comment[hu]=A munkaasztal-megosztás beállításai
 Comment[is]=Stilla skjáborðsmiðlun
@@ -93,22 +104,28 @@ Comment[it]=Configura condivisione desktop
 Comment[ja]=デスクトップ共有の設定
 Comment[kk]=Үстелді ортақтастыруды баптау
 Comment[km]=កំណត់​រចនា​សម្ព័ន្ធ​ការ​ចែក​រំលែក​ផ្ទៃ​តុ
-Comment[lt]=Derinti dalinimąsi darbastaliu
+Comment[ko]=데스크톱 공유 설정
+Comment[lt]=Konfigūruoti dalinimąsi darbastaliu
+Comment[lv]=Konfigurē darbvirsmas koplietošanu
 Comment[mk]=Конфигурирајте делење на површината
+Comment[ml]=പണിയിടം പങ്കുവെക്കല്‍ ക്രമീകരിക്കാം
 Comment[ms]= Selaraskan Perkongsian Desktop
 Comment[nb]=Tilpass delte skrivebord
 Comment[nds]=Schriefdisch-Freegaav instellen
 Comment[ne]=डेस्कटप साझेदारी कन्फिगर गर्नुहोस्
 Comment[nl]=Bureaublad delen instellen
 Comment[nn]=Set opp skrivebordsdeling
+Comment[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ ਸੰਰਚਨਾ
 Comment[pl]=Konfiguracja współdzielenia pulpitu
 Comment[pt]=Configurar a Partilha do Ecrã
 Comment[pt_BR]=Configurar Compartilhamento do Desktop
+Comment[ro]=Configurează partajarea biroului
 Comment[ru]=Параметры общего рабочего стола
 Comment[se]=Heivet čállinbeavdejuohkkima
+Comment[sk]=Nastavenie zdieľania pracovnej plochy
 Comment[sl]=Nastavi deljenje namizja
-Comment[sr]=Подешавање дељења радне површине
-Comment[sr@latin]=Podešavanje deljenja radne površine
+Comment[sr]=Подешавање дељења површи
+Comment[sr@latin]=Podešavanje deljenja površi
 Comment[sv]=Anpassa utdelning av skrivbord
 Comment[ta]=பணிமேடை பகிர்வை உள்ளமை
 Comment[tg]=Батанзимдарории Истифодабарии муштараки Мизи корӣ
@@ -117,49 +134,51 @@ Comment[uk]=Налаштувати спільні стільниці
 Comment[vi]=Cấu hình chia sẻ màn hình nền
 Comment[x-test]=xxConfigure Desktop Sharingxx
 Comment[xh]=Qwalasela Ukusebenzisa ngokuhlangeneyo kwe Desktop 
+Comment[zh_CN]=配置桌面共享
 Comment[zh_HK]=設定桌面分享
 Comment[zh_TW]=設定桌面分享
-Keywords=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited
-Keywords[bg]=Keywords=споделяне, работно, място, десктоп, покана, връзка, 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]=desktopdeling,krfb,vnc,deling,krdc,ekstern desktopforbindelse,invitation,port,slp,ikke inviteret
-Keywords[de]=Arbeitsfläche freigeben,krfb,VNC,freigeben,krdc,Entfernte Arbeitsfläche,Einladung,Port,slp,uneingeladen,rdp,remote desktop
-Keywords[el]=κοινή χρήση επιφάνειας εργασίας,krfb,vnc,κοινή χρήση,krdc,σύνδεση σε απομακρυσμένη επιφάνεια εργασίας,πρόσκληση,θύρα,slp,απρόσκλητο
-Keywords[es]=escritorio compartido,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[eu]=mahaigain partekatzea,krfb,vnc,partekatzea,krdc,urruneko mahaigain konexioa,gonbidapena,ataka,slp,gonbidapen gabea
-Keywords[fa]=اشتراک رومیزی، krfb، vnc، اتصال رومیزی راه دور، دعوت، درگاه، slp، دعوت‌نشده
-Keywords[fi]=työpöydän jakaminen,krfb,vnc,jakaminen,krdc,etätyöpöytäyhteys, kutsu,portti,slp,kutsumaton, työpöytä
-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]=שיתוף שולחן עבודה,שיתוף,חיבור לשולחן עבודה מרוחק,desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection, invitation, port, slp, uninvited
-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[is]=skjáborðsmiðlun,miðlun,krfb,vnc,rdp,krdc,fjarvinnsla,remote desktop connection,rdp
-Keywords[it]=condivisione desktop,krfb,vnc,condivisione,krdc,connessione desktop remoto,invito,porta,slp,non invitato
-Keywords[ja]=デスクトップ共有,krfb,vnc,共有,rdp,krdc,リモートデスクトップ接続,招待,ポート,slp,uninvited
-Keywords[km]=ការ​ចែក​រំ​លែក​ផ្ទៃ​តុ,krfb,vnc,ការ​ចែក​រំលែក,krdc,ការ​ត​ភ្ជាប់​ផ្ទៃ​តុ​ពី​ចម្ងាយ,អញ្ជើញ,ច្រក,slp,មិន​បាន​អញ្ជើញ
-Keywords[lt]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,dalinimasis darbastaliu,nutolusio darbastalio prijungimas,kvietimas,ryšys,nekviestas,jungtis,prievadas,dalintis,pasidalinti,jungimasis,prisijungti,kviesti
-Keywords[mk]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,делење на површината,krfb,vnc,делење,krdc,поврзување со оддалечена  површина,покана,порта,slp,непоканет
-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[nds]=schriefdisch,freegeven,freegaav,krfb,vnc,delen,krdc,feern Schriefdisch,verbinnen,inladen,port,slp,nich inlaadt
-Keywords[ne]=डेस्कटप साझेदारी,krfb,vnc,साझेदारी,krdc, टाढाको डेस्कटप जडान,निमन्त्रणा,पोर्ट,slp,निमन्त्रणा नगरिएको
-Keywords[nl]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,uitnodiging,slp,rdp,verbinding, bureaublad delen,bureaublad op afstand
-Keywords[nn]=skrivebordsdeling,krfb,vnc,deling,krdc,nettverksskrivebord,invitasjon,port,slp,ikkje invitert
-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[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[sr@latin]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,radna površina,deljenje,poziv,port,nepozvan,udaljeno
-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[uk]=спільні стільниці,krfb,vnc,спільний,rdp,krdc,з'єднання віддаленої стільниці,запрошення,rdp,slp,без запрошення
-Keywords[vi]=chia sẻ màn hình,krfb,vnc,chia sẻ,krdc,màn hình ở xa kết nối,mời kết nối,cổng,slp,không được mời
-Keywords[x-test]=xxdesktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvitedxx
-Keywords[zh_TW]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,rdp,桌面分享,分享,遠端桌面連線,invitation,port,slp,uninvited
+X-KDE-Keywords=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited
+X-KDE-Keywords[bg]=Keywords=споделяне, работно, място, десктоп, покана, връзка, desktop sharing, krfb, vnc, sharing, krdc, remote desktop connection, invitation, port, slp, uninvited
+X-KDE-Keywords[ca]=compartició de l'escriptori,krfb,vnc,compartir,krdc,connexió a l'escriptori remot,invitació,port,slp,no invitat
+X-KDE-Keywords[cs]=sdílení plochy,krfb,vnc,sdílení,rdp,krdc,připojení vzdálené plochy,pozvánka,port,slp
+X-KDE-Keywords[cy]=rhannu penbwrdd,krfb,vnc,rhannu,rdp,krdc,cysylltiad penbwrdd pell,gwahoddiad,porth,slp,heb wahoddiad
+X-KDE-Keywords[da]=desktopdeling,krfb,vnc,deling,krdc,ekstern desktopforbindelse,invitation,port,slp,ikke inviteret
+X-KDE-Keywords[de]=Arbeitsfläche freigeben,krfb,VNC,freigeben,krdc,Entfernte Arbeitsfläche,Einladung,Port,slp,uneingeladen,rdp,remote desktop
+X-KDE-Keywords[el]=κοινή χρήση επιφάνειας εργασίας,krfb,vnc,κοινή χρήση,krdc,σύνδεση σε απομακρυσμένη επιφάνεια εργασίας,πρόσκληση,θύρα,slp,απρόσκλητο
+X-KDE-Keywords[es]=escritorio compartido,krfb,vnc,compartir,rdp,krdc, conexión escritorio remoto,invitación,puerto,slp,no invitado
+X-KDE-Keywords[et]=töölaua jagamine,krfb,vnc,jagamine,rdp,krdc,kaugtöölaua ühendus,rdp,kutse,port,slp,kutsumata
+X-KDE-Keywords[eu]=mahaigain partekatzea,krfb,vnc,partekatzea,krdc,urruneko mahaigain konexioa,gonbidapena,ataka,slp,gonbidapen gabea
+X-KDE-Keywords[fa]=اشتراک رومیزی، krfb، vnc، اتصال رومیزی راه دور، دعوت، درگاه، slp، دعوت‌نشده
+X-KDE-Keywords[fi]=työpöydän jakaminen,krfb,vnc,jakaminen,krdc,etätyöpöytäyhteys, kutsu,portti,slp,kutsumaton, työpöytä
+X-KDE-Keywords[fr]=partage de bureau,krfb,vnc,partage,rdp,krdc,connexion à un bureau distant,invitation,port,slp,non invité
+X-KDE-Keywords[gl]=compartilla de escritorio, vnc, compartir, krdc, conexón ao escritorio remoto, invitación, porto, slt, convidado, compartillar
+X-KDE-Keywords[he]=שיתוף שולחן עבודה,שיתוף,חיבור לשולחן עבודה מרוחק,desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection, invitation, port, slp, uninvited
+X-KDE-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
+X-KDE-Keywords[is]=skjáborðsmiðlun,miðlun,krfb,vnc,rdp,krdc,fjarvinnsla,remote desktop connection,rdp
+X-KDE-Keywords[it]=condivisione desktop,krfb,vnc,condivisione,krdc,connessione desktop remoto,invito,porta,slp,non invitato
+X-KDE-Keywords[ja]=デスクトップ共有,krfb,vnc,共有,rdp,krdc,リモートデスクトップ接続,招待,ポート,slp,uninvited
+X-KDE-Keywords[km]=ការ​ចែក​រំ​លែក​ផ្ទៃ​តុ,krfb,vnc,ការ​ចែក​រំលែក,krdc,ការ​ត​ភ្ជាប់​ផ្ទៃ​តុ​ពី​ចម្ងាយ,អញ្ជើញ,ច្រក,slp,មិន​បាន​អញ្ជើញ
+X-KDE-Keywords[lt]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,dalinimasis darbastaliu,nutolusio darbastalio prijungimas,kvietimas,ryšys,nekviestas,jungtis,prievadas,dalintis,pasidalinti,jungimasis,prisijungti,kviesti
+X-KDE-Keywords[mk]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,делење на површината,krfb,vnc,делење,krdc,поврзување со оддалечена  површина,покана,порта,slp,непоканет
+X-KDE-Keywords[ms]= perkongsian ruang kerja, sambungan, liang, desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited
+X-KDE-Keywords[nb]=skrivebordsdeling,krfb,vnc,deling,krdc,tilkobling til fjernt skrivebord,invitasjon,port,slp,ikke invitert
+X-KDE-Keywords[nds]=schriefdisch,freegeven,freegaav,krfb,vnc,delen,krdc,feern Schriefdisch,verbinnen,inladen,port,slp,nich inlaadt
+X-KDE-Keywords[ne]=डेस्कटप साझेदारी,krfb,vnc,साझेदारी,krdc, टाढाको डेस्कटप जडान,निमन्त्रणा,पोर्ट,slp,निमन्त्रणा नगरिएको
+X-KDE-Keywords[nl]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,uitnodiging,slp,rdp,verbinding, bureaublad delen,bureaublad op afstand
+X-KDE-Keywords[nn]=skrivebordsdeling,krfb,vnc,deling,krdc,nettverksskrivebord,invitasjon,port,slp,ikkje invitert
+X-KDE-Keywords[pl]=współdzielenie pulpitu,krfb,vnc,współdzielenie,rdp,krdc,zdalne połączenie, zdalne biurko, zdalny pulpit, zaproszenie,port,slp
+X-KDE-Keywords[pt]=partilha do ecrã,krfb,vnc,partilha,krdc,ligação a um ecrã remoto,convite,porto,slp,sem convite
+X-KDE-Keywords[pt_BR]=compartilhamento de desktop,krfb,vnc,compartilhamento,krdc,conexão a desktop remoto,convite,porta,slp,não convidado
+X-KDE-Keywords[sl]=namizje,souporaba,krfb,vnc,krdc,povezava oddaljenega namizja, povabilo,port,slp,nepovabljen
+X-KDE-Keywords[sr]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,радна површина,дељење,позив,порт,непозван,удаљено
+X-KDE-Keywords[sr@latin]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,radna površina,deljenje,poziv,port,nepozvan,udaljeno
+X-KDE-Keywords[sv]=dela skrivbord,krfb,vnc,dela,krdc,fjärrskrivbordsanslutning,inbjudan,port,slp
+X-KDE-Keywords[ta]=பணிமேடை பகிர்வு,krfb,vnc,பகிர்வு,krdc,தொலை பணிமேடை இணைப்பு,அழைப்பிதழ், துறை, slp, uninvited
+X-KDE-Keywords[tr]=masaüstü paylaşımı,krfb,vnc,paylaşım,krdc,uzak masaüstü bağlantısı,davet,port,slp
+X-KDE-Keywords[uk]=спільні стільниці,krfb,vnc,спільний,rdp,krdc,з'єднання віддаленої стільниці,запрошення,rdp,slp,без запрошення
+X-KDE-Keywords[vi]=chia sẻ màn hình,krfb,vnc,chia sẻ,krdc,màn hình ở xa kết nối,mời kết nối,cổng,slp,không được mời
+X-KDE-Keywords[x-test]=xxdesktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvitedxx
+X-KDE-Keywords[zh_CN]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,桌面共享,共享,远程桌面连接,邀请,端口,未邀请
+X-KDE-Keywords[zh_TW]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,rdp,桌面分享,分享,遠端桌面連線,invitation,port,slp,uninvited
 
 Categories=Qt;KDE;X-KDE-settings-network;Settings;

kinetd/kinetd.cpp

@@ -35,6 +35,14 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <kpluginfactory.h>
+#include <kpluginloader.h>
+
+K_PLUGIN_FACTORY(KInetDFactory,
+                 registerPlugin<KInetD>();
+    )
+K_EXPORT_PLUGIN(KInetDFactory("kinetd"))
+
 PortListener::PortListener(KService::Ptr s,
 			   KConfig *config,
 			   KServiceRegistry *srvreg) :
@@ -255,11 +263,11 @@ QStringList PortListener::processServiceTemplate(const QString &a) {
 		QString hostName = address->nodeName();
 		KUser u;
 		QString x = a; // replace does not work in const QString. Why??
-		l.append(x.replace(QRegExp("%h"), KServiceRegistry::encodeAttributeValue(hostName))
-			 .replace(QRegExp("%p"), QString::number(m_port))
-			 .replace(QRegExp("%u"), KServiceRegistry::encodeAttributeValue(u.loginName()))
-			 .replace(QRegExp("%i"), KServiceRegistry::encodeAttributeValue(m_uuid))
-			 .replace(QRegExp("%f"), KServiceRegistry::encodeAttributeValue(u.fullName())));
+		l.append(x.replace(QString("%h"), KServiceRegistry::encodeAttributeValue(hostName))
+			 .replace(QString("%p"), QString::number(m_port))
+			 .replace(QString("%u"), KServiceRegistry::encodeAttributeValue(u.loginName()))
+			 .replace(QString("%i"), KServiceRegistry::encodeAttributeValue(m_uuid))
+			 .replace(QString("%f"), KServiceRegistry::encodeAttributeValue(u.fullName())));
 	}
 	return l;
 }
@@ -408,8 +416,8 @@ PortListener::~PortListener() {
 }
 
 
-KInetD::KInetD() :
-	KDEDModule()
+KInetD::KInetD(QObject* parent, const QList<QVariant>&) :
+	KDEDModule(parent)
 {
 	m_config = new KConfig("kinetdrc");
 	m_srvreg = new KServiceRegistry();
@@ -645,12 +653,3 @@ KInetD::~KInetD() {
 	delete m_config;
         delete m_srvreg;
 }
-
-extern "C" {
-	KDE_EXPORT KDEDModule *create_kinetd()
-	{
-        KGlobal::locale()->insertCatalog("kinetd");
-		return new KInetD();
-	}
-}
-

kinetd/kinetd.desktop

@@ -1,16 +1,16 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Service
 
-ServiceTypes=KDEDModule
+X-KDE-ServiceTypes=KDEDModule
 X-KDE-ModuleType=Library
 X-KDE-Library=kinetd
-X-KDE-FactoryName=kinetd
 X-KDE-Kded-autoload=true
 
 Name=KDE Internet Daemon
 Name[af]=Kde Internet Bediener
+Name[ar]=كيدي إنترنت مراقب
 Name[bg]=Интернет демон
+Name[bn]=কে-ডি-ই ইন্টারনেট ডিমন
 Name[br]=Diaoul kenrouedad KDE
 Name[ca]=Dimoni d'Internet per al KDE
 Name[cs]=KDE Internet démon
@@ -18,7 +18,7 @@ Name[cy]=Daemon Rhyngrwyd KDE
 Name[da]=KDE Internet-dæmon
 Name[de]=Internet-Dienst
 Name[el]=Δαίμονας διαδικτύου για το KDE
-Name[eo]=Retodemono
+Name[eo]=KDE interreta demono
 Name[es]=Demonio de Internet de KDE
 Name[et]=KDE internetideemon
 Name[eu]=KDE internet deabrua
@@ -26,58 +26,69 @@ Name[fa]=شبح اینترنتی KDE
 Name[fi]=KDE Internet-palvelin
 Name[fr]=Démon Internet de KDE
 Name[ga]=Deamhan Idirlín KDE
-Name[gl]=O demo de Internet de KDE
+Name[gl]=Daemon de internet de KDE
 Name[he]=תהליך הרקע האינטרנטי של KDE
+Name[hi]=केडीई इंटरनेट डेमन
 Name[hu]=KDE internetes szolgáltatás
 Name[is]=KDE Internetþjónn
 Name[it]=Demone internet di KDE
 Name[ja]=KDE インターネットデーモン
 Name[kk]=KDE Интернет қызметі
 Name[km]=ដេមិន​អ៊ីនធឺណិត​របស់ KDE
+Name[ko]=KDE 인터넷 데몬
 Name[lt]=KDE interneto tarnyba
+Name[lv]=KDE Interneta dēmons
 Name[mk]=Даемон за Интернет на KDE 
+Name[ml]=കെഡിഈ ഇന്റര്‍നെറ്റ് സഹായി
 Name[ms]=Daemon Internet KDE
 Name[nb]=KDEs Internett-nisse
 Name[nds]=KDE-Internetdämoon
 Name[ne]=केडीई इन्टरनेट डेइमोन
-Name[nn]=KDE-Internett-nisse
+Name[nn]=KDE-Internett-teneste
+Name[pa]=KDE ਇੰਟਰਨੈੱਟ ਡੈਮਨ
 Name[pl]=Internet/sieć
 Name[pt]=Servidor de Internet do KDE
 Name[pt_BR]=Servidor Internet do KDE
-Name[ro]=Demon internet KDE
+Name[ro]=Demon de Internet KDE
 Name[ru]=Доступ к Интернету
 Name[se]=KDE-Interneahtta-duogášprográmma
+Name[sk]=KDE Internet démon
 Name[sl]=Internetni strežnik za KDE
-Name[sr]=KDE-ов интернет демон
-Name[sr@latin]=KDE-ov internet demon
+Name[sr]=КДЕ‑ов интернет демон
+Name[sr@latin]=KDE‑ov internet demon
 Name[sv]=KDE:s Internetdemon
 Name[ta]=கேடிஇ இணைய டேமொன்
 Name[tg]=KDE Азозили Интернет
 Name[tr]=KDE İnternet Programı
-Name[uk]=Демон Інтернет KDE
-Name[uz]=KDE Интернет демони
+Name[uk]=Фонова служба Інтернет KDE
+Name[uz]=KDE Internet demoni
+Name[uz@cyrillic]=KDE Интернет демони
 Name[vi]=Trình nền Mạng KDE
 Name[x-test]=xxKDE Internet Daemonxx
+Name[zh_CN]=KDE Internet 守护进程
 Name[zh_HK]=KDE 互聯網系統程式
 Name[zh_TW]=KDE Internet 伺服程式
 Comment=An Internet daemon that starts network services on demand
+Comment[ar]=رقيب الإنترنت بدأ خدمة الشبكة على الرقيب
 Comment[bg]=Интернет демон, който служи за стартиране на мрежови услуги при поискване
+Comment[bn]=একটি ইন্টারনেট ডিমন যে চাহিদা ভিত্তিক নেটওয়ার্ক সার্ভিস আরম্ভ করে
 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]=Startet Netzwerkdienste bei Bedarf
 Comment[el]=Ένας δαίμονας για το διαδίκτυο ο οποίος ξεκινάει τις υπηρεσίες δικτύου όταν απαιτείται
-Comment[eo]=retdemono kiu lanĉas retajn servojn laŭ bezono
+Comment[eo]=Interreta demono 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[eu]=Sare zerbitzuak eskatzean abiarazten dituen deabrua
 Comment[fa]=یک شبح اینترنتی که خدمات شبکه را بر اساس تقاضا آغاز می‌کند
 Comment[fi]=Internet-palvelin, joka käynnistää verkkopalveluita
 Comment[fr]=Un démon Internet qui démarre le service réseau à la demande
-Comment[ga]=Deamhan Idirlín a thosaíonn seirbhísí gréasáin ar éileamh
-Comment[gl]=Un demo de Internet que comenza servicios de rede según demanda
+Comment[ga]=Deamhan Idirlín a thosaíonn seirbhísí líonra ar éileamh
+Comment[gl]=Un daemon de Internet que comenza servizos de rede baixo 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[is]=Internetþjónn sem ræsir tengingar við Internetið eftir þörfum
@@ -85,20 +96,25 @@ Comment[it]=Un demone internet che avvia i servizi di rete a richiesta
 Comment[ja]=要求時にネットワークサービスを起動するインターネットデーモン
 Comment[kk]=Талап етілгенде керек желі қызметтерді жегетін қызмет
 Comment[km]=ដេមិន​អ៊ីនធឺណិត​ដែល​ចាប់ផ្ដើម​សេវា​បណ្ដាញ​នៅ​ពេល​ត្រូវការ
+Comment[ko]=요청에 따라 네트워크 서비스를 시작하는 인터넷 데몬
 Comment[lt]=Interneto tarnyba, paleidžianti tinklo tarnybas esant poreikiui
+Comment[lv]=Interneta dēmons pēc vajadzības palaiž tīkla servisus
 Comment[mk]=Даемон за Интернет кој ги вклучува мрежните сервиси на барање
+Comment[ml]=ആവശ്യ‌പ്പെടുമ്പോള്‍ ശൃംഖലാസേവനം തുടങ്ങുന്ന ഒരു ഇന്റര്‍നെറ്റ് സഹായി
 Comment[ms]=Daemon Internet yang memulakan servis jaringan di atas permintaan
 Comment[nb]=Internett-nisse som starter nettverkstjenester ved behov
 Comment[nds]=En Internet-Dämoon, wat Nettwarkdeensten op Anfraag start
 Comment[ne]=एउटा इन्टरनेट डेइमोन जसले मागमा सञ्जाल सेवा सुरु गर्दछ
 Comment[nl]=Een internetdaemon die netwerkdiensten op afroep start
-Comment[nn]=Internett-nisse som startar nettverkstenester når dei trengst
+Comment[nn]=Internett-teneste som startar nettverkstenester når dei trengst
+Comment[pa]=ਇੱਕ ਇੰਟਰਨੈੱਟ ਡੈਮਨ, ਜੋ ਕਿ ਲੋੜ ਪੈਣ ਉੱਤੇ ਨੈੱਟਵਰਕ ਸਰਵਿਸਾਂ ਸ਼ੁਰੂ ਕਰਦੀ ਹੈ।
 Comment[pl]=Uruchamianie usług na żądanie
 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 demon de internet care porneşte serviciile de reţea la cerere
+Comment[ro]=Un demon de Internet ce 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[sr@latin]=Internet demon koji pokreće mrežne servise po zahtevu
@@ -106,10 +122,12 @@ Comment[sv]=Internetdemon som startar nätverkstjänster vid behov
 Comment[ta]=ஒரு இணைய டேமொன், டேமொன் பிணைய சேவையை ஆரம்பிக்கிறது
 Comment[tg]=Азозили шабакавие, ки хидматрасони шабакавиро бо дархост сар медиҳад
 Comment[tr]=Başlangıçta ağ servisleri tarafından istenen internet hayalet programı
-Comment[uk]=Демон Інтернет, що запускає служби мережі при запиті
-Comment[uz]=Талаб қилинганда тармоқ хизматларини ишга тушурувчи Интернет демони
+Comment[uk]=Фонова служба Інтернет, що запускає служби мережі при запиті
+Comment[uz]=Talab qilinganda tarmoq xizmatlarini ishga tushuruvchi Internet demoni
+Comment[uz@cyrillic]=Талаб қилинганда тармоқ хизматларини ишга тушурувчи Интернет демони
 Comment[vi]=Một trình nền Mạng mà chạy các dịch vụ mạng theo nhu cầu
 Comment[x-test]=xxAn Internet daemon that starts network services on demandxx
 Comment[xh]=Internet daemon eqala iinkonzo zomsebenzi wonatha xa zifunwa
+Comment[zh_CN]=按需启动网络服务的守护进程
 Comment[zh_HK]=自動依需求起動網絡服務的互聯網系統程式
 Comment[zh_TW]=依要求起動網路服務的 Internet 伺服程式

kinetd/kinetd.h

@@ -140,8 +140,8 @@ public slots:
 	 * @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
-	 * @return true if a port could be found or service is disabled, false 
-	 *          otherwise. 
+	 * @return true if a port could be found or service is disabled, false
+	 *          otherwise.
 	 */
 	bool setPort(QString service, int port = -1, int autoPortRange = 1);
 
@@ -189,7 +189,7 @@ public slots:
 	void reregistrationTimer();
 
  public:
-	KInetD();
+	KInetD(QObject* parent, const QList<QVariant>&);
 	virtual ~KInetD();
 	void loadServiceList();
 	PortListener *getListenerByName(QString name);

kinetd/kinetd.notifyrc

@@ -1,26 +1,228 @@
 [Global]
 IconName=kinetd
 Comment=KInetD
+Comment[bn]=কে-আইনেট-ডি
+Comment[hi]=के-इनिट-डी
+Comment[ml]=കെഐനെറ്റ്ഡി
+Comment[sr]=КинетД
+Comment[sv]=Kinetd
 Comment[x-test]=xxKInetDxx
 
 [Event/IncomingConnection]
 Name=IncomingConnection
+Name[ar]=اتصال وارد
+Name[bn]=অন্তর্মুখী সংযোগ
+Name[br]=Kevreadenn resev
+Name[ca]=Connexió entrant
+Name[cs]=Příchozí spojení
+Name[cy]=CysylltiadCyrraedd
+Name[da]=IndkommendeForbindelse
+Name[de]=Eingehende Verbindung
 Name[el]=Εισερχόμενη σύνδεση
+Name[eo]=Envenanta konekto
+Name[es]=Conexión entrante
+Name[et]=Sissetulev ühendus
+Name[eu]=Sarrerako konexioa
+Name[fi]=Saapuva yhteys
 Name[fr]=Connexion entrante
+Name[ga]=Ceangal Isteach
+Name[gl]=Conexón entrante
+Name[he]=חיבור נכנס
+Name[hi]=आवक-कनेक्शन
+Name[hr]=DolaznaVeza
+Name[hu]=Bejövő kapcsolat
+Name[it]=Connessioni in entrata
+Name[ja]=外部からの接続
+Name[km]=ការ​តភ្ជាប់​ចូល
+Name[lt]=Gautas kvietimas ryšiui
+Name[lv]=IenākošaisSavienojums
+Name[mk]=Дојдовно поврзување
+Name[ml]=ആഗമനബന്ധം
+Name[ms]=Sambungan Masuk
+Name[nb]=Innkommende tilkobling
+Name[nds]=RinkamenVerbinnen
+Name[nl]=Inkomende_verbinding
+Name[nn]=Innkommande tilkopling
+Name[pa]=ਆ ਰਹੇ ਕੁਨੈਕਸ਼ਨ
+Name[pl]=Połączenia przychodzące
+Name[pt_BR]=Conexões de Entrada
+Name[ro]=ConexiuneDeIntrare
+Name[ru]=Входящее соединение
+Name[sk]=Prichádzajúce spojenia
+Name[sl]=Prihajajoča povezava
+Name[sr]=Долазна веза
+Name[sr@latin]=Dolazna veza
+Name[sv]=Inkommande anslutning
+Name[ta]=உள்வரும் இணைப்புகள்
+Name[tg]=Пайвастшавии Воридшаванда
+Name[tr]=Gelen Bağlantı
 Name[x-test]=xxIncomingConnectionxx
+Name[xh]=Uxhumaniso Olungenayo
+Name[zh_CN]=进入的连接
+Name[zh_HK]=進入連線
+Name[zh_TW]=進來的連線
 Comment=Received incoming connection
-Comment[el]=Λήψη εισερχόμενης σύνδεσης
+Comment[af]=Ontvang inkomende verbinding
+Comment[ar]=تلقي اتصال وارد 
+Comment[bn]=অন্তর্মুখী সংযোগ গ্রহণ করল
+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]=Ricevis envenantan konekton
+Comment[es]=Recibida conexión entrante
+Comment[et]=Saadi sissetulev ühendus
+Comment[eu]=Konexio bat jaso da
+Comment[fi]=Vastaanotettiin saapuva yhteys
 Comment[fr]=Reçu une connexion entrante
+Comment[ga]=Fuarthas ceangal isteach
+Comment[gl]=Recebeuse unha conexón entrante
+Comment[he]=נתקבל חיבור נכנס
+Comment[hi]=आवक कनेक्शन प्राप्त
+Comment[hr]=Primio dolaznu vezu
+Comment[hu]=Csatlakozási kérés érkezett
+Comment[is]=Tók á móti uppkalli
+Comment[it]=Connessione in entrata stabilita
+Comment[ja]=外部からの接続がありました
+Comment[km]=បាន​ទទួល​ការ​តភ្ជាប់​ចូល
+Comment[ko]=들어오는 연결을 받았습니다
+Comment[lt]=Gautas kvietimas ryšiui
+Comment[lv]=Saņemts ienākošs savienojums
+Comment[mk]=Примено е дојдовно поврзување
+Comment[ml]=ആഗമനബന്ധം ലഭിച്ചു
+Comment[ms]=Menerima sambungan masuk
+Comment[nb]=Mottok innkommende tilkobling
+Comment[nds]=Tokoppelanfraag kregen
+Comment[nl]=Inkomende verbinding ontvangen
+Comment[nn]=Fekk ei innkommande tilkopling
+Comment[pa]=ਮਿਲੇ ਆ ਰਹੇ ਕੁਨੈਕਸ਼ਨ
+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[sr@latin]=Primljena je dolazna veza
+Comment[sv]=Tar emot inkommande anslutning
+Comment[tg]=Пайвастшавии воридшаванда қабул гардид
+Comment[tr]=Gelen bağlantı alınıyor
+Comment[uk]=Отримано вхідне з’єднання
 Comment[x-test]=xxReceived incoming connectionxx
+Comment[xh]=Uxhulumano olungenayo olufunyenweyo
+Comment[zh_CN]=收到进入的连接
+Comment[zh_HK]=已接收的進入連線
+Comment[zh_TW]=接收到進來的連線
 Action=None
 
 [Event/ProcessFailed]
 Name=ProcessFailed
-Name[el]=Η επεξεργασία απέτυχε
+Name[ar]=فشلت العملية
+Name[bn]=প্রসেস ব্যর্থ
+Name[ca]=Procés fallit
+Name[cs]=Proces selhal
+Name[cy]=MethoddProses
+Name[da]=ProcesMislykkedes
+Name[de]=Prozess fehlgeschlagen
+Name[el]=Η διεργασία απέτυχε
+Name[eo]=Procezo fiaskis
+Name[es]=Proceso fallido
+Name[et]=Protsess nurjus
+Name[eu]=Prozesuak huts egin du
+Name[fi]=Prosessi epäonnistui
 Name[fr]=Échec du processus
+Name[ga]=PróiseasTeipthe
+Name[gl]=Fallou o proceso
+Name[he]=תהליך נכשל
+Name[hi]=प्रक्रिया-असफल
+Name[hr]=ProcesNeuspješan
+Name[hu]=Hibás folyamat
+Name[it]=Processo fallito
+Name[ja]=プロセス失敗
+Name[km]=ដំណើរ​ការ​បាន​បរាជ័យ
+Name[lt]=Procesas nepavyko
+Name[lv]=ProcessNeveiksmīgs
+Name[mk]=Процесот не успеа
+Name[ml]=പ്രക്രിയ പരാജയപ്പെട്ടു
+Name[ms]=Proses Gagal
+Name[nb]=Prosessen mislyktes
+Name[nds]=PerzessFehlslaan
+Name[nl]=Proces_mislukt
+Name[nn]=Prosessen feila
+Name[pa]=ਪਰੋਸੈਸ ਫੇਲ੍ਹ
+Name[pl]=Błąd procesu
+Name[pt_BR]=Falha de Processo
+Name[ro]=ProcesEșuat
+Name[ru]=Ошибка процесса
+Name[sk]=Proces neúspešny
+Name[sl]=Proces ni uspel
+Name[sr]=Процес није успео
+Name[sr@latin]=Proces nije uspeo
+Name[sv]=Process misslyckades
+Name[ta]=செயல் தோல்வியுற்றது
+Name[tg]=Ҷараён бо Нокомӣ анҷомид
+Name[tr]=Başarısız İşlemler
 Name[x-test]=xxProcessFailedxx
+Name[xh]=Inkqubo Yahlulekile
+Name[zh_CN]=处理失败
+Name[zh_HK]=程序失敗
+Name[zh_TW]=行程失敗
 Comment=Could not call process to handle connection
-Comment[el]=Δεν ήταν δυνατή η κλήση της διεργασίας για τον έλεγχο της σύνδεσης
+Comment[af]=Kon nie roep proses na handvatsel verbinding
+Comment[ar]= لا يمكن نداء الإجراء إلى مؤشر الاتصال
+Comment[bn]=সংযোগ পরিচালনা করতে প্রসেস শুরু করতে পারল না
+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 kann nicht gestartet werden
+Comment[el]=Αδύνατη η κλήση της διεργασίας για τη διαχείριση της σύνδεσης
+Comment[eo]=Ne eblis lanĉi la procezon por trakti la konekton
+Comment[es]=No se puede llamar un proceso para manejar la conexión
+Comment[et]=Ei suuda käivitada protsessi ühenduse käsitsemiseks
+Comment[eu]=Ezin izan da konexioa kudeatzeko prozesua deitu
+Comment[fi]=Ei voitu kutsua prosessia yhteyden hoitamiseksi
 Comment[fr]=Impossible d'appeler le processus pour gérer la connexion
+Comment[ga]=Níorbh fhéidir próiseas a thosú chun an ceangal a láimhseáil
+Comment[gl]=Non foi posíbel chamar ao proceso que xestiona a conexón
+Comment[he]=אין אפשרות לקרוא לתהליך על מנת לטפל בחיבור
+Comment[hi]=कनेक्शन हैंडल करने के लिए प्रक्रिया काल नहीं कर सका
+Comment[hr]=Nisam mogao pozvati proces za kontrolu veze
+Comment[hu]=A kapcsolat kezelése nem sikerült
+Comment[is]=Gat ekki kallað á forrit til að höndla tengingu
+Comment[it]=Impossibile richiamare il processo per gestire la connessione
+Comment[ja]=接続を扱うプロセスを呼び出せません
+Comment[km]=មិន​អាច​ហៅ​ដំណើរ​ការ ដើម្បី​ដោះស្រាយ​ការ​ត​ភ្ជាប់​បាន​ឡើយ
+Comment[ko]=연결을 처리하기 위한 프로세스를 부를 수 없습니다
+Comment[lt]=Nepavyko iškviesti proceso apdoroti prisijungimui
+Comment[lv]=Neizdevās izsaukt procesu savienojuma apstrādei
+Comment[mk]=Не може да се повика процесот за ракување со поврзувањето
+Comment[ml]=ബന്ധം കൈകാര്യം ചെയ്യാന്‍ പ്രക്രിയയെ വിളിക്കാന്‍ കഴിഞ്ഞില്ല
+Comment[ms]=Tidak dapat memanggil proses untuk mengendalikan sambungan
+Comment[nb]=Klarte ikke kalle på prosess for å håndtere tilkobling
+Comment[nds]=Perzess för't Verarbeiden vun Tokoppelanfragen lett sik nich opropen
+Comment[nl]=Kon geen proces aanroepen om de verbinding af te handelen
+Comment[nn]=Klarte ikkje kalla på prosessen som skulle handtera tilkoplinga
+Comment[pl]=Nie można było uruchomić procesu obsługi połączenia
+Comment[pt]=Não foi possível invocar o processo para lidar com as ligações
+Comment[pt_BR]=Não foi possível chamar o processo de controle da conexão
+Comment[ro]=Procesul ce manipulează conexiunea nu a putut fi apelat
+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[sr@latin]=Nisam mogao da pozovem proces da opsluži vezu
+Comment[sv]=Kunde inte anropa process för att hantera anslutning
+Comment[ta]=இணைப்பை கையாள செயற்பாட்டை அழைக்க முடியவில்லை
+Comment[tg]=Барои даскории пайвастшавӣ ҷараён бозхонда нашуд
+Comment[tr]=Elle bağlantıda başarısız çağrı işlemleri
+Comment[uk]=Не вдалося викликати процес для з’єднання
 Comment[x-test]=xxCould not call process to handle connectionxx
+Comment[xh]=Ayikwazanga ukubiza inkqubo ezakuphatha uxhulumano
+Comment[zh_CN]=无法调用进程处理连接
+Comment[zh_HK]=無法呼叫處理連線的程序
+Comment[zh_TW]=無法呼叫行程來處理此連線
 Action=None

kinetd/kinetdmodule.desktop

@@ -1,11 +1,12 @@
 # describes the servicetype that you need to implement in order to use
 # kinetd.
 [Desktop Entry]
-Encoding=UTF-8
 Type=ServiceType
 X-KDE-ServiceType=KInetDModule
 Name=KInetD Module Type
+Name[ar]=KInetD نوع الوحدة
 Name[bg]=Модул на KInetD
+Name[bn]=কে-আইনেট-ডি মডিউল ধরন
 Name[br]=Seurt ar mollad KInetD
 Name[ca]=Tipus de mòdul del KInetD
 Name[cs]=Typ modulu KInetD
@@ -13,7 +14,7 @@ Name[cy]=Math Modiwl KInetD
 Name[da]=KInetD-modultype
 Name[de]=KInetD-Modultyp
 Name[el]=Τύπος αρθρώματος KInetD
-Name[eo]=KInetD-modulotipo
+Name[eo]=KInetD modulotipo
 Name[es]=Tipo de módulo KInetD
 Name[et]=KInetD mooduli tüüp
 Name[eu]=KInetD modulu mota
@@ -23,6 +24,7 @@ Name[fr]=Type de module de KInetD
 Name[ga]=Cineál Modúil KInetD
 Name[gl]=Tipo de módulo KInetD
 Name[he]=סוג מודול של KInetD
+Name[hi]=के-इनिट-डी मॉड्यूल प्रकार
 Name[hr]=Tip KInetD Modula
 Name[hu]=KInetD modultípus
 Name[is]=KInetD Module tegund
@@ -30,8 +32,11 @@ Name[it]=Tipo modulo KInetD
 Name[ja]=KInetD モジュールタイプ
 Name[kk]=KInetD модулі
 Name[km]=ប្រភេទ​ម៉ូលឌុល KInetD
+Name[ko]=KInetD 모듈 종류
 Name[lt]=KInetD modulio tipas
+Name[lv]=KInetD moduļa tips
 Name[mk]=Тип на модул за KInetD 
+Name[ml]=കെഐനെറ്റ് ഘടക രീതി 
 Name[ms]=Jenis Modul KInetD
 Name[nb]=KInetd-programtillegstype
 Name[nds]=KInetD-Moduultyp
@@ -44,9 +49,10 @@ 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[sr@latin]=KInetD vrsta modula
+Name[sr]=Врста модула КинетД‑а
+Name[sr@latin]=Vrsta modula KInetD‑a
 Name[sv]=Kinetd-modultyp
 Name[ta]=KInetD கூறு வகை
 Name[tg]=Навъи Модули KInetD
@@ -55,6 +61,7 @@ Name[uk]=Тип модулю KinetD
 Name[vi]=Kiểu môđun KInetD
 Name[x-test]=xxKInetD Module Typexx
 Name[xh]=Udidi Lomqongo womlinganiselo we KInetD
+Name[zh_CN]=KInetD 模块类型
 Name[zh_HK]=KInetD 模組類型
 Name[zh_TW]=KInetD 模組類型
 

krfb.desktop

@@ -1,16 +1,22 @@
 # KDE Config File
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
-Exec=krfb -caption "%c"
+Exec=krfb -caption "%c" %i
 Icon=krfb
-DocPath=krfb/index.html
+X-DocPath=krfb/index.html
 Terminal=false
 Name=Krfb
+Name[bn]=কে-আর-এফ-বি
+Name[hi]=केआरएफबी
+Name[ml]=കെആര്‍എഫ്ബി
+Name[sr]=КРФБ
+Name[sr@latin]=KRFB
 Name[x-test]=xxKrfbxx
 Name[zh_TW]=Krfb 桌面分享
 GenericName=Desktop Sharing
+GenericName[ar]=مشاركة سطح المكتب
 GenericName[bg]=Споделяне на работното място
+GenericName[bn]=ডেস্কটপ ভাগাভাগি
 GenericName[br]=Rannañ ar vurev
 GenericName[ca]=Compartició de l'escriptori
 GenericName[cs]=Sdílení pracovní plochy
@@ -18,6 +24,7 @@ GenericName[cy]=Rhannu Penbwrdd
 GenericName[da]=Desktopdeling
 GenericName[de]=Arbeitsfläche freigeben
 GenericName[el]=Κοινή χρήση επιφάνειας εργασίας
+GenericName[eo]=Tabula komunigado
 GenericName[es]=Escritorio compartido
 GenericName[et]=Töölaua jagamine
 GenericName[eu]=Mahaigain partekatzea
@@ -25,33 +32,42 @@ GenericName[fa]=اشتراک رومیزی
 GenericName[fi]=Työpöydän jakaminen
 GenericName[fr]=Partage de bureau
 GenericName[ga]=Roinnt Deisce
-GenericName[gl]=Compartidor de Escritorio
+GenericName[gl]=Compartilla de escritorio
 GenericName[he]=שיתוף שולחנות עבודה
+GenericName[hi]=डेस्कटॉप साझेदारी
 GenericName[hu]=Munkaasztal-megosztás
 GenericName[is]=Skjáborðsmiðlun
 GenericName[it]=Condivisione desktop
 GenericName[ja]=デスクトップ共有
 GenericName[kk]=Үстелді ортақтастыру
 GenericName[km]=ការ​ចែក​រំលែក​ផ្ទៃ​តុ
+GenericName[ko]=데스크톱 공유
 GenericName[lt]=Dalinimasis darbastaliu
+GenericName[lv]=Darbvirsmas koplietošana
+GenericName[ml]=പണിയിടം പങ്കുവെക്കല്‍
 GenericName[nb]=Delte skrivebord
 GenericName[nds]=Schriefdisch-Freegaav
 GenericName[ne]=डेस्कटप साझेदारी
 GenericName[nl]=Bureaublad delen
 GenericName[nn]=Skrivebordsdeling
+GenericName[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ
 GenericName[pl]=Współdzielenie pulpitu
 GenericName[pt]=Partilha do Ecrã
 GenericName[pt_BR]=Compartilhamento de Ambiente de Trabalho
+GenericName[ro]=Partajare birou
 GenericName[ru]=Общий рабочий стол
+GenericName[sk]=Zdieľanie pracovnej plochy
 GenericName[sl]=Deljenje namizja
-GenericName[sr]=Дељење радне површине
-GenericName[sr@latin]=Deljenje radne površine
+GenericName[sr]=Дељење површи
+GenericName[sr@latin]=Deljenje površi
 GenericName[sv]=Dela ut skrivbordet
 GenericName[tr]=Masaüstü Paylaşımı
 GenericName[uk]=Спільні стільниці
-GenericName[uz]=Иш столи билан бўлишиш
+GenericName[uz]=Ish stoli bilan boʻlishish
+GenericName[uz@cyrillic]=Иш столи билан бўлишиш
 GenericName[vi]=Chia sẻ màn hình nền
 GenericName[x-test]=xxDesktop Sharingxx
+GenericName[zh_CN]=桌面共享
 GenericName[zh_HK]=桌面分享
 GenericName[zh_TW]=桌面分享
 Categories=Qt;KDE;System;RemoteAccess;Network;

krfb.kcfg

@@ -9,7 +9,7 @@
       <default>true</default>
     </entry>
     <entry name="port" type="Int">
-      <label>This is the port on wich krfb will listen.</label>
+      <label>This is the port on which krfb will listen.</label>
       <default>5900</default>
     </entry>
     <entry name="publishService" type="Bool">

krfbserver.cpp

@@ -4,8 +4,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 
 
@@ -23,7 +23,7 @@
 #include <KGlobal>
 #include <KUser>
 #include <KLocale>
-#include <K3StaticDeleter>
+#include <KDebug>
 #include <KMessageBox>
 #include <dnssd/publicservice.h>
 
@@ -122,17 +122,21 @@ class KrfbServer::KrfbServerP {
         FrameBuffer *fb;
         QList< QPointer<ConnectionController> > controllers;
         rfbScreenInfoPtr screen;
-        bool running;
         int numClients;
         QByteArray desktopName;
+        QTimer rfbProcessEventTimer;
 };
 
+class KrfbServerPrivate
+{
+public:
+    KrfbServer instance;
+};
+
+K_GLOBAL_STATIC(KrfbServerPrivate, krfbServerPrivate)
 
-static KStaticDeleter<KrfbServer> sdServer;
-KrfbServer * KrfbServer::_self = 0;
 KrfbServer * KrfbServer::self() {
-    if (!_self) sdServer.setObject(_self, new KrfbServer);
-    return _self;
+    return &krfbServerPrivate->instance;
 }
 
 
@@ -140,11 +144,9 @@ KrfbServer::KrfbServer()
     :d(new KrfbServerP)
 {
     kDebug() << "starting ";
-    d->running = true;
     d->fb = FrameBuffer::getFrameBuffer(QApplication::desktop()->winId(), this);
     QTimer::singleShot(0, this, SLOT(startListening()));
     connect(InvitationManager::self(), SIGNAL(invitationNumChanged(int)),SLOT(updatePassword()));
-
 }
 
 KrfbServer::~KrfbServer()
@@ -196,8 +198,10 @@ void KrfbServer::startListening()
 
     rfbInitServer(screen);
     if (!rfbIsActive(screen)) {
-        KMessageBox::error(0,"krfb","Address already in use");
-        disconnectAndQuit();
+        KMessageBox::error(0,i18n("Address already in use"),"krfb");
+        shutdown();
+        qApp->quit();
+        return;
     };
 
     if (KrfbConfig::publishService()) {
@@ -205,15 +209,31 @@ void KrfbServer::startListening()
         service->publishAsync();
     }
 
-    while (d->running) {
-        foreach(QRect r, d->fb->modifiedTiles()) {
-            rfbMarkRectAsModified(screen, r.x(), r.y(), r.right(), r.bottom());
-        }
-        rfbProcessEvents(screen, 100);
-        qApp->processEvents();
+    /* Integrate the rfb event mechanism with qt's event loop.
+     * Call processRfbEvents() every time the qt event loop is run,
+     * so that it also processes and delivers rfb events and call
+     * shutdown() when QApplication exits to shutdown the rfb server
+     * before the X11 connection goes down.
+     */
+    connect(&d->rfbProcessEventTimer, SIGNAL(timeout()), SLOT(processRfbEvents()));
+    connect(qApp, SIGNAL(aboutToQuit()), SLOT(shutdown()));
+    d->rfbProcessEventTimer.start(0);
+}
+
+void KrfbServer::processRfbEvents()
+{
+    foreach(const QRect &r, d->fb->modifiedTiles()) {
+        rfbMarkRectAsModified(d->screen, r.x(), r.y(), r.right(), r.bottom());
     }
-    rfbShutdownServer(screen, true);
-    emit quitApp();
+    rfbProcessEvents(d->screen, 100);
+}
+
+void KrfbServer::shutdown()
+{
+    rfbShutdownServer(d->screen, true);
+    // framebuffer has to be deleted before X11 connection goes down
+    delete d->fb;
+    d->fb = 0;
 }
 
 
@@ -226,18 +246,11 @@ void KrfbServer::enableDesktopControl(bool enable)
     }
 }
 
-void KrfbServer::disconnectAndQuit()
-{
-    d->running = false;
-}
-
 enum rfbNewClientAction KrfbServer::handleNewClient(struct _rfbClientRec * cl)
 {
     ConnectionController *cc = new ConnectionController(cl, this);
-    if (d->numClients == 0) {
+    if (d->numClients++ == 0)
         d->fb->startMonitor();
-        d->numClients++;
-    }
 
     d->controllers.append(cc);
     cc->setControlEnabled(KrfbConfig::allowDesktopControl());
@@ -289,12 +302,10 @@ bool KrfbServer::checkX11Capabilities() {
 void KrfbServer::clientDisconnected(ConnectionController *cc)
 {
     kDebug() << "clients--: " << d->numClients;
-    d->numClients--;
-    if (d->numClients == 0) {
+    if (!--d->numClients) {
         d->fb->stopMonitor();
     }
     disconnect(cc, SIGNAL(clientDisconnected(ConnectionController)),this, SLOT(clientDisconnected(ConnectionController)));
 }
 
 
-

krfbserver.h

@@ -3,8 +3,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 
 #ifndef KRFBSERVER_H
@@ -22,6 +22,7 @@ This class implements the listening server for the RFB protocol.
 class KrfbServer : public QObject
 {
 Q_OBJECT
+friend class KrfbServerPrivate;
 public:
 
     static KrfbServer *self();
@@ -35,13 +36,13 @@ signals:
     void sessionEstablished(QString);
     void sessionFinished();
     void desktopControlSettingChanged(bool);
-    void quitApp();
 
 public Q_SLOTS:
 
     void startListening();
+    void processRfbEvents();
+    void shutdown();
     void enableDesktopControl(bool);
-    void disconnectAndQuit();
     void updateSettings();
     void updatePassword();
     void clientDisconnected(ConnectionController *);

main.cpp

@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
         "(c) 2000, heXoNet Support GmbH, D-66424 Homburg\n"
         "(c) 2000-2001, Const Kaplinsky\n"
         "(c) 2000, Tridia Corporation\n"
-        "(c) 1999, AT&T Laboratories Cambridge\n"));
+        "(c) 1999, AT&T Laboratories Boston\n"));
     aboutData.addAuthor(ki18n("Alessandro Praduroux"), ki18n("KDE4 porting"), "pradu@pradu.it");
     aboutData.addAuthor(ki18n("Tim Jansen"), KLocalizedString(), "tim@tjansen.de");
     aboutData.addAuthor(ki18n("Ian Reinhart Geiser"), ki18n("DCOP interface"), "geiseri@kde.org");
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 			    ki18n("TightVNC encoder"));
 	aboutData.addCredit(ki18n("Tridia Corporation"),
 			    ki18n("ZLib encoder"));
-	aboutData.addCredit(ki18n("AT&T Laboratories Cambridge"),
+	aboutData.addCredit(ki18n("AT&T Laboratories Boston"),
 			    ki18n("original VNC encoders and "
 				      "protocol design"));
 	aboutData.addCredit(ki18n("Jens Wagner (heXoNet Support GmbH)"),
@@ -75,8 +75,11 @@ int main(int argc, char *argv[])
 	KCmdLineArgs::init(argc, argv, &aboutData);
 
 	KApplication app;
+        app.setQuitOnLastWindowClosed(false);
 
-    TrayIcon trayicon(new ManageInvitationsDialog);
+    ManageInvitationsDialog invitationsDialog;
+    invitationsDialog.show();
+    TrayIcon trayicon(&invitationsDialog);
 
 	KrfbServer *server = KrfbServer::self(); // initialize the server manager
     if (!server->checkX11Capabilities()) {
@@ -91,10 +94,6 @@ int main(int argc, char *argv[])
 			 &trayicon, SLOT(showDisconnectedMessage()));
 	QObject::connect(server, SIGNAL(desktopControlSettingChanged(bool)),
 			 &trayicon, SLOT(setDesktopControlSetting(bool)));
-    QObject::connect(&trayicon, SIGNAL(quitSelected()),
-			 server, SLOT(disconnectAndQuit()));
-    QObject::connect(server, SIGNAL(quitApp()),
-                      &app, SLOT(quit()));
 
 	sigset_t sigs;
 	sigemptyset(&sigs);

manageinvitations.ui

@@ -95,7 +95,7 @@ p, li { white-space: pre-wrap; }
      </property>
      <column>
       <property name="text" >
-       <string>Created</string>
+       <string>Creation Time</string>
       </property>
      </column>
      <column>

manageinvitationsdialog.cpp

@@ -3,8 +3,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 #include "manageinvitationsdialog.h"
 #include "manageinvitationsdialog.moc"
@@ -55,6 +55,7 @@ ManageInvitationsDialog::ManageInvitationsDialog(QWidget *parent)
 {
     setCaption(i18n("Invitation"));
     setButtons(User1|Close|Help);
+    setHelp(QString(), "krfb");
     setDefaultButton(NoDefault);
 
     setMinimumSize(500, 330);
@@ -106,7 +107,7 @@ void ManageInvitationsDialog::inviteManually()
     PersonalInviteDialog *pid = new PersonalInviteDialog(this);
     pid->setPassword(inv.password());
     pid->setExpiration(inv.expirationTime());
-    pid->exec();
+    pid->show();
 }
 
 void ManageInvitationsDialog::inviteByMail()
@@ -127,7 +128,7 @@ void ManageInvitationsDialog::inviteByMail()
     QList<QNetworkInterface> ifl = QNetworkInterface::allInterfaces();
     QString host;
     int port = KrfbConfig::port();
-    foreach (QNetworkInterface nif, ifl) {
+    foreach (const QNetworkInterface &nif, ifl) {
         if (nif.flags() & QNetworkInterface::IsLoopBack) continue;
         if (nif.flags() & QNetworkInterface::IsRunning) {
             host = nif.addressEntries()[0].ip().toString();
@@ -135,20 +136,19 @@ void ManageInvitationsDialog::inviteByMail()
     }
 
     Invitation inv = InvitationManager::self()->addInvitation();
+    KUrl invUrl(QString("vnc://invitation:%1@%2:%3").arg(inv.password()).arg(host).arg(port));
     KToolInvocation::invokeMailer(QString(), QString(), QString(),
             i18n("Desktop Sharing (VNC) invitation"),
             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"
+                  "%1\n\n"
                   "Otherwise you can use any VNC client with the following parameters:\n\n"
-                  "Host: %4:%5\n"
-                  "Password: %6\n\n"
-                  "For security reasons this invitation will expire at %7.")
-            .subs(inv.password())
+                  "Host: %2:%3\n"
+                  "Password: %4\n\n"
+                  "For security reasons this invitation will expire at %5.")
+            .subs(invUrl.url())
             .subs(host)
-            .subs(port)
-            .subs(host)
-            .subs(port)
+            .subs(QString::number(port))
             .subs(inv.password())
             .subs(KGlobal::locale()->formatDateTime(inv.expirationTime()))
             .toString());
@@ -159,7 +159,7 @@ void ManageInvitationsDialog::reloadInvitations()
 {
     invitationWidget->clear();
     KLocale *loc = KGlobal::locale();
-    foreach(Invitation inv, InvitationManager::self()->invitations()) {
+    foreach(const Invitation &inv, InvitationManager::self()->invitations()) {
         QStringList strs;
         strs <<  loc->formatDateTime(inv.creationTime()) << loc->formatDateTime(inv.expirationTime());
         QTreeWidgetItem *it = new QTreeWidgetItem(strs);
@@ -176,8 +176,9 @@ void ManageInvitationsDialog::showConfiguration()
         return;
 
     KConfigDialog *dialog = new KConfigDialog(this, "settings", KrfbConfig::self());
-    dialog->addPage(new TCP, i18n("Network"), "network");
-    dialog->addPage(new Security, i18n("Security"), "encrypted");
+    dialog->addPage(new TCP, i18n("Network"), "network-workgroup");
+    dialog->addPage(new Security, i18n("Security"), "security-high");
+    dialog->setHelp(QString(),"krfb");
     connect(dialog, SIGNAL(settingsChanged(QString)),KrfbServer::self(),SLOT(updateSettings()));
     dialog->show();
 }
@@ -210,15 +211,25 @@ void ManageInvitationsDialog::deleteCurrent()
     {
         return;
     }
+
+    // disable updates while deleting items, otherwise the list would invalidate itself
+    disconnect(InvitationManager::self(), SIGNAL(invitationNumChanged(int)),
+               this, SLOT(reloadInvitations()));
+
     QList<QTreeWidgetItem *> itl = invitationWidget->selectedItems();
     foreach(QTreeWidgetItem *itm, itl) {
-        foreach(Invitation inv, InvitationManager::self()->invitations()) {
+        foreach(const Invitation &inv, InvitationManager::self()->invitations()) {
             if (inv.creationTime() == itm->data(0,Qt::UserRole+1)) {
                 InvitationManager::self()->removeInvitation(inv);
             }
         }
     }
 
+    // update it manually
+    reloadInvitations();
+
+    connect(InvitationManager::self(), SIGNAL(invitationNumChanged(int)),
+            SLOT(reloadInvitations()));
 }
 
 void ManageInvitationsDialog::selectionChanged()

manageinvitationsdialog.h

@@ -3,8 +3,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 
 #ifndef MANAGEINVITATIONSDIALOG_H

personalinvitedialog.cpp

@@ -47,7 +47,7 @@ PersonalInviteDialog::PersonalInviteDialog( QWidget *parent )
 
   QList<QNetworkInterface> ifl = QNetworkInterface::allInterfaces();
 
-  foreach (QNetworkInterface nif, ifl) {
+  foreach (const QNetworkInterface &nif, ifl) {
     if (nif.flags() & QNetworkInterface::IsLoopBack) continue;
     if (nif.flags() & QNetworkInterface::IsRunning && !nif.addressEntries().isEmpty()) {
         hostLabel->setText( QString( "%1:%2" ).arg(nif.addressEntries().first().ip().toString()).arg(port));

personalinvitewidget.ui

@@ -9,9 +9,6 @@
     <height>324</height>
    </rect>
   </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
   <layout class="QHBoxLayout" >
    <item>
     <widget class="QLabel" name="pixmapLabel" >

qtframebuffer.cpp

@@ -3,8 +3,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 
 #include "qtframebuffer.h"
@@ -30,6 +30,7 @@ QtFrameBuffer::QtFrameBuffer(WId id, QObject *parent)
 
 QtFrameBuffer::~QtFrameBuffer()
 {
+    delete [] fb;
 }
 
 int QtFrameBuffer::depth()

qtframebuffer.h

@@ -3,8 +3,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 
 #ifndef QTFRAMEBUFFER_H

x11framebuffer.cpp

@@ -3,8 +3,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 
 #include "x11framebuffer.h"
@@ -17,6 +17,7 @@
 #include <QDesktopWidget>
 
 #include <KApplication>
+#include <KDebug>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -54,7 +55,7 @@ X11FrameBuffer::X11FrameBuffer(WId id, QObject* parent)
 {
 #ifdef HAVE_XSHM
     d->useShm = XShmQueryExtension(QX11Info::display());
-    kDebug() << "shm: " << d->useShm << endl;
+    kDebug() << "shm: " << d->useShm;
 #else
     d->useShm = false;
 #endif
@@ -193,24 +194,24 @@ void X11FrameBuffer::cleanupRects() {
     QList<QRect> cpy = tiles;
     bool inserted = false;
     tiles.clear();
-//     kDebug() << "before cleanup: " << cpy.size() << endl;
-    foreach (QRect r, cpy) {
+//     kDebug() << "before cleanup: " << cpy.size();
+    foreach (const QRect &r, cpy) {
         if (tiles.size() > 0) {
             for(int i = 0; i < tiles.size(); i++) {
-    //             kDebug() << r << tiles[i] << endl;
+    //             kDebug() << r << tiles[i];
                 if (r.intersects(tiles[i])) {
                     tiles[i] |= r;
                     inserted = true;
                     break;
-    //                 kDebug() << "merged into " << tiles[i] << endl;
+    //                 kDebug() << "merged into " << tiles[i];
                 }
             }
             if (!inserted) {
                 tiles.append(r);
-    //             kDebug() << "appended " << r << endl;
+    //             kDebug() << "appended " << r;
             }
         } else {
-    //         kDebug() << "appended " << r << endl;
+    //         kDebug() << "appended " << r;
             tiles.append(r);
         }
     }
@@ -229,7 +230,7 @@ void X11FrameBuffer::cleanupRects() {
             tiles[i].setRight(d->framebufferImage->width);
         }
     }
-//     kDebug() << "after cleanup: " << tiles.size() << endl;
+//     kDebug() << "after cleanup: " << tiles.size();
 }
 
 void X11FrameBuffer::acquireEvents() {
@@ -253,8 +254,8 @@ QList< QRect > X11FrameBuffer::modifiedTiles()
         if (d->useShm) {
 #ifdef HAVE_XSHM
 
-            foreach(QRect r, tiles) {
-//                 kDebug() << r << endl;
+            foreach(const QRect &r, tiles) {
+//                 kDebug() << r;
                 gl |= r;
                 int y = r.y();
                 int x = r.x();
@@ -266,7 +267,7 @@ QList< QRect > X11FrameBuffer::modifiedTiles()
                         if (x+d->updateTile->width > d->framebufferImage->width) {
                             x = d->framebufferImage->width - d->updateTile->width;
                         }
-//                         kDebug() << "x: " << x << " (" << r.x() << ") y: " << y << " (" << r.y() << ") " << r << endl;
+//                         kDebug() << "x: " << x << " (" << r.x() << ") y: " << y << " (" << r.y() << ") " << r;
                         XShmGetImage(QX11Info::display(), win, d->updateTile, x, y, AllPlanes);
                         int pxsize =  d->framebufferImage->bits_per_pixel / 8;
                         char *dest = fb + ((d->framebufferImage->bytes_per_line * y) + (x*pxsize));
@@ -284,7 +285,7 @@ QList< QRect > X11FrameBuffer::modifiedTiles()
             }
 #endif
         } else {
-            foreach(QRect r, tiles) {
+            foreach(const QRect &r, tiles) {
                 XGetSubImage(QX11Info::display(),
                     win,
                     r.left(),
@@ -300,8 +301,8 @@ QList< QRect > X11FrameBuffer::modifiedTiles()
             }
         }
     }
-//     kDebug() << "tot: " << gl << endl;
-//     kDebug() << tiles.size() << endl;
+//     kDebug() << "tot: " << gl;
+//     kDebug() << tiles.size();
     ret = tiles;
     tiles.clear();
     return ret;

x11framebuffer.h

@@ -3,8 +3,8 @@
 
    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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 #ifndef X11FRAMEBUFFER_H
 #define X11FRAMEBUFFER_H