[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=699dd98

The following commit has been merged in the master branch:
commit 699dd98bdb736a7d38cc4449766038a644507108
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Apr 11 17:29:11 2013 +0200

    Remove 'Share desktop' overlay button
    
    It got broken with porting to new models in 0.6, plus we don't want to
    have button for each possible tube.
    
    Reviewed-by: David Edmundson
    BUG: 314259
    FIXED-IN: 0.7
---
 contact-list-widget.cpp |  8 --------
 contact-overlays.cpp    | 14 +-------------
 contact-overlays.h      | 10 ----------
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 8c6edd7..769648a 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -248,14 +248,12 @@ void ContactListWidget::addOverlayButtons()
     AudioChannelContactOverlay *audioOverlay = new AudioChannelContactOverlay(d->delegate);
     VideoChannelContactOverlay *videoOverlay = new VideoChannelContactOverlay(d->delegate);
     FileTransferContactOverlay *fileOverlay  = new FileTransferContactOverlay(d->delegate);
-    DesktopSharingContactOverlay *desktopOverlay = new DesktopSharingContactOverlay(d->delegate);
     LogViewerOverlay *logViewerOverlay = new LogViewerOverlay(d->delegate);
 
     d->delegate->installOverlay(textOverlay);
     d->delegate->installOverlay(audioOverlay);
     d->delegate->installOverlay(videoOverlay);
     d->delegate->installOverlay(fileOverlay);
-    d->delegate->installOverlay(desktopOverlay);
     d->delegate->installOverlay(logViewerOverlay);
 
     d->delegate->setViewOnAllOverlays(this);
@@ -280,9 +278,6 @@ void ContactListWidget::addOverlayButtons()
     connect(videoOverlay, SIGNAL(activated(Tp::AccountPtr, Tp::ContactPtr)),
             this, SLOT(startVideoChannel(Tp::AccountPtr, Tp::ContactPtr)));
 
-    connect(desktopOverlay, SIGNAL(activated(Tp::AccountPtr, Tp::ContactPtr)),
-            this, SLOT(startDesktopSharing(Tp::AccountPtr, Tp::ContactPtr)));
-
     connect(logViewerOverlay, SIGNAL(activated(Tp::AccountPtr,Tp::ContactPtr)),
             this, SLOT(startLogViewer(Tp::AccountPtr, Tp::ContactPtr)));
 
@@ -299,9 +294,6 @@ void ContactListWidget::addOverlayButtons()
             fileOverlay, SLOT(setActive(bool)));
 
     connect(this, SIGNAL(enableOverlays(bool)),
-            desktopOverlay, SLOT(setActive(bool)));
-
-    connect(this, SIGNAL(enableOverlays(bool)),
             logViewerOverlay, SLOT(setActive(bool)));
 }
 
diff --git a/contact-overlays.cpp b/contact-overlays.cpp
index 0caefc5..7bd9c1c 100644
--- a/contact-overlays.cpp
+++ b/contact-overlays.cpp
@@ -175,18 +175,6 @@ FileTransferContactOverlay::FileTransferContactOverlay(QObject *parent)
 {
 }
 
-// -------------------------------------------------------------------------
-
-DesktopSharingContactOverlay::DesktopSharingContactOverlay(QObject *parent)
-    : StartChannelContactOverlay(
-        parent,
-        KGuiItem(i18n("Share My Desktop"), "krfb",
-                 i18n("Share My Desktop"), i18n("Share desktop using RFB")),
-        -1, //FIXME: the share desktop is now part of ContactTubesRole, not returning bool anymore, needs porting
-        IconSize(KIconLoader::Dialog) + spacing * 6 + IconSize(KIconLoader::Small) * 4)
-{
-}
-
 //-------------------------------------------------------------------------
 
 LogViewerOverlay::LogViewerOverlay(QObject* parent)
@@ -195,7 +183,7 @@ LogViewerOverlay::LogViewerOverlay(QObject* parent)
         KGuiItem(i18n("Open Log Viewer"), "documentation",
                  i18n("Open Log Viewer"), i18n("Show conversation logs")),
         Qt::DisplayRole, /* Always display the logviewer action */
-        IconSize(KIconLoader::Dialog) + spacing * 7 + IconSize(KIconLoader::Small) * 5)
+        IconSize(KIconLoader::Dialog) + spacing * 6 + IconSize(KIconLoader::Small) * 4)
 {
 }
 
diff --git a/contact-overlays.h b/contact-overlays.h
index 855f54e..cd9b5cb 100644
--- a/contact-overlays.h
+++ b/contact-overlays.h
@@ -102,16 +102,6 @@ public:
 
 // ---------------------------------------------------------------------
 
-class DesktopSharingContactOverlay : public StartChannelContactOverlay
-{
-    Q_OBJECT
-
-public:
-    DesktopSharingContactOverlay(QObject *parent);
-};
-
-// ---------------------------------------------------------------------
-
 class LogViewerOverlay: public StartChannelContactOverlay
 {
     Q_OBJECT

-- 
ktp-contact-list packaging