[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=0211a4d

The following commit has been merged in the master branch:
commit 0211a4da379e1bb96ef79221f108806d1d676115
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Feb 9 01:16:55 2013 +0000

    Remove broken option to chose between whether new incoming chats open in the most recently used window or the first created window.
    
    The code to differentiate between the two options was never written, so having an option is wrong.
    
    REVIEW: 107204
---
 app/telepathy-chat-ui.cpp  |  5 ++---
 config/behavior-config.cpp |  6 ------
 config/behavior-config.ui  | 14 ++------------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/app/telepathy-chat-ui.cpp b/app/telepathy-chat-ui.cpp
index 9aabe10..9202108 100644
--- a/app/telepathy-chat-ui.cpp
+++ b/app/telepathy-chat-ui.cpp
@@ -50,12 +50,11 @@ TelepathyChatUi::TelepathyChatUi(const Tp::AccountManagerPtr &accountManager)
 
     // load the settings for new tab "open mode"
     QString mode = tabConfig.readEntry("tabOpenMode", "FirstWindow");
+    m_openMode = FirstWindow;
     if (mode == QLatin1String("NewWindow")) {
         m_openMode = NewWindow;
     } else if (mode == QLatin1String("FirstWindow")) {
         m_openMode = FirstWindow;
-    } else if (mode == QLatin1String("LastWindow")) {
-        m_openMode = LastWindow;
     }
 }
 
@@ -155,13 +154,13 @@ void TelepathyChatUi::handleChannels(const Tp::MethodInvocationContextPtr<> & co
     }
 
     //if there is currently no tab containing the incoming channel.
+
     if (!tabFound) {
         ChatWindow* window = 0;
         switch (m_openMode) {
             case FirstWindow:
                 window = m_chatWindows.count()?m_chatWindows[0]:createWindow();
                 break;
-            case LastWindow:
             case NewWindow:
                 window = createWindow();
                 break;
diff --git a/config/behavior-config.cpp b/config/behavior-config.cpp
index f2bfe76..214ee3e 100644
--- a/config/behavior-config.cpp
+++ b/config/behavior-config.cpp
@@ -40,7 +40,6 @@ BehaviorConfig::BehaviorConfig(QWidget *parent, const QVariantList& args)
 
     ui->setupUi(this);
 
-    ui->newTabButtonGroup->setId(ui->radioLast, TelepathyChatUi::LastWindow);
     ui->newTabButtonGroup->setId(ui->radioNew, TelepathyChatUi::NewWindow);
     ui->newTabButtonGroup->setId(ui->radioZero, TelepathyChatUi::FirstWindow);
 
@@ -67,8 +66,6 @@ void BehaviorConfig::load()
         m_openMode = TelepathyChatUi::NewWindow;
     } else if (mode == QLatin1String("FirstWindow")) {
         m_openMode = TelepathyChatUi::FirstWindow;
-    } else if (mode == QLatin1String("LastWindow")) {
-        m_openMode = TelepathyChatUi::LastWindow;
     }
 
     m_scrollbackLength = tabConfig.readEntry("scrollbackLength", 4);
@@ -87,9 +84,6 @@ void BehaviorConfig::save()
         case TelepathyChatUi::FirstWindow :
             mode = QLatin1String("FirstWindow");
             break;
-        case TelepathyChatUi::LastWindow :
-            mode = QLatin1String("LastWindow");
-            break;
     }
 
     tabConfig.writeEntry("tabOpenMode", mode);
diff --git a/config/behavior-config.ui b/config/behavior-config.ui
index c2cdd7b..e7db444 100644
--- a/config/behavior-config.ui
+++ b/config/behavior-config.ui
@@ -20,7 +20,7 @@
       <item>
        <widget class="QLabel" name="label">
         <property name="text">
-         <string>Open new conversations in :</string>
+         <string>Open new conversations :</string>
         </property>
        </widget>
       </item>
@@ -37,17 +37,7 @@
       <item>
        <widget class="QRadioButton" name="radioZero">
         <property name="text">
-         <string>A new tab in the first window</string>
-        </property>
-        <attribute name="buttonGroup">
-         <string notr="true">newTabButtonGroup</string>
-        </attribute>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="radioLast">
-        <property name="text">
-         <string>A new tab in the last focused window</string>
+         <string>As tabs in the same window</string>
         </property>
         <attribute name="buttonGroup">
          <string notr="true">newTabButtonGroup</string>

-- 
ktp-text-ui packaging