[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=3e00779

The following commit has been merged in the master branch:
commit 3e007797db9d62c7a614e01dd7346cd96115d4c0
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed May 7 23:35:07 2014 +0200

    Fix ColumnResizer with layout changes
---
 config/telepathy-kded-config.cpp | 4 ++--
 config/telepathy-kded-config.ui  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/telepathy-kded-config.cpp b/config/telepathy-kded-config.cpp
index baaceff..a4b890c 100644
--- a/config/telepathy-kded-config.cpp
+++ b/config/telepathy-kded-config.cpp
@@ -70,8 +70,8 @@ TelepathyKDEDConfig::TelepathyKDEDConfig(QWidget *parent, const QVariantList& ar
     resizer->addWidgetsFromLayout(ui->incomingFilesGroupBox->layout(), 0);
     resizer->addWidgetsFromLayout(ui->autoAwayGroupBox->layout(), 0);
     resizer->addWidgetsFromLayout(ui->nowPlayingGroupBox->layout(), 0);
-    resizer->addWidgetsFromLayout(ui->autoConnectGroupBox->layout(), 0);
-    resizer->addWidgetsFromLayout(ui->autoOfflineGroupBox->layout(), 0);
+    resizer->addWidgetsFromLayout(ui->presenceGroupBox->layout(), 0);
+
 
     //TODO enable this when it is supported by the approver
     ui->m_autoAcceptCheckBox->setHidden(true);
diff --git a/config/telepathy-kded-config.ui b/config/telepathy-kded-config.ui
index 913bb5b..93c06dc 100644
--- a/config/telepathy-kded-config.ui
+++ b/config/telepathy-kded-config.ui
@@ -30,7 +30,7 @@
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
-        <widget class="QFrame" name="frame">
+        <widget class="QFrame" name="presenceGroupBox">
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>

-- 
ktp-kded-integration-module packaging