SVN_SILENT made messages (.desktop file)

svn path=/branches/KDE/4.4/kdenetwork/krfb/; revision=1090812

CMakeLists.txt

@@ -1,5 +1,22 @@
 project(krfb)
 
+if(NOT INSIDE_KDENETWORK)
+    set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../cmake/modules ${CMAKE_MODULE_PATH})
+    find_package(KDE4 REQUIRED)
+
+    include(KDE4Defaults)
+    include(MacroLibrary)
+
+    include(CheckSymbolExists)
+    find_package(LibVNCServer)
+    macro_optional_find_package(LibVNCServer)
+
+    set(CMAKE_REQUIRED_DEFINITIONS ${_KDE_PLATFORM_DEFINITIONS})
+
+    add_definitions(${QT_DEFINITIONS} ${QT_DBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
+    include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+endif(NOT INSIDE_KDENETWORK)
+
 check_symbol_exists(rfbInitServer  "rfb/rfb.h"     HAVE_LIBVNCSERVER)
 macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE)
 macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM)
@@ -16,6 +33,51 @@ endif(Q_WS_X11)
 #add_subdirectory(kcm_krfb)
 if (HAVE_LIBVNCSERVER)
 
+#####################################
+# First target: libkrfb - a library
+# for linking plugins against.
+
+set (krfbprivate_SRCS
+     framebuffer.cpp
+     framebufferplugin.cpp
+)
+
+kde4_add_library (krfbprivate
+                  SHARED
+                  ${krfbprivate_SRCS}
+)
+
+target_link_libraries (krfbprivate
+                       ${QT_QTCORE_LIBRARY}
+                       ${QT_QTGUI_LIBRARY}
+                       ${X11_X11_LIB}
+		       ${LIBVNCSERVER_LIBRARIES}
+)
+
+set_target_properties (krfbprivate PROPERTIES
+                       VERSION ${GENERIC_LIB_VERSION}
+                       SOVERSION ${GENERIC_LIB_VERSION}
+)
+
+install (TARGETS krfbprivate
+         ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+install (FILES
+         krfb-framebuffer.desktop
+         DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
+
+#####################################
+# Build the plugins
+
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+add_subdirectory (framebuffers)
+
+#####################################
+# Second target: krfb - the app
+# itself.
+
 set(krfb_SRCS
    main.cpp
    trayicon.cpp
@@ -28,9 +90,7 @@ set(krfb_SRCS
    personalinvitedialog.cpp
    connectioncontroller.cpp
    events.cpp
-   framebuffer.cpp
-   qtframebuffer.cpp
-   x11framebuffer.cpp
+   framebuffermanager.cpp
 )
 
 kde4_add_kcfg_files(krfb_SRCS krfbconfig.kcfgc)
@@ -45,7 +105,18 @@ kde4_add_ui_files(krfb_SRCS connectionwidget.ui
 
 kde4_add_executable(krfb ${krfb_SRCS})
 
-target_link_libraries(krfb ${JPEG_LIBRARIES}  ${LIBVNCSERVER_LIBRARIES} ${X11_Xdamage_LIB} ${KDE4_KDNSSD_LIBS})
+target_link_libraries(krfb
+                      krfbprivate
+                      ${JPEG_LIBRARIES}
+                      ${LIBVNCSERVER_LIBRARIES}
+                      ${X11_Xext_LIB}
+                      ${X11_X11_LIB}
+                      ${X11_Xdamage_LIB}
+                      ${QT_QTNETWORK_LIBRARY}
+                      ${KDE4_KDNSSD_LIBS}
+                      ${KDE4_KDEUI_LIBS}
+)
+
 if(X11_XTest_FOUND)
   target_link_libraries(krfb ${X11_XTest_LIB})
 endif(X11_XTest_FOUND)

configsecurity.ui

@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>Security</class>
- <widget class="QWidget" name="Security" >
-  <property name="geometry" >
+ <widget class="QWidget" name="Security">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,66 +10,66 @@
     <height>201</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <widget class="QCheckBox" name="kcfg_allowUninvitedConnections" >
-     <property name="text" >
+    <widget class="QCheckBox" name="kcfg_allowUninvitedConnections">
+     <property name="text">
       <string>Allow uninvited connections</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="kcfg_allowDesktopControl" >
-     <property name="text" >
+    <widget class="QCheckBox" name="kcfg_allowDesktopControl">
+     <property name="text">
       <string>Allow remote connections to control your desktop</string>
      </property>
-     <property name="checked" >
+     <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="kcfg_askOnConnect" >
-     <property name="enabled" >
+    <widget class="QCheckBox" name="kcfg_askOnConnect">
+     <property name="enabled">
       <bool>false</bool>
      </property>
-     <property name="text" >
-      <string>Ask before accepting an uninvited connection</string>
+     <property name="text">
+      <string>Ask before accepting connections</string>
      </property>
-     <property name="checked" >
+     <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="label" >
-     <property name="enabled" >
+    <widget class="QLabel" name="label">
+     <property name="enabled">
       <bool>false</bool>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Uninvited connections password:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>kcfg_uninvitedConnectionPassword</cstring>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="KLineEdit" name="kcfg_uninvitedConnectionPassword" >
-     <property name="enabled" >
+    <widget class="KLineEdit" name="kcfg_uninvitedConnectionPassword">
+     <property name="enabled">
       <bool>false</bool>
      </property>
-     <property name="echoMode" >
+     <property name="echoMode">
       <enum>QLineEdit::Password</enum>
      </property>
     </widget>
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
@@ -93,11 +94,11 @@
    <receiver>kcfg_askOnConnect</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>22</x>
      <y>24</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>29</x>
      <y>80</y>
     </hint>
@@ -109,11 +110,11 @@
    <receiver>kcfg_uninvitedConnectionPassword</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>98</x>
      <y>21</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>192</x>
      <y>137</y>
     </hint>
@@ -125,11 +126,11 @@
    <receiver>label</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>117</x>
      <y>20</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>120</x>
      <y>94</y>
     </hint>

connectioncontroller.cpp

@@ -99,6 +99,7 @@ ConnectionController::~ConnectionController()
 
 enum rfbNewClientAction ConnectionController::handleNewClient()
 {
+    kDebug();
 
     bool askOnConnect = KrfbConfig::askOnConnect();
     bool allowUninvited = KrfbConfig::allowUninvitedConnections();
@@ -106,13 +107,17 @@ enum rfbNewClientAction ConnectionController::handleNewClient()
     remoteIp = peerAddress(cl->sock);
 
     if (!allowUninvited && InvitationManager::self()->activeInvitations() == 0) {
-        KNotification::event("ConnectionAttempted",
-                             i18n("Attepted uninvited connection from %1: connection refused",
+        KNotification::event("UnexpectedConnection",
+                             i18n("Refused uninvited connection attempt from %1",
                                   remoteIp));
         return RFB_CLIENT_REFUSE;
     }
 
-    if (!askOnConnect && InvitationManager::self()->activeInvitations() == 0) {
+    // In the remaining cases, the connection will be at least partially established, so we need
+    // the clientGoneHook to be called when the connection ends.
+    cl->clientGoneHook = clientGoneHook;
+
+    if (!askOnConnect) {
         KNotification::event("NewConnectionAutoAccepted",
                              i18n("Accepted uninvited connection from %1",
                                   remoteIp));
@@ -125,11 +130,9 @@ enum rfbNewClientAction ConnectionController::handleNewClient()
                          i18n("Received connection from %1, on hold (waiting for confirmation)",
                               remoteIp));
 
-    cl->clientGoneHook = clientGoneHook;
-
     ConnectionDialog *dialog = new ConnectionDialog(0);
     dialog->setRemoteHost(remoteIp);
-    dialog->setAllowRemoteControl( true );
+    dialog->setAllowRemoteControl(KrfbConfig::allowDesktopControl());
 
     connect(dialog, SIGNAL(okClicked()), SLOT(dialogAccepted()));
     connect(dialog, SIGNAL(cancelClicked()), SLOT(dialogRejected()));
@@ -213,8 +216,17 @@ void ConnectionController::clipboardToServer(const QString &s)
 
 void ConnectionController::dialogAccepted()
 {
+    ConnectionDialog *dialog = qobject_cast<ConnectionDialog*>(sender());
+
+    if (!dialog) {
+        kWarning() << "Wrong type of sender.";
+        return;
+    }
     // rfbStartOnHoldClient(cl);
     cl->onHold = false;
+    setControlEnabled(dialog->cbAllowRemoteControl->isChecked());
+    setControlCanBeEnabled(dialog->cbAllowRemoteControl->isChecked());
+    emit sessionEstablished(remoteIp);
 }
 
 void ConnectionController::dialogRejected()
@@ -228,4 +240,14 @@ void ConnectionController::setControlEnabled(bool enable)
     controlEnabled = enable;
 }
 
+void ConnectionController::setControlCanBeEnabled(bool canBeEnabled)
+{
+    m_controlCanBeEnabled = canBeEnabled;
+}
+
+bool ConnectionController::controlCanBeEnabled() const
+{
+    return m_controlCanBeEnabled;
+}
+
 

connectioncontroller.h

@@ -39,6 +39,9 @@ public:
 
     void setControlEnabled(bool enable);
 
+    void setControlCanBeEnabled(bool canBeEnabled);
+    bool controlCanBeEnabled() const;
+
 Q_SIGNALS:
     void sessionEstablished(QString);
     void notification(QString, QString);
@@ -52,6 +55,7 @@ private:
     QString remoteIp;
     struct _rfbClientRec *cl;
     bool controlEnabled;
+    bool m_controlCanBeEnabled;
     /*
     int fd;
     KrfbServer *server;

connectiondialog.cpp

@@ -60,6 +60,7 @@ void ConnectionDialog::setRemoteHost( const QString &host )
 void ConnectionDialog::setAllowRemoteControl( bool b )
 {
   cbAllowRemoteControl->setChecked( b );
+  cbAllowRemoteControl->setVisible(b);
 }
 
 bool ConnectionDialog::allowRemoteControl()

connectionwidget.ui

@@ -144,8 +144,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <resources/>
+  <resources/>
  <connections/>
 </ui>

framebuffer.cpp

@@ -12,26 +12,14 @@
 
 #include <config-krfb.h>
 
-#include <QX11Info>
-
-#include "qtframebuffer.h"
-#include "x11framebuffer.h"
-
 #include <X11/Xutil.h>
 
-#ifdef HAVE_XDAMAGE
-#include <X11/extensions/Xdamage.h>
-#endif
-
 
 FrameBuffer::FrameBuffer(WId id, QObject *parent)
  : QObject(parent), win(id)
 {
-    //TODO: implement reference counting to avoid update the screen
-    // while no client is connected.
 }
 
-
 FrameBuffer::~FrameBuffer()
 {
     delete fb;
@@ -68,18 +56,6 @@ int FrameBuffer::depth()
     return 32;
 }
 
-FrameBuffer * FrameBuffer::getFrameBuffer(WId id, QObject * parent)
-{
-#ifdef HAVE_XDAMAGE
-    int tmp, er;
-    if (XDamageQueryExtension(QX11Info::display(), &tmp, &er)) {
-        return new X11FrameBuffer(id, parent);
-    }
-#endif
-    return new QtFrameBuffer(id, parent);
-
-}
-
 int FrameBuffer::paddedWidth()
 {
     return width() * depth() / 8;
@@ -93,4 +69,3 @@ void FrameBuffer::stopMonitor()
 {
 }
 
-

framebuffer.h

@@ -15,18 +15,19 @@
 #include <QList>
 #include <QWidget>
 
+#include <kdemacros.h>
+
 #include <rfb/rfb.h>
 
 class FrameBuffer;
 /**
 	@author Alessandro Praduroux <pradu@pradu.it>
 */
-class FrameBuffer : public QObject
+class KDE_EXPORT FrameBuffer : public QObject
 {
 Q_OBJECT
 public:
-
-    static FrameBuffer* getFrameBuffer(WId id, QObject *parent);
+    explicit FrameBuffer(WId id, QObject *parent = 0);
 
     virtual ~FrameBuffer();
 
@@ -43,12 +44,13 @@ public:
     virtual void getServerFormat(rfbPixelFormat &format);
 
 protected:
-    explicit FrameBuffer(WId id, QObject *parent = 0);
-
     WId win;
     char *fb;
     QList<QRect> tiles;
 
+private:
+    Q_DISABLE_COPY(FrameBuffer)
+
 };
 
 #endif

framebuffermanager.cpp

@@ -0,0 +1,132 @@
+/* This file is part of the KDE project
+   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
+    @author George Goldberg <george.goldberg@collabora.co.uk>
+
+   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 "framebuffermanager.h"
+
+#include "framebufferplugin.h"
+#include "krfbconfig.h"
+
+#include <KDebug>
+#include <KGlobal>
+#include <KServiceTypeTrader>
+
+#include <QtCore/QSharedPointer>
+
+class FrameBufferManagerStatic
+{
+public:
+    FrameBufferManager instance;
+};
+
+K_GLOBAL_STATIC(FrameBufferManagerStatic, frameBufferManagerStatic)
+
+FrameBufferManager::FrameBufferManager()
+{
+    kDebug();
+
+    loadPlugins();
+}
+
+FrameBufferManager::~FrameBufferManager()
+{
+    kDebug();
+}
+
+FrameBufferManager *FrameBufferManager::instance()
+{
+    kDebug();
+
+    return &frameBufferManagerStatic->instance;
+}
+
+void FrameBufferManager::loadPlugins()
+{
+    kDebug();
+
+    // Load the all the plugin factories here, for use later.
+    KService::List offers = KServiceTypeTrader::self()->query("krfb/framebuffer");
+
+    KService::List::const_iterator iter;
+    for (iter = offers.constBegin(); iter < offers.constEnd(); ++iter) {
+       QString error;
+       KService::Ptr service = *iter;
+
+       KPluginFactory *factory = KPluginLoader(service->library()).factory();
+
+        if (!factory) {
+            kWarning() << "KPluginFactory could not load the plugin:" << service->library();
+            continue;
+        }
+
+       FrameBufferPlugin *plugin = factory->create<FrameBufferPlugin>(this);
+
+       if (plugin) {
+           kDebug() << "Loaded plugin:" << service->name();
+           m_plugins.insert(service->library(), plugin);
+       } else {
+           kDebug() << error;
+       }
+    }
+}
+
+QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
+{
+    kDebug();
+
+    // See if there is still an existing framebuffer to this WId.
+    if (m_frameBuffers.contains(id)) {
+        QWeakPointer<FrameBuffer> weakFrameBuffer = m_frameBuffers.value(id);
+
+        if (weakFrameBuffer) {
+            kDebug() << "Found cached frame buffer.";
+            return weakFrameBuffer.toStrongRef();
+        } else {
+            kDebug() << "Found deleted cached frame buffer. Don't use.";
+            m_frameBuffers.remove(id);
+        }
+    }
+
+    // We don't already have that frame buffer.
+    QMap<QString, FrameBufferPlugin*>::const_iterator iter = m_plugins.constBegin();
+    while (iter != m_plugins.constEnd()) {
+
+        if (iter.key() == KrfbConfig::preferredFrameBufferPlugin()) {
+            kDebug() << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
+
+            QSharedPointer<FrameBuffer> frameBuffer(iter.value()->frameBuffer(id));
+
+            if (frameBuffer) {
+                m_frameBuffers.insert(id, frameBuffer.toWeakRef());
+
+                return frameBuffer;
+            }
+        }
+
+        ++iter;
+    }
+
+    // No valid framebuffer plugin found.
+    kDebug() << "No valid framebuffer found. returning null.";
+    return QSharedPointer<FrameBuffer>();
+}
+
+
+#include "framebuffermanager.moc"
+

framebuffermanager.h

@@ -0,0 +1,62 @@
+/* This file is part of the KDE project
+   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
+    @author George Goldberg <george.goldberg@collabora.co.uk>
+
+   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 KRFB_FRAMEBUFFERMANAGER_H
+#define KRFB_FRAMEBUFFERMANAGER_H
+
+#include "framebuffer.h"
+
+#include <kdemacros.h>
+
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QWeakPointer>
+#include <QtGui/QWidget>
+
+class FrameBufferPlugin;
+class KPluginFactory;
+
+class KDE_EXPORT FrameBufferManager : public QObject
+{
+    Q_OBJECT
+    friend class FrameBufferManagerStatic;
+
+public:
+    static FrameBufferManager *instance();
+
+    virtual ~FrameBufferManager();
+
+    QSharedPointer<FrameBuffer> frameBuffer(WId id);
+
+private:
+    Q_DISABLE_COPY(FrameBufferManager)
+
+    FrameBufferManager();
+
+    void loadPlugins();
+
+    QMap<QString, FrameBufferPlugin*> m_plugins;
+    QMap<WId, QWeakPointer<FrameBuffer> > m_frameBuffers;
+};
+
+
+#endif  // Header guard
+

framebufferplugin.cpp

@@ -0,0 +1,36 @@
+/* This file is part of the KDE project
+   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
+    @author George Goldberg <george.goldberg@collabora.co.uk>
+
+   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 "framebufferplugin.h"
+
+#include "framebuffer.h"
+
+FrameBufferPlugin::FrameBufferPlugin(QObject *parent, const QVariantList &)
+  : QObject(parent)
+{
+}
+
+FrameBufferPlugin::~FrameBufferPlugin()
+{
+}
+
+
+#include "framebufferplugin.moc"
+

framebufferplugin.h

@@ -0,0 +1,44 @@
+/* This file is part of the KDE project
+   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
+    @author George Goldberg <george.goldberg@collabora.co.uk>
+
+   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 LIB_KRFB_FRAMEBUFFERPLUGIN_H
+#define LIB_KRFB_FRAMEBUFFERPLUGIN_H
+
+#include <kdemacros.h>
+
+#include <QtCore/QVariantList>
+#include <QtGui/QWidget>
+
+class FrameBuffer;
+
+class KDE_EXPORT FrameBufferPlugin : public QObject
+{
+    Q_OBJECT
+
+public:
+    FrameBufferPlugin(QObject *parent, const QVariantList &args);
+    virtual ~FrameBufferPlugin();
+
+    virtual FrameBuffer *frameBuffer(WId id) = 0;
+};
+
+
+#endif  // Header guard
+

framebuffers/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_subdirectory (qt)
+add_subdirectory (x11)
+

framebuffers/qt/CMakeLists.txt

@@ -0,0 +1,28 @@
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+                     ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set (krfb_framebuffer_qt_SRCS
+     qtframebuffer.cpp
+     qtframebufferplugin.cpp
+)
+
+kde4_add_plugin (krfb_framebuffer_qt
+                 ${krfb_framebuffer_qt_SRCS}
+)
+
+target_link_libraries (krfb_framebuffer_qt
+                       ${QT_QTCORE_LIBRARY}
+                       ${QT_QTGUI_LIBRARY}
+                       ${KDE4_KDEUI_LIBS}
+                       krfbprivate
+)
+
+install (TARGETS krfb_framebuffer_qt
+         DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+install (FILES krfb_framebuffer_qt.desktop
+         DESTINATION ${SERVICES_INSTALL_DIR}
+)
+

framebuffers/qt/krfb_framebuffer_qt.desktop

@@ -0,0 +1,83 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=Qt based Framebuffer for KRfb.
+Comment[ast]=Esquema Qt de buffer pa KRfb
+Comment[ca]=«Framebuffer» basat en Qt per al KRfb.
+Comment[ca@valencia]=«Framebuffer» basat en Qt per al KRfb.
+Comment[da]=Qt-baseret framebuffer til KRfb.
+Comment[de]=Qt-basierter Framebuffer für KRfb
+Comment[en_GB]=Qt based Framebuffer for KRfb.
+Comment[es]=Esquema Qt de buffer para KRfb
+Comment[et]=KRfb Qt põhine kaadripuhver
+Comment[fi]=QT-perustainen Kehyspuskuri KRfb:lle
+Comment[fr]=Sortie vidéo basée sur Qt pour KRfb.
+Comment[gl]=Framebuffer baseado en Qt para KRfb.
+Comment[hr]=Međuspremnik okvira baziran na Qt-u za KRfb.
+Comment[hu]=Qt-alapú keretpuffer a KRfb-hez.
+Comment[it]=Framebuffer basato su Qt per KRfb.
+Comment[km]=Framebuffer មាន​មូលដ្ឋាន​លើ Qt សម្រាប់ KRfb ។
+Comment[ko]=KRfb를 위한 Qt 기반 프레임버퍼.
+Comment[lv]=Qt balstīts kadrbuferis priekš KRfb.
+Comment[nb]=Qt-basert rammebuffer for KRfb.
+Comment[nds]=Op Qt opbuut Bildpuffer för KRfb
+Comment[nl]=Op Qt gebaseerd framebuffer voor KRfb.
+Comment[nn]=Qt basert framebuffer for KRfb.
+Comment[pt]='Framebuffer' baseado no Qt para o KRfb.
+Comment[pt_BR]=Framebuffer baseado no Qt para o KRfb.
+Comment[sk]=Framebuffer založený na Qt pre KRfb.
+Comment[sl]=Slikovni medpomnilnik za KRFB, ki temelji na Qt
+Comment[sr]=Кадробафер за КРФБ на основу КуТ‑у
+Comment[sr@ijekavian]=Кадробафер за КРФБ на основу КуТ‑у
+Comment[sr@ijekavianlatin]=Kadrobafer za KRFB na osnovu Qt‑u
+Comment[sr@latin]=Kadrobafer za KRFB na osnovu Qt‑u
+Comment[sv]=Qt-baserad rambuffert för Krfb.
+Comment[tr]=KRfb için Qt temelli Çerçeve tamponu.
+Comment[uk]=Заснований на Qt буфер кадрів для KRfb.
+Comment[x-test]=xxQt based Framebuffer for KRfb.xx
+Comment[zh_CN]=基于 Qt 的 KRfb 帧缓冲机制
+Comment[zh_TW]=KRfb 的 Qt-based Framebuffer
+Name=Qt Framebuffer for KRfb
+Name[ast]=Esquema Qt de buffer pa KRfb
+Name[ca]=«Framebuffer» Qt per al KRfb.
+Name[ca@valencia]=«Framebuffer» Qt per al KRfb.
+Name[da]=Qt-framebuffer til KRfb
+Name[de]=Qt-Framebuffer für KRfb
+Name[en_GB]=Qt Framebuffer for KRfb
+Name[es]=Esquema Qt de buffer para KRfb
+Name[et]=KRfb Qt kaadripuhver
+Name[fi]=QT-kehyspuskuri KRfb:lle
+Name[fr]=Sortie vidéo Qt pour KRfb
+Name[gl]=Framebuffer de Qt para KRfb
+Name[hr]=Qt Framebuffer za KRfb
+Name[hu]=Qt-alapú keretpuffer a KRfb-hez
+Name[it]=Framebuffer Qt per KRfb
+Name[km]=Qt Framebuffer សម្រាប់for KRfb
+Name[ko]=KRfb를 위한 Qt 프레임버퍼
+Name[lv]=Qt kadrbuferis priekš KRfb.
+Name[nb]=Qt rammebuffer for KRfb
+Name[nds]=Qt-Bildpuffer för KRfb
+Name[nl]=Qt-framebuffer voor KRfb
+Name[nn]=Qt-framebuffer for KRfb
+Name[pt]='Framebuffer' do Qt para o KRfb
+Name[pt_BR]=Framebuffer do Qt para o KRfb
+Name[sk]=Qt Framebuffer pre KRfb
+Name[sl]=Slikovni medpomnilnik Qt za KRFB
+Name[sr]=КуТ‑ов кадробафер за КРФБ
+Name[sr@ijekavian]=КуТ‑ов кадробафер за КРФБ
+Name[sr@ijekavianlatin]=Qt‑ov kadrobafer za KRFB
+Name[sr@latin]=Qt‑ov kadrobafer za KRFB
+Name[sv]=Qt-rambuffert för Krfb
+Name[tr]=KRfb için Qt Çerçeve tamponu
+Name[uk]=Буфер кадрів на Qt для KRfb
+Name[x-test]=xxQt Framebuffer for KRfbxx
+Name[zh_CN]=KRfb 的 Qt 帧缓冲机制
+Name[zh_TW]=Krfb 的 Qt Framebuffer
+Type=Service
+ServiceTypes=krfb/framebuffer
+
+X-KDE-Library=krfb_framebuffer_qt
+X-KDE-PluginInfo-Name=qt
+X-KDE-PluginInfo-Version=0.1
+X-KDE-PluginInfo-Website=http://www.kde.org
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true

framebuffers/qt/qtframebuffer.cpp

@@ -31,6 +31,7 @@ QtFrameBuffer::QtFrameBuffer(WId id, QObject *parent)
 QtFrameBuffer::~QtFrameBuffer()
 {
     delete [] fb;
+    fb = 0;
 }
 
 int QtFrameBuffer::depth()

framebuffers/qt/qtframebuffer.h

@@ -7,8 +7,8 @@
    version 2 of the License, or (at your option) any later version.
 */
 
-#ifndef QTFRAMEBUFFER_H
-#define QTFRAMEBUFFER_H
+#ifndef KRFB_FRAMEBUFFER_QT_QTFRAMEBUFFER_H
+#define KRFB_FRAMEBUFFER_QT_QTFRAMEBUFFER_H
 
 #include <QImage>
 #include "framebuffer.h"

framebuffers/qt/qtframebufferplugin.cpp

@@ -0,0 +1,47 @@
+/* This file is part of the KDE project
+   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
+    @author George Goldberg <george.goldberg@collabora.co.uk>
+
+   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 "qtframebufferplugin.h"
+
+#include "qtframebuffer.h"
+
+#include <KGenericFactory>
+
+
+QtFrameBufferPlugin::QtFrameBufferPlugin(QObject *parent, const QVariantList &args)
+  : FrameBufferPlugin(parent, args)
+{
+}
+
+QtFrameBufferPlugin::~QtFrameBufferPlugin()
+{
+}
+
+FrameBuffer *QtFrameBufferPlugin::frameBuffer(WId id)
+{
+    return new QtFrameBuffer(id);
+}
+
+K_PLUGIN_FACTORY(factory, registerPlugin<QtFrameBufferPlugin>();) \
+K_EXPORT_PLUGIN(factory("krfb_framebuffer_qt"))
+
+
+#include "qtframebufferplugin.moc"
+

framebuffers/qt/qtframebufferplugin.h

@@ -0,0 +1,48 @@
+/* This file is part of the KDE project
+   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
+    @author George Goldberg <george.goldberg@collabora.co.uk>
+
+   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 KRFB_FRAMEBUFFER_QT_QTFRAMEBUFFERPLUGIN_H
+#define KRFB_FRAMEBUFFER_QT_QTFRAMEBUFFERPLUGIN_H
+
+#include "framebufferplugin.h"
+
+#include <kdemacros.h>
+
+#include <QtGui/QWidget>
+
+class FrameBuffer;
+
+class QtFrameBufferPlugin : public FrameBufferPlugin
+{
+    Q_OBJECT
+
+public:
+    QtFrameBufferPlugin(QObject *parent, const QVariantList &args);
+    virtual ~QtFrameBufferPlugin();
+
+    virtual FrameBuffer *frameBuffer(WId id);
+
+private:
+    Q_DISABLE_COPY(QtFrameBufferPlugin)
+};
+
+
+#endif  // Header guard
+

framebuffers/x11/CMakeLists.txt

@@ -0,0 +1,31 @@
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+                     ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set (krfb_framebuffer_x11_SRCS
+     x11framebuffer.cpp
+     x11framebufferplugin.cpp
+)
+
+kde4_add_plugin (krfb_framebuffer_x11
+                 ${krfb_framebuffer_x11_SRCS}
+)
+
+target_link_libraries (krfb_framebuffer_x11
+                       ${KDE4_KDEUI_LIBS}
+                       ${QT_QTCORE_LIBRARY}
+                       ${QT_QTGUI_LIBRARY}
+                       ${X11_X11_LIB}
+                       ${X11_Xdamage_LIB}
+                       ${X11_Xext_LIB}
+                       krfbprivate
+)
+
+install (TARGETS krfb_framebuffer_x11
+         DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+install (FILES krfb_framebuffer_x11.desktop
+         DESTINATION ${SERVICES_INSTALL_DIR}
+)
+

framebuffers/x11/krfb_framebuffer_x11.desktop

@@ -0,0 +1,83 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=X11 XDamage/XShm based Framebuffer for KRfb.
+Comment[ast]=Esquema de buffer pa KRfb basáu en XDamage/XShm
+Comment[ca]=«Framebuffer» basat en XDamage/XShmQt de l'X11 per al KRfb.
+Comment[ca@valencia]=«Framebuffer» basat en XDamage/XShmQt de l'X11 per al KRfb.
+Comment[da]=X11 XDamage/XShm-baseret framebuffer til KRfb.
+Comment[de]=X11 XDamage/XShm-basierter Framebuffer für KRfb.
+Comment[en_GB]=X11 XDamage/XShm based Framebuffer for KRfb.
+Comment[es]=Esquema de buffer para KRfb basado en XDamage/XShm
+Comment[et]=KRfb X11 XDamage/XShm põhine kaadripuhver
+Comment[fi]=X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.
+Comment[fr]=Sortie vidéo basée sur X11 XDamage / XShm pour KRfb.
+Comment[gl]=Framebuffer baseado en Xll XDamage/Xshm para XRfb.
+Comment[hr]=Međuspreminik okvira baziran na X11 XDamage/XShm za KRfb.
+Comment[hu]=X11 XDamage/XShm-alapú keretpuffer a KRfb-hez.
+Comment[it]=Framebuffer basato su XDamage/XShm di X11 per KRfb.
+Comment[km]=X11 XDamage/XShm based Framebuffer សម្រាប់ KRfb ។
+Comment[ko]=KRfb를 위한 X11 XDamage/XShm 기반 프레임버퍼.
+Comment[lv]=X11 XDamage/XShm balstīts kadrbuferis priekš KRfb.
+Comment[nb]=Rammebuffer for KRfb basert på X11 XDamage/XShm.
+Comment[nds]=Op X11-XDamage/-XShm opbuut Bildpuffer för KRfb
+Comment[nl]=Op X11 XDamage/XShm gebaseerd framebuffer voor KRfb.
+Comment[nn]=X11 XDamage/XShm basert framebuffer for KRfb.
+Comment[pt]='Framebuffer' baseado no XDamage/XShm do X11 para o KRfb.
+Comment[pt_BR]=Framebuffer baseado no XDamage/XShm do X11 para o KRfb.
+Comment[sk]=Framebuffer založený na X11 XDamage/XShm pre KRfb.
+Comment[sl]=Slikovni medpomnilnik za KRFB, ki temelji na X11 XDamage/XShm
+Comment[sr]=Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.
+Comment[sr@ijekavian]=Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.
+Comment[sr@ijekavianlatin]=Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.
+Comment[sr@latin]=Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.
+Comment[sv]=X11 XDamage/XShm-baserad rambuffert för Krfb.
+Comment[tr]=KRfb için X11 XDamage/XShm temelli Çerçeve Tamponu.
+Comment[uk]=Заснований на XDamage/XShm X11 буфер кадрів для KRfb.
+Comment[x-test]=xxX11 XDamage/XShm based Framebuffer for KRfb.xx
+Comment[zh_CN]=基于 X11 XDamage/XShm 扩展的 KRfb 帧缓冲机制。
+Comment[zh_TW]=KRfb 的 X11 XDamage/XShm based Framebuffer
+Name=X11 Framebuffer for KRfb
+Name[ast]=Buffer de X11 pa KRfb
+Name[ca]=«Framebuffer» de l'X11 per al KRfb.
+Name[ca@valencia]=«Framebuffer» de l'X11 per al KRfb.
+Name[da]=X11-framebuffer til KRfb
+Name[de]=X11-Framebuffer für KRfb
+Name[en_GB]=X11 Framebuffer for KRfb
+Name[es]=Buffer de X11 para KRfb
+Name[et]=KRfb X11 kaadripuhver
+Name[fi]=X11-kehyspuskuri KRfb:lle
+Name[fr]=Sortie vidéo X11 pour KRfb
+Name[gl]=Framebuffer de X11 para KRfb
+Name[hr]=Međuspremnik okvira X11 za KRfb
+Name[hu]=X11-alapú keretpuffer a KRfb-hez
+Name[it]=Framebuffer X11 per KRfb
+Name[km]=X11 Framebuffer សម្រាប់ KRfb
+Name[ko]=KRfb를 위한 X11 프레임버퍼
+Name[lv]=X11 kadrbuferis priekš KRfb
+Name[nb]=X11 rammebuffer for KRfb
+Name[nds]=X11-Bildpuffer för KRfb
+Name[nl]=X11 framebuffer voor KRfb
+Name[nn]=X11-framebuffer for KRfb
+Name[pt]='Framebuffer' do X11 para o KRfb
+Name[pt_BR]=Framebuffer do X11 para o KRfb
+Name[sk]=X11 Framebuffer pre KRfb
+Name[sl]=Slikovni medpomnilnik X11 za KRFB
+Name[sr]=Икс11 кадробафер за КРФБ.
+Name[sr@ijekavian]=Икс11 кадробафер за КРФБ.
+Name[sr@ijekavianlatin]=X11 kadrobafer za KRFB.
+Name[sr@latin]=X11 kadrobafer za KRFB.
+Name[sv]=X11-rambuffert för Krfb
+Name[tr]=KRfb için X11 Çerçeve Tamponu
+Name[uk]=Буфер кадрів X11 для KRfb
+Name[x-test]=xxX11 Framebuffer for KRfbxx
+Name[zh_CN]=KRfb 的 X11 帧缓冲机制
+Name[zh_TW]=KRfb 的 X11 Framebuffer
+Type=Service
+ServiceTypes=krfb/framebuffer
+
+X-KDE-Library=krfb_framebuffer_x11
+X-KDE-PluginInfo-Name=x11
+X-KDE-PluginInfo-Version=0.1
+X-KDE-PluginInfo-Website=http://www.kde.org
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true

framebuffers/x11/x11framebuffer.h

@@ -6,8 +6,8 @@
    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
+#ifndef KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFER_H
+#define KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFER_H
 
 #include <framebuffer.h>
 #include <QWidget>
@@ -35,7 +35,7 @@ class X11FrameBuffer : public FrameBuffer
 {
 Q_OBJECT
 public:
-    X11FrameBuffer(WId id, QObject* parent);
+    X11FrameBuffer(WId id, QObject* parent = 0);
 
     ~X11FrameBuffer();
 

framebuffers/x11/x11framebufferplugin.cpp

@@ -0,0 +1,47 @@
+/* This file is part of the KDE project
+   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
+    @author George Goldberg <george.goldberg@collabora.co.uk>
+
+   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 "x11framebufferplugin.h"
+
+#include "x11framebuffer.h"
+
+#include <KGenericFactory>
+
+
+X11FrameBufferPlugin::X11FrameBufferPlugin(QObject *parent, const QVariantList &args)
+  : FrameBufferPlugin(parent, args)
+{
+}
+
+X11FrameBufferPlugin::~X11FrameBufferPlugin()
+{
+}
+
+FrameBuffer *X11FrameBufferPlugin::frameBuffer(WId id)
+{
+    return new X11FrameBuffer(id);
+}
+
+K_PLUGIN_FACTORY(factory, registerPlugin<X11FrameBufferPlugin>();) \
+K_EXPORT_PLUGIN(factory("krfb_framebuffer_x11"))
+
+
+#include "x11framebufferplugin.moc"
+

framebuffers/x11/x11framebufferplugin.h

@@ -0,0 +1,48 @@
+/* This file is part of the KDE project
+   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
+    @author George Goldberg <george.goldberg@collabora.co.uk>
+
+   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 KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFERPLUGIN_H
+#define KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFERPLUGIN_H
+
+#include "framebufferplugin.h"
+
+#include <kdemacros.h>
+
+#include <QtGui/QWidget>
+
+class FrameBuffer;
+
+class X11FrameBufferPlugin : public FrameBufferPlugin
+{
+    Q_OBJECT
+
+public:
+    X11FrameBufferPlugin(QObject *parent, const QVariantList &args);
+    virtual ~X11FrameBufferPlugin();
+
+    virtual FrameBuffer *frameBuffer(WId id);
+
+private:
+    Q_DISABLE_COPY(X11FrameBufferPlugin)
+};
+
+
+#endif  // Header guard
+

invitewidget.ui

@@ -166,9 +166,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <resources/>
+  <resources/>
  <connections/>
 </ui>

kcm_krfb/configurationwidget.ui

@@ -495,7 +495,6 @@ Most VNC clients use a display number instead of the actual port. This display n
     <tabstop>passwordInput</tabstop>
     <tabstop>portInput</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
 <customwidgets>
     <customwidget>
         <class>KIntNumInput</class>

kcm_krfb/kcmkrfb.desktop

@@ -12,30 +12,35 @@ X-KDE-ParentApp=kcontrol
 
 Name=Desktop Sharing
 Name[af]=Werkskerm Deeling
+Name[ar]=مشاركة سطح المكتب
+Name[ast]=Escritoriu compartiu
 Name[bg]=Споделяне на работното място
 Name[bn]=ডেস্কটপ ভাগাভাগি
 Name[br]=Rannañ ar vurev
 Name[ca]=Compartició de l'escriptori
+Name[ca@valencia]=Compartició de l'escriptori
 Name[cs]=Sdílení pracovní plochy
 Name[cy]=Rhannu Penbwrdd
 Name[da]=Desktopdeling
 Name[de]=Arbeitsflächen-Freigabe
 Name[el]=Κοινή χρήση επιφάνειας εργασίας
+Name[en_GB]=Desktop Sharing
 Name[eo]=Tabula komunigado
 Name[es]=Escritorio compartido
 Name[et]=Töölaua jagamine
-Name[eu]=Mahaigain partekatzea
+Name[eu]=Mahaigaina partekatzea
 Name[fa]=اشتراک رومیزی
 Name[fi]=Työpöydän jakaminen
 Name[fr]=Partage de bureau
 Name[ga]=Roinnt Deisce
-Name[gl]=Compartilla do escritorio
+Name[gl]=Compartimento do escritorio
 Name[he]=שיתוף שולחנות עבודה
 Name[hi]=डेस्कटॉप साझेदारी
+Name[hne]=डेस्कटाप साझेदारी
 Name[hr]=Dijeljenje radne površine
 Name[hu]=Munkaasztal-megosztás
 Name[is]=Skjáborðamiðlun
-Name[it]=Condivisione desktop
+Name[it]=Condivisione del desktop
 Name[ja]=デスクトップ共有
 Name[kk]=Үстелді ортақтастыру
 Name[km]=ការ​ចែក​រំលែក​ផ្ទៃ​តុ
@@ -43,6 +48,7 @@ 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
@@ -58,44 +64,53 @@ Name[ru]=Общий рабочий стол
 Name[se]=Čállinbeavdejuohkkin
 Name[sk]=Zdieľanie pracovnej plochy
 Name[sl]=Deljenje namizja
+Name[sr]=Дељење површи
+Name[sr@ijekavian]=Дијељење површи
+Name[sr@ijekavianlatin]=Dijeljenje površi
+Name[sr@latin]=Deljenje površi
 Name[sv]=Dela ut skrivbordet
 Name[ta]=பணிமேடை பகிர்வு
 Name[tg]=Истифодабарии муштараки Мизи корӣ
 Name[tr]=Masaüstü Paylaşımı
 Name[uk]=Спільні стільниці
 Name[vi]=Chia sẻ màn hình nền
-Name[x-test]=xxDesktop Sharingxx
 Name[xh]=Ukwehlulelana kwe Desktop
+Name[x-test]=xxDesktop Sharingxx
 Name[zh_CN]=桌面共享
 Name[zh_HK]=桌面分享
 Name[zh_TW]=桌面分享
 
 Comment=Configure Desktop Sharing
 Comment[af]=Konfigureer Werkskerm Deeling
+Comment[ar]=تعديل مشاركة سطح المكتب
+Comment[ast]=Configura'l to escritoriu compartíu
 Comment[bg]=Настройване споделянето на работното място
 Comment[bn]=ডেস্কটপ ভাগাভাগি কনফিগার করুন
 Comment[br]=Kefluniañ rannañ ar vurev
 Comment[ca]=Lupa de l'escriptori
+Comment[ca@valencia]=Lupa de l'escriptori
 Comment[cs]=Nastavit sdílení pracovní plochy
 Comment[cy]=Ffurfweddu Rhannu Penbwrdd
 Comment[da]=Indstil desktopdeling
 Comment[de]=Freigabe der Arbeitsfläche einrichten
 Comment[el]=Ρύθμιση της κοινής χρήσης της επιφάνειας εργασίας
+Comment[en_GB]=Configure Desktop Sharing
 Comment[eo]=Agordi la tabulan komunigadon
 Comment[es]=Configure su escritorio compartido
 Comment[et]=Töölaua jagamise seadistamine
-Comment[eu]=Konfiguratu mahaigain partekatzea
+Comment[eu]=Konfiguratu mahaigaina partekatzea
 Comment[fa]=پیکربندی اشتراک رومیزی
 Comment[fi]=Aseta työpöydän jakaminen
 Comment[fr]=Configuration du partage du bureau
 Comment[ga]=Cumraigh Roinnt Deisce
-Comment[gl]=Configurar a compartilla do escritorio
+Comment[gl]=Configurar o compartimento do escritorio
 Comment[he]=שינוי הגדרות שיתוף שולחנות העבודה
 Comment[hi]=डेस्कटॉप साझेदारी कॉन्फ़िगर करें
+Comment[hne]=डेस्कटाप साझेदारी कान्फिगर करव
 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
-Comment[it]=Configura condivisione desktop
+Comment[it]=Configura condivisione del desktop
 Comment[ja]=デスクトップ共有の設定
 Comment[kk]=Үстелді ортақтастыруды баптау
 Comment[km]=កំណត់​រចនា​សម្ព័ន្ធ​ការ​ចែក​រំលែក​ផ្ទៃ​តុ
@@ -103,6 +118,7 @@ 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
@@ -112,20 +128,24 @@ 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[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@ijekavian]=Подешавање дијељења површи
+Comment[sr@ijekavianlatin]=Podešavanje dijeljenja površi
+Comment[sr@latin]=Podešavanje deljenja površi
 Comment[sv]=Anpassa utdelning av skrivbord
 Comment[ta]=பணிமேடை பகிர்வை உள்ளமை
 Comment[tg]=Батанзимдарории Истифодабарии муштараки Мизи корӣ
 Comment[tr]=Masaüstü Paylaşımını Yapılandır
 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[x-test]=xxConfigure Desktop Sharingxx
 Comment[zh_CN]=配置桌面共享
 Comment[zh_HK]=設定桌面分享
 Comment[zh_TW]=設定桌面分享

kinetd/kinetd.desktop

@@ -8,29 +8,35 @@ X-KDE-Kded-autoload=true
 
 Name=KDE Internet Daemon
 Name[af]=Kde Internet Bediener
+Name[ar]=كيدي إنترنت مراقب
+Name[ast]=Degorriu d'Internet de KDE
 Name[bg]=Интернет демон
 Name[bn]=কে-ডি-ই ইন্টারনেট ডিমন
 Name[br]=Diaoul kenrouedad KDE
 Name[ca]=Dimoni d'Internet per al KDE
+Name[ca@valencia]=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]=Internet-Dienst
 Name[el]=Δαίμονας διαδικτύου για το KDE
+Name[en_GB]=KDE Internet Dæmon
 Name[eo]=KDE interreta demono
 Name[es]=Demonio de Internet de KDE
 Name[et]=KDE internetideemon
-Name[eu]=KDE internet deabrua
+Name[eu]=KDE interneteko daemona
 Name[fa]=شبح اینترنتی KDE
-Name[fi]=KDE Internet-palvelin
+Name[fi]=KDE:n Internet-palvelin
 Name[fr]=Démon Internet de KDE
 Name[ga]=Deamhan Idirlín KDE
 Name[gl]=Daemon de internet de KDE
 Name[he]=תהליך הרקע האינטרנטי של KDE
 Name[hi]=केडीई इंटरनेट डेमन
+Name[hne]=केडीई इंटरनेट डेमन
+Name[hr]=KDE Internet Daemon
 Name[hu]=KDE internetes szolgáltatás
 Name[is]=KDE Internetþjónn
-Name[it]=Demone internet di KDE
+Name[it]=Demone Internet di KDE
 Name[ja]=KDE インターネットデーモン
 Name[kk]=KDE Интернет қызметі
 Name[km]=ដេមិន​អ៊ីនធឺណិត​របស់ KDE
@@ -38,19 +44,26 @@ 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[nl]=KDE Internet Daemon
 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[pt_BR]=Servidor de Internet do 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]=КДЕ‑ов интернет демон
+Name[sr@ijekavian]=КДЕ‑ов интернет демон
+Name[sr@ijekavianlatin]=KDE‑ov internet demon
+Name[sr@latin]=KDE‑ov internet demon
 Name[sv]=KDE:s Internetdemon
 Name[ta]=கேடிஇ இணைய டேமொன்
 Name[tg]=KDE Азозили Интернет
@@ -59,34 +72,40 @@ Name[uk]=Фонова служба Інтернет KDE
 Name[uz]=KDE Internet demoni
 Name[uz@cyrillic]=KDE Интернет демони
 Name[vi]=Trình nền Mạng KDE
+Name[xh]=KDE Internet Daemon
 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[ast]=Un degorriu d'Internet qu'entama los servicios de rede baxo demanda
 Comment[bg]=Интернет демон, който служи за стартиране на мрежови услуги при поискване
 Comment[bn]=একটি ইন্টারনেট ডিমন যে চাহিদা ভিত্তিক নেটওয়ার্ক সার্ভিস আরম্ভ করে
 Comment[ca]=Un dimoni d'Internet que arrenca els serveis de xarxa sota demanda
+Comment[ca@valencia]=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[en_GB]=An Internet dæmon that starts network services on demand
 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[eu]=Sare zerbitzuak eskatzean abiarazten dituen Interneteko daemona
 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í líonra ar éileamh
-Comment[gl]=Un daemon de Internet que comenza servizos de rede baixo demanda
+Comment[gl]=Un daemon de Internet que inicia servizos de rede baixo demanda
 Comment[he]=תהליך רקע של אינטרנט שמתחיל שירותי רשת לפי דרישה
 Comment[hi]=एक इंटरनेट डेमन जो मांग पर नेटवर्क सेवा प्रारंभ करता है
+Comment[hne]=एक इंटरनेट डेमन जऊन मांग मं नेटवर्क सेवा चालू करथे 
 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
-Comment[it]=Un demone internet che avvia i servizi di rete a richiesta
+Comment[it]=Un demone Internet che avvia i servizi di rete a richiesta
 Comment[ja]=要求時にネットワークサービスを起動するインターネットデーモン
 Comment[kk]=Талап етілгенде керек желі қызметтерді жегетін қызмет
 Comment[km]=ដេមិន​អ៊ីនធឺណិត​ដែល​ចាប់ផ្ដើម​សេវា​បណ្ដាញ​នៅ​ពេល​ត្រូវការ
@@ -94,20 +113,26 @@ 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-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 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[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@ijekavian]=Интернет демон који покреће мрежне сервисе по захтеву
+Comment[sr@ijekavianlatin]=Internet demon koji pokreće mrežne servise po zahtevu
+Comment[sr@latin]=Internet demon koji pokreće mrežne servise po zahtevu
 Comment[sv]=Internetdemon som startar nätverkstjänster vid behov
 Comment[ta]=ஒரு இணைய டேமொன், டேமொன் பிணைய சேவையை ஆரம்பிக்கிறது
 Comment[tg]=Азозили шабакавие, ки хидматрасони шабакавиро бо дархост сар медиҳад
@@ -116,8 +141,8 @@ 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[x-test]=xxAn Internet daemon that starts network services on demandxx
 Comment[zh_CN]=按需启动网络服务的守护进程
 Comment[zh_HK]=自動依需求起動網絡服務的互聯網系統程式
 Comment[zh_TW]=依要求起動網路服務的 Internet 伺服程式

kinetd/kinetd.notifyrc

@@ -1,21 +1,82 @@
 [Global]
 IconName=kinetd
 Comment=KInetD
+Comment[ar]=KInetD
+Comment[ast]=KInetD
 Comment[bn]=কে-আইনেট-ডি
+Comment[br]=KInetD
+Comment[ca]=KInetD
+Comment[ca@valencia]=KInetD
+Comment[cs]=KInetD
+Comment[cy]=KInetD
+Comment[da]=KInetD
+Comment[de]=KInetD
+Comment[el]=KInetD
+Comment[en_GB]=KInetD
+Comment[eo]=KInetD
+Comment[es]=KInetD
+Comment[et]=KInetD
+Comment[eu]=KInetD
+Comment[fi]=KInetD
+Comment[fr]=KInetD
+Comment[ga]=KInetD
+Comment[gl]=KInetD
+Comment[he]=KInetD
 Comment[hi]=के-इनिट-डी
+Comment[hne]=के-इनिट-डी
+Comment[hr]=KInetD
+Comment[hu]=KInetD
+Comment[is]=KInetD
+Comment[it]=KInetD
+Comment[ja]=KInetD
+Comment[km]=KInetD
+Comment[ko]=KInetD
+Comment[lt]=KInetD
+Comment[lv]=KInetD
+Comment[mk]=KInetD
+Comment[ml]=കെഐനെറ്റ്ഡി
+Comment[ms]=KInetD
+Comment[nb]=KInetD
+Comment[nds]=KInetD
+Comment[nl]=KInetD
+Comment[nn]=KInetD
+Comment[pa]=KInetD
+Comment[pl]=KInetD
+Comment[pt]=KInetD
+Comment[pt_BR]=KInetD
+Comment[ro]=KInetD
+Comment[ru]=KInetD
+Comment[sk]=KInetD
+Comment[sl]=KInetD
+Comment[sr]=КинетД
+Comment[sr@ijekavian]=КинетД
+Comment[sr@ijekavianlatin]=KInetD
+Comment[sr@latin]=KInetD
 Comment[sv]=Kinetd
+Comment[ta]=KInetD
+Comment[tg]=KInetD
+Comment[tr]=KInetD
+Comment[uk]=KInetD
+Comment[xh]=KInetD
 Comment[x-test]=xxKInetDxx
+Comment[zh_CN]=KInetD
+Comment[zh_HK]=KInetD
+Comment[zh_TW]=KInetD
 
 [Event/IncomingConnection]
 Name=IncomingConnection
+Name[ar]=اتصال وارد
+Name[ast]=Conexón entrante
 Name[bn]=অন্তর্মুখী সংযোগ
 Name[br]=Kevreadenn resev
 Name[ca]=Connexió entrant
+Name[ca@valencia]=Connexió entrant
 Name[cs]=Příchozí spojení
 Name[cy]=CysylltiadCyrraedd
 Name[da]=IndkommendeForbindelse
 Name[de]=Eingehende Verbindung
 Name[el]=Εισερχόμενη σύνδεση
+Name[en_GB]=IncomingConnection
 Name[eo]=Envenanta konekto
 Name[es]=Conexión entrante
 Name[et]=Sissetulev ühendus
@@ -23,85 +84,106 @@ Name[eu]=Sarrerako konexioa
 Name[fi]=Saapuva yhteys
 Name[fr]=Connexion entrante
 Name[ga]=Ceangal Isteach
-Name[gl]=Conexón entrante
+Name[gl]=Conexión entrante
 Name[he]=חיבור נכנס
 Name[hi]=आवक-कनेक्शन
+Name[hne]=आवक-कनेक्सन
 Name[hr]=DolaznaVeza
 Name[hu]=Bejövő kapcsolat
+Name[is]=IncomingConnection
 Name[it]=Connessioni in entrata
 Name[ja]=外部からの接続
 Name[km]=ការ​តភ្ជាប់​ចូល
+Name[ko]=IncomingConnection
 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[pt]=IncomingConnection
+Name[pt_BR]=Conexões de entrada
 Name[ro]=ConexiuneDeIntrare
 Name[ru]=Входящее соединение
-Name[sk]=Prichádzajúce spojenia
-Name[sl]=Prihajajoča povezava
+Name[sk]=Prichádzajúce pripojenie
+Name[sl]=Prejeta povezava
+Name[sr]=Долазна веза
+Name[sr@ijekavian]=Долазна веза
+Name[sr@ijekavianlatin]=Dolazna veza
+Name[sr@latin]=Dolazna veza
 Name[sv]=Inkommande anslutning
 Name[ta]=உள்வரும் இணைப்புகள்
 Name[tg]=Пайвастшавии Воридшаванда
 Name[tr]=Gelen Bağlantı
-Name[x-test]=xxIncomingConnectionxx
+Name[uk]=IncomingConnection
 Name[xh]=Uxhumaniso Olungenayo
+Name[x-test]=xxIncomingConnectionxx
 Name[zh_CN]=进入的连接
 Name[zh_HK]=進入連線
 Name[zh_TW]=進來的連線
 Comment=Received incoming connection
 Comment[af]=Ontvang inkomende verbinding
+Comment[ar]=تلقي اتصال وارد 
+Comment[ast]=Recibida conexón entrante
 Comment[bn]=অন্তর্মুখী সংযোগ গ্রহণ করল
 Comment[ca]=Rebuda connexió entrant
+Comment[ca@valencia]=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[en_GB]=Received incoming connection
 Comment[eo]=Ricevis envenantan konekton
 Comment[es]=Recibida conexión entrante
 Comment[et]=Saadi sissetulev ühendus
-Comment[eu]=Konexio bat jaso da
+Comment[eu]=Sarrerako 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[gl]=Recibiuse unha conexión entrante
 Comment[he]=נתקבל חיבור נכנס
 Comment[hi]=आवक कनेक्शन प्राप्त
+Comment[hne]=आवक कनेक्सन प्राप्त
 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[it]=Ricevuta connessione in entrata
 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[pl]=Otrzymano połączenie 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[sk]=Prijaté prichádzajúce pripojenie
 Comment[sl]=Prejeta je prihajajoča povezava
+Comment[sr]=Примљена је долазна веза
+Comment[sr@ijekavian]=Примљена је долазна веза
+Comment[sr@ijekavianlatin]=Primljena je dolazna veza
+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[x-test]=xxReceived incoming connectionxx
 Comment[zh_CN]=收到进入的连接
 Comment[zh_HK]=已接收的進入連線
 Comment[zh_TW]=接收到進來的連線
@@ -109,13 +191,17 @@ Action=None
 
 [Event/ProcessFailed]
 Name=ProcessFailed
+Name[ar]=فشلت العملية
+Name[ast]=Procesu fallíu
 Name[bn]=প্রসেস ব্যর্থ
-Name[ca]=Procés fallit
+Name[ca]=Procés erroni
+Name[ca@valencia]=Procés erroni
 Name[cs]=Proces selhal
 Name[cy]=MethoddProses
 Name[da]=ProcesMislykkedes
 Name[de]=Prozess fehlgeschlagen
 Name[el]=Η διεργασία απέτυχε
+Name[en_GB]=ProcessFailed
 Name[eo]=Procezo fiaskis
 Name[es]=Proceso fallido
 Name[et]=Protsess nurjus
@@ -126,14 +212,18 @@ Name[ga]=PróiseasTeipthe
 Name[gl]=Fallou o proceso
 Name[he]=תהליך נכשל
 Name[hi]=प्रक्रिया-असफल
+Name[hne]=काम-फेल
 Name[hr]=ProcesNeuspješan
 Name[hu]=Hibás folyamat
-Name[it]=Processo fallito
+Name[is]=ProcessFailed
+Name[it]=Processo non riuscito
 Name[ja]=プロセス失敗
 Name[km]=ដំណើរ​ការ​បាន​បរាជ័យ
+Name[ko]=ProcessFailed
 Name[lt]=Procesas nepavyko
 Name[lv]=ProcessNeveiksmīgs
 Name[mk]=Процесот не успеа
+Name[ml]=പ്രക്രിയ പരാജയപ്പെട്ടു
 Name[ms]=Proses Gagal
 Name[nb]=Prosessen mislyktes
 Name[nds]=PerzessFehlslaan
@@ -141,29 +231,39 @@ Name[nl]=Proces_mislukt
 Name[nn]=Prosessen feila
 Name[pa]=ਪਰੋਸੈਸ ਫੇਲ੍ਹ
 Name[pl]=Błąd procesu
-Name[pt_BR]=Falha de Processo
+Name[pt]=ProcessFailed
+Name[pt_BR]=Falha de processo
 Name[ro]=ProcesEșuat
 Name[ru]=Ошибка процесса
-Name[sk]=Proces neúspešny
+Name[sk]=Proces zlyhal
 Name[sl]=Proces ni uspel
+Name[sr]=Процес није успео
+Name[sr@ijekavian]=Процес није успео
+Name[sr@ijekavianlatin]=Proces nije uspeo
+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[uk]=ProcessFailed
 Name[xh]=Inkqubo Yahlulekile
+Name[x-test]=xxProcessFailedxx
 Name[zh_CN]=处理失败
 Name[zh_HK]=程序失敗
 Name[zh_TW]=行程失敗
 Comment=Could not call process to handle connection
 Comment[af]=Kon nie roep proses na handvatsel verbinding
+Comment[ar]= لا يمكن نداء الإجراء إلى مؤشر الاتصال
+Comment[ast]=Nun puede llamase a un procesu pa remanar la conexón
 Comment[bn]=সংযোগ পরিচালনা করতে প্রসেস শুরু করতে পারল না
 Comment[ca]=No es pot cridar al procés per a manejar la connexió
+Comment[ca@valencia]=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[en_GB]=Could not call process to handle connection
 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
@@ -171,9 +271,10 @@ 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[gl]=Non foi posíbel chamar ao proceso que xestiona a conexión
 Comment[he]=אין אפשרות לקרוא לתהליך על מנת לטפל בחיבור
 Comment[hi]=कनेक्शन हैंडल करने के लिए प्रक्रिया काल नहीं कर सका
+Comment[hne]=कनेक्सन हेंडल करे बर काम काल नइ कर सकिस
 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
@@ -184,6 +285,7 @@ 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
@@ -194,15 +296,19 @@ 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[sk]=Nepodarilo sa spustiť proces na spracovanie pripojenia
 Comment[sl]=Ni možno poklicati procesa za upravljanje s povezavo
+Comment[sr]=Нисам могао да позовем процес да опслужи везу
+Comment[sr@ijekavian]=Нисам могао да позовем процес да опслужи везу
+Comment[sr@ijekavianlatin]=Nisam mogao da pozovem proces da opsluži vezu
+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[x-test]=xxCould not call process to handle connectionxx
 Comment[zh_CN]=无法调用进程处理连接
 Comment[zh_HK]=無法呼叫處理連線的程序
 Comment[zh_TW]=無法呼叫行程來處理此連線

kinetd/kinetdmodule.desktop

@@ -4,15 +4,19 @@
 Type=ServiceType
 X-KDE-ServiceType=KInetDModule
 Name=KInetD Module Type
+Name[ar]=KInetD نوع الوحدة
+Name[ast]=Triba de módulu KInetD
 Name[bg]=Модул на KInetD
 Name[bn]=কে-আইনেট-ডি মডিউল ধরন
 Name[br]=Seurt ar mollad KInetD
 Name[ca]=Tipus de mòdul del KInetD
+Name[ca@valencia]=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[el]=Τύπος αρθρώματος KInetD
+Name[en_GB]=KInetD Module Type
 Name[eo]=KInetD modulotipo
 Name[es]=Tipo de módulo KInetD
 Name[et]=KInetD mooduli tüüp
@@ -24,10 +28,11 @@ Name[ga]=Cineál Modúil KInetD
 Name[gl]=Tipo de módulo KInetD
 Name[he]=סוג מודול של KInetD
 Name[hi]=के-इनिट-डी मॉड्यूल प्रकार
+Name[hne]=के-इनिट-डी माड्यूल किसम
 Name[hr]=Tip KInetD Modula
 Name[hu]=KInetD modultípus
 Name[is]=KInetD Module tegund
-Name[it]=Tipo modulo KInetD
+Name[it]=Tipo di modulo KInetD
 Name[ja]=KInetD モジュールタイプ
 Name[kk]=KInetD модулі
 Name[km]=ប្រភេទ​ម៉ូលឌុល KInetD
@@ -35,12 +40,14 @@ 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
 Name[ne]=KInetD मोड्युल प्रकार
 Name[nl]=KInetD-moduletype
 Name[nn]=KInetD-programtilleggstype
+Name[pa]=KInetD ਮੋਡੀਊਲ ਟਾਈਪ
 Name[pl]=Typ modułu KInetD
 Name[pt]=Tipo de Módulo do KInetD
 Name[pt_BR]=Módulo KInetD
@@ -49,14 +56,18 @@ Name[ru]=Модуль KInetD
 Name[se]=KInetD-moduvlašládja
 Name[sk]=Typ modulu KInetD
 Name[sl]=Vrsta modula KInetD
+Name[sr]=Врста модула КинетД‑а
+Name[sr@ijekavian]=Врста модула КинетД‑а
+Name[sr@ijekavianlatin]=Vrsta modula KInetD‑a
+Name[sr@latin]=Vrsta modula KInetD‑a
 Name[sv]=Kinetd-modultyp
 Name[ta]=KInetD கூறு வகை
 Name[tg]=Навъи Модули KInetD
 Name[tr]=KDED Modül Türü
 Name[uk]=Тип модулю KinetD
 Name[vi]=Kiểu môđun KInetD
-Name[x-test]=xxKInetD Module Typexx
 Name[xh]=Udidi Lomqongo womlinganiselo we KInetD
+Name[x-test]=xxKInetD Module Typexx
 Name[zh_CN]=KInetD 模块类型
 Name[zh_HK]=KInetD 模組類型
 Name[zh_TW]=KInetD 模組類型

krfb-framebuffer.desktop

@@ -0,0 +1,42 @@
+[Desktop Entry]
+Type=ServiceType
+X-KDE-ServiceType=krfb/framebuffer
+
+Comment=Frame Buffer plugins for KRfb
+Comment[ast]=Complementu de buffer pa KRfb
+Comment[ca]=Connectors de «framebuffer» per al KRfb.
+Comment[ca@valencia]=Connectors de «framebuffer» per al KRfb.
+Comment[da]=Framebuffer-plugins til KRfb
+Comment[de]=Framebuffer-Module für KRfb
+Comment[en_GB]=Frame Buffer plugins for KRfb
+Comment[es]=Complemento de buffer para KRfb
+Comment[et]=KRfb kaadripuhvri plugin
+Comment[fi]=Kehyspuskuriliitännäinen kohteelle KRfb
+Comment[fr]=Modules de sortie vidéo pour KRfb
+Comment[gl]=Engadido de frame buffer para KRfb
+Comment[hr]=Priključci za međuspremnike okvira za KRfb
+Comment[hu]=Keretpuffer-modulok a KRfb-hez
+Comment[it]=Estensioni del framebuffer per KRfb
+Comment[km]=កម្មវិធី​ជំនួយ​ Frame Buffer សម្រាប់ KRfb
+Comment[ko]=KRfb 프레임버퍼 플러그인
+Comment[lv]=Kadru bufera sprudņi priekš KRfb
+Comment[nb]=Rammebuffer-programtillegg for KRfb
+Comment[nds]=Bildpuffer-Modulen för KRfb
+Comment[nl]=Framebuffer-plugins voor KRfb
+Comment[nn]=Framebuffer-tillegg KRfb
+Comment[pa]=KRfb ਲਈ ਫਰੇਮ ਬਫ਼ਰ ਪਲੱਗਇਨ
+Comment[pt]='Plugins' de 'framebuffers' para o KRfb
+Comment[pt_BR]=Plug-ins de framebuffers para o KRfb
+Comment[ru]=Модуль буфера кадров для KRfb
+Comment[sk]=Frame Buffer modul pre KRfb
+Comment[sl]=Vstavki slikovnih medpomnilnikov za KRFB
+Comment[sr]=Прикључци кадробафера за КРФБ
+Comment[sr@ijekavian]=Прикључци кадробафера за КРФБ
+Comment[sr@ijekavianlatin]=Priključci kadrobafera za KRFB
+Comment[sr@latin]=Priključci kadrobafera za KRFB
+Comment[sv]=Insticksprogram med rambuffert för Krfb
+Comment[tr]=KRfb için Çerçeve Tamponu eklentileri
+Comment[uk]=Додатки буфера кадрів для KRfb
+Comment[x-test]=xxFrame Buffer plugins for KRfbxx
+Comment[zh_CN]=KRfb 帧缓冲插件
+Comment[zh_TW]=KRfb 的 Frame Buffer 外掛程式

krfb.desktop

@@ -6,40 +6,104 @@ Icon=krfb
 X-DocPath=krfb/index.html
 Terminal=false
 Name=Krfb
+Name[ar]=Krfb
+Name[ast]=Krfb
+Name[bg]=Krfb
 Name[bn]=কে-আর-এফ-বি
+Name[br]=Krfb
+Name[ca]=Krfb
+Name[ca@valencia]=Krfb
+Name[cs]=Krfb
+Name[da]=Krfb
+Name[de]=Krfb
+Name[el]=Krfb
+Name[en_GB]=Krfb
+Name[eo]=Krfb
+Name[es]=Krfb
+Name[et]=Krfb
+Name[eu]=Krfb
+Name[fi]=Krfb
+Name[fr]=Krfb
+Name[ga]=Krfb
+Name[gl]=Krfb
+Name[he]=Krfb
 Name[hi]=केआरएफबी
+Name[hne]=केआरएफबी
+Name[hr]=Krfb
+Name[hu]=Krfb
+Name[is]=Krfb
+Name[it]=Krfb
+Name[ja]=Krfb
+Name[kk]=Krfb
+Name[km]=Krfb
+Name[ko]=Krfb
+Name[lt]=Krfb
+Name[lv]=Krfb
+Name[ml]=കെആര്‍എഫ്ബി
+Name[nb]=Krfb
+Name[nds]=KRfb
+Name[ne]=Krfb
+Name[nl]=Krfb
+Name[nn]=Krfb
+Name[pa]=Krfb
+Name[pl]=Krfb
+Name[pt]=Krfb
+Name[pt_BR]=Krfb
+Name[ro]=Krfb
+Name[ru]=Krfb
+Name[sk]=Krfb
+Name[sl]=Krfb
+Name[sr]=КРФБ
+Name[sr@ijekavian]=КРФБ
+Name[sr@ijekavianlatin]=KRFB
+Name[sr@latin]=KRFB
+Name[sv]=Krfb
+Name[tr]=Krfb
+Name[uk]=Krfb
+Name[uz]=Krfb
+Name[uz@cyrillic]=Krfb
+Name[vi]=Krfb
 Name[x-test]=xxKrfbxx
+Name[zh_CN]=Krfb
+Name[zh_HK]=Krfb
 Name[zh_TW]=Krfb 桌面分享
 GenericName=Desktop Sharing
+GenericName[ar]=مشاركة سطح المكتب
+GenericName[ast]=Escritoriu compartíu
 GenericName[bg]=Споделяне на работното място
 GenericName[bn]=ডেস্কটপ ভাগাভাগি
 GenericName[br]=Rannañ ar vurev
 GenericName[ca]=Compartició de l'escriptori
+GenericName[ca@valencia]=Compartició de l'escriptori
 GenericName[cs]=Sdílení pracovní plochy
 GenericName[cy]=Rhannu Penbwrdd
 GenericName[da]=Desktopdeling
 GenericName[de]=Arbeitsfläche freigeben
 GenericName[el]=Κοινή χρήση επιφάνειας εργασίας
+GenericName[en_GB]=Desktop Sharing
 GenericName[eo]=Tabula komunigado
 GenericName[es]=Escritorio compartido
 GenericName[et]=Töölaua jagamine
-GenericName[eu]=Mahaigain partekatzea
+GenericName[eu]=Mahaigaina partekatzea
 GenericName[fa]=اشتراک رومیزی
 GenericName[fi]=Työpöydän jakaminen
 GenericName[fr]=Partage de bureau
 GenericName[ga]=Roinnt Deisce
-GenericName[gl]=Compartilla de escritorio
+GenericName[gl]=Compartimento de escritorio
 GenericName[he]=שיתוף שולחנות עבודה
 GenericName[hi]=डेस्कटॉप साझेदारी
+GenericName[hne]=डेस्कटाप साझेदारी
+GenericName[hr]=Dijeljenje radne površine
 GenericName[hu]=Munkaasztal-megosztás
 GenericName[is]=Skjáborðsmiðlun
-GenericName[it]=Condivisione desktop
+GenericName[it]=Condivisione del 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]=डेस्कटप साझेदारी
@@ -48,11 +112,15 @@ GenericName[nn]=Skrivebordsdeling
 GenericName[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ
 GenericName[pl]=Współdzielenie pulpitu
 GenericName[pt]=Partilha do Ecrã
-GenericName[pt_BR]=Compartilhamento de Ambiente de Trabalho
+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@ijekavian]=Дијељење површи
+GenericName[sr@ijekavianlatin]=Dijeljenje površi
+GenericName[sr@latin]=Deljenje površi
 GenericName[sv]=Dela ut skrivbordet
 GenericName[tr]=Masaüstü Paylaşımı
 GenericName[uk]=Спільні стільниці
@@ -63,4 +131,4 @@ GenericName[x-test]=xxDesktop Sharingxx
 GenericName[zh_CN]=桌面共享
 GenericName[zh_HK]=桌面分享
 GenericName[zh_TW]=桌面分享
-Categories=Qt;KDE;System;RemoteAccess;Network;
+Categories=Qt;KDE;System;Network;RemoteAccess;

krfb.kcfg

@@ -34,4 +34,10 @@
       <label>Password for uninvited connections.</label>
     </entry>
   </group>
+  <group name="FrameBuffer">
+    <entry name="preferredFrameBufferPlugin" type="String">
+      <label>Preferred Frame Buffer Plugin</label>
+      <default>krfb_framebuffer_x11</default>
+    </entry>
+  </group>
 </kcfg>

krfbserver.cpp

@@ -29,6 +29,7 @@
 
 #include "connectioncontroller.h"
 #include "framebuffer.h"
+#include "framebuffermanager.h"
 #include "krfbconfig.h"
 #include "invitationmanager.h"
 
@@ -117,9 +118,9 @@ static void clipboardHook(char* str,int len, rfbClientPtr cl)
 class KrfbServer::KrfbServerP {
 
     public:
-        KrfbServerP() : fb(0), screen(0), numClients(0) {};
+        KrfbServerP() : screen(0), numClients(0) {};
 
-        FrameBuffer *fb;
+        QSharedPointer<FrameBuffer> fb;
         QList< QPointer<ConnectionController> > controllers;
         rfbScreenInfoPtr screen;
         int numClients;
@@ -144,7 +145,7 @@ KrfbServer::KrfbServer()
     :d(new KrfbServerP)
 {
     kDebug() << "starting ";
-    d->fb = FrameBuffer::getFrameBuffer(QApplication::desktop()->winId(), this);
+    d->fb = FrameBufferManager::instance()->frameBuffer(QApplication::desktop()->winId());
     QTimer::singleShot(0, this, SLOT(startListening()));
     connect(InvitationManager::self(), SIGNAL(invitationNumChanged(int)),SLOT(updatePassword()));
 }
@@ -164,9 +165,14 @@ void KrfbServer::startListening()
     int w = d->fb->width();
     int h = d->fb->height();
     int depth = d->fb->depth();
+    
+    int bpp = depth >> 3;
+    if (bpp != 1 && bpp != 2 && bpp != 4) bpp = 4;
+    kDebug() << "bpp: " << bpp;
 
     rfbLogEnable(0);
-    screen = rfbGetScreen(0, 0, w, h, 8, 3,depth / 8);
+    screen = rfbGetScreen(0, 0, w, h, 8, 3, bpp);
+    
     screen->paddedWidthInBytes = d->fb->paddedWidth();
 
     d->fb->getServerFormat(screen->serverFormat);
@@ -232,8 +238,7 @@ void KrfbServer::shutdown()
 {
     rfbShutdownServer(d->screen, true);
     // framebuffer has to be deleted before X11 connection goes down
-    delete d->fb;
-    d->fb = 0;
+    d->fb.clear();
 }
 
 
@@ -241,7 +246,9 @@ void KrfbServer::enableDesktopControl(bool enable)
 {
     foreach (QPointer<ConnectionController> ptr, d->controllers) {
         if (ptr) {
-            ptr->setControlEnabled(enable);
+            if (ptr->controlCanBeEnabled()) {
+                ptr->setControlEnabled(enable);
+            }
         }
     }
 }
@@ -254,6 +261,7 @@ enum rfbNewClientAction KrfbServer::handleNewClient(struct _rfbClientRec * cl)
 
     d->controllers.append(cc);
     cc->setControlEnabled(KrfbConfig::allowDesktopControl());
+    cc->setControlCanBeEnabled(KrfbConfig::allowDesktopControl());
 
     connect(cc, SIGNAL(sessionEstablished(QString)), SIGNAL(sessionEstablished(QString)));
     connect(cc, SIGNAL(clientDisconnected(ConnectionController *)),SLOT(clientDisconnected(ConnectionController *)));
@@ -304,8 +312,11 @@ void KrfbServer::clientDisconnected(ConnectionController *cc)
     kDebug() << "clients--: " << d->numClients;
     if (!--d->numClients) {
         d->fb->stopMonitor();
+        kDebug() << "stopMonitor: d->numClients = " << d->numClients;
     }
-    disconnect(cc, SIGNAL(clientDisconnected(ConnectionController)),this, SLOT(clientDisconnected(ConnectionController)));
+    disconnect(cc, SIGNAL(clientDisconnected(ConnectionController*)),this, SLOT(clientDisconnected(ConnectionController*)));
+
+    Q_EMIT sessionFinished();
 }
 
 

main.cpp

@@ -74,12 +74,18 @@ int main(int argc, char *argv[])
 			    ki18n("KDesktop background deactivation"));
 	KCmdLineArgs::init(argc, argv, &aboutData);
 
+	KCmdLineOptions options;
+	options.add("nodialog", ki18n("Do not show the invitations management dialog at startup"));
+	KCmdLineArgs::addCmdLineOptions(options);
+
 	KApplication app;
         app.setQuitOnLastWindowClosed(false);
 
-    ManageInvitationsDialog invitationsDialog;
-    invitationsDialog.show();
-    TrayIcon trayicon(&invitationsDialog);
+
+	ManageInvitationsDialog invitationsDialog;
+	if ( KCmdLineArgs::parsedArgs()->isSet("dialog") )
+	    invitationsDialog.show();
+	TrayIcon trayicon(&invitationsDialog);
 
 	KrfbServer *server = KrfbServer::self(); // initialize the server manager
     if (!server->checkX11Capabilities()) {

manageinvitations.ui

@@ -12,9 +12,6 @@
   <property name="windowTitle" >
    <string>Manage Invitations - Desktop Sharing</string>
   </property>
-  <property name="windowIcon" >
-   <iconset/>
-  </property>
   <layout class="QGridLayout" >
    <item row="0" column="1" colspan="2" >
     <widget class="QLabel" name="TextLabel2" >
@@ -181,7 +178,6 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <tabstops>
   <tabstop>invitationWidget</tabstop>
   <tabstop>newPersonalInvitationButton</tabstop>

manageinvitationsdialog.cpp

@@ -28,6 +28,7 @@
 #include <KConfigDialog>
 #include <KMessageBox>
 #include <KToolInvocation>
+#include <KSystemTimeZone>
 
 // settings dialog
 #include "ui_configtcp.h"
@@ -131,7 +132,8 @@ void ManageInvitationsDialog::inviteByMail()
     foreach (const QNetworkInterface &nif, ifl) {
         if (nif.flags() & QNetworkInterface::IsLoopBack) continue;
         if (nif.flags() & QNetworkInterface::IsRunning) {
-            host = nif.addressEntries()[0].ip().toString();
+	    if(!nif.addressEntries().isEmpty())
+               host = nif.addressEntries()[0].ip().toString();
         }
     }
 
@@ -145,12 +147,13 @@ void ManageInvitationsDialog::inviteByMail()
                   "Otherwise you can use any VNC client with the following parameters:\n\n"
                   "Host: %2:%3\n"
                   "Password: %4\n\n"
-                  "For security reasons this invitation will expire at %5.")
+                  "For security reasons this invitation will expire at %5 (%6).")
             .subs(invUrl.url())
             .subs(host)
             .subs(QString::number(port))
             .subs(inv.password())
             .subs(KGlobal::locale()->formatDateTime(inv.expirationTime()))
+            .subs(KSystemTimeZones::local().name())
             .toString());
 
 }

personalinvitewidget.ui

@@ -200,9 +200,6 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <resources/>
+  <resources/>
  <connections/>
 </ui>

trayicon.cpp

@@ -24,19 +24,20 @@
 #include <kglobal.h>
 #include <kactioncollection.h>
 #include <kaboutapplicationdialog.h>
+#include <KNotification>
 
 #include "manageinvitationsdialog.h"
 #include "invitedialog.h"
 
 
 TrayIcon::TrayIcon(KDialog *d)
-  : KSystemTrayIcon(d),
+  : KStatusNotifierItem(d),
     quitting(false)
 {
-    setIcon(KIcon("krfb").pixmap(22, 22, KIcon::Disabled));
-
-    setToolTip(i18n("Desktop Sharing - disconnected"));
+    setIconByPixmap(KIcon("krfb").pixmap(22, 22, KIcon::Disabled));
 
+    setToolTipTitle(i18n("Desktop Sharing - disconnected"));
+    setCategory(KStatusNotifierItem::ApplicationStatus);
 // 	manageInvitationsAction = new KAction(i18n("Manage &Invitations"), &actionCollection);
 // 	actionCollection.addAction("manage_invitations", manageInvitationsAction);
 // 	connect(manageInvitationsAction, SIGNAL(triggered(bool)), SLOT(showManageInvitations()));
@@ -54,7 +55,6 @@ TrayIcon::TrayIcon(KDialog *d)
     contextMenu()->addSeparator();
     contextMenu()->addAction(KStandardAction::aboutApp(this, SLOT(showAbout()), actionCollection()));
 
-    show();
 }
 
 TrayIcon::~TrayIcon()
@@ -74,12 +74,13 @@ void TrayIcon::prepareQuit()
 void TrayIcon::showConnectedMessage(const QString &host)
 {
 
-    setIcon(KIcon("krfb"));
-    KPassivePopup::message(i18n("Desktop Sharing"),
-                           i18n("The remote user has been authenticated and is now connected."),
-                           KIcon("krfb").pixmap(22, 22),
-                           this);
-    setToolTip(i18n("Desktop Sharing - connected with %1", host));
+    setIconByPixmap(KIcon("krfb"));
+    KNotification::event("UserAcceptsConnection",
+                           i18n("The remote user %1 is now connected.",
+                                host));
+    setToolTipTitle(i18n("Desktop Sharing - connected with %1", host));
+
+    setStatus(KStatusNotifierItem::Active);
 }
 
 void TrayIcon::showDisconnectedMessage()
@@ -87,13 +88,13 @@ void TrayIcon::showDisconnectedMessage()
     if (quitting)
         return;
 
-    setToolTip(i18n("Desktop Sharing - disconnected"));
-    setIcon(KIcon("krfb").pixmap(22, 22, KIcon::Disabled));
-    KPassivePopup *p = KPassivePopup::message(i18n("Desktop Sharing"),
-                                              i18n("The remote user has closed the connection."),
-                                              KIcon("krfb").pixmap(22, 22, KIcon::Disabled),
-                                              this);
-    connect(p, SIGNAL(hidden()), this, SIGNAL(diconnectedMessageDisplayed()));
+    setToolTipTitle(i18n("Desktop Sharing - disconnected"));
+    setIconByPixmap(KIcon("krfb").pixmap(22, 22, KIcon::Disabled));
+    KNotification::event("ConnectionClosed", i18n("The remote user has closed the connection."));
+
+    setStatus(KStatusNotifierItem::Passive);
+
+    Q_EMIT disconnectedMessageDisplayed();
 }
 
 void TrayIcon::setDesktopControlSetting(bool b)

trayicon.h

@@ -18,10 +18,10 @@
 #ifndef TRAYICON_H
 #define TRAYICON_H
 
-#include <ksystemtrayicon.h>
 #include <kpassivepopup.h>
 #include <KActionCollection>
 #include <KToggleAction>
+#include <kstatusnotifieritem.h>
 
 class KDialog;
 
@@ -30,7 +30,7 @@ class KDialog;
   * @author Tim Jansen
   */
 
-class TrayIcon : public KSystemTrayIcon {
+class TrayIcon : public KStatusNotifierItem {
    	Q_OBJECT
 public:
 	TrayIcon(KDialog*);
@@ -38,7 +38,7 @@ public:
 
 signals:
 
-	void diconnectedMessageDisplayed();
+        void disconnectedMessageDisplayed();
 	void enableDesktopControl(bool);
     void quitApp();