[SCM] Konversation packaging for Debian branch, master, updated. debian/1.3-beta1-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 1d6054d46f0ad1ccc8b9812663cef8ff859aadd9
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun May 23 00:22:47 2010 +0300

    Backport commit 1.3-beta1-2-gaa233e3 from upstream repository.
    
    Fixes close buttons on tabs (patch backport_aa233e3_close_buttons_fix.diff).
---
 debian/changelog                                   |    2 ++
 .../backport_aa233e3_close_buttons_fix.diff        |   18 ++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10212b9..d860fa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ konversation (1.3~beta1-1) UNRELEASED; urgency=low
   * Drop topgit support:
     - remove snippet from debian/rules;
     - rewrite debian/README.source.
+  * Backport commit 1.3-beta1-2-gaa233e3 from upstream repository to
+    fix close buttons on tabs (patch backport_aa233e3_close_buttons_fix.diff).
 
  -- Modestas Vainius <modax at debian.org>  Sat, 22 May 2010 22:45:28 +0300
 
diff --git a/debian/patches/backport_aa233e3_close_buttons_fix.diff b/debian/patches/backport_aa233e3_close_buttons_fix.diff
new file mode 100644
index 0000000..5283613
--- /dev/null
+++ b/debian/patches/backport_aa233e3_close_buttons_fix.diff
@@ -0,0 +1,18 @@
+From: Eike Hein <hein at kde.org>
+Subject: [PATCH] Fix close buttons on tabs preference not being respected for top/bottom tabs.
+Forwarded: not-needed
+Origin: backport, commit:aa233e3b66b675c62a03f1bce793e67b87b732b9
+Last-Update: 2010-05-22
+Applied-Upstream: 1.3-beta2
+
+--- a/src/viewer/viewcontainer.cpp
++++ b/src/viewer/viewcontainer.cpp
+@@ -409,7 +409,7 @@ void ViewContainer::updateTabWidgetAppea
+     else
+         m_tabWidget->cornerWidget()->hide();
+ 
+-    m_tabWidget->tabBar()->setTabsClosable(true);
++    m_tabWidget->tabBar()->setTabsClosable(Preferences::self()->closeButtons());
+ 
+     m_tabWidget->setAutomaticResizeTabs(Preferences::self()->useMaxSizedTabs());
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 67ce773..8c3aca6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 debian_dbug_autoreplace.diff
 debian_channel.diff
+backport_aa233e3_close_buttons_fix.diff

-- 
Konversation packaging for Debian