[SCM] charmtimetracker packaging branch, master, updated. upstream/1.10.0-9-gcb9301d

[Sandro Knauß]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/charmtimetracker.git;a=commitdiff;h=cb9301d

The following commit has been merged in the master branch:
commit cb9301d8e37350c525d00a1cceaf42e354784c8d
Author: Sandro Knauß <mail at sandroknauss.de>
Date:   Thu Oct 15 19:20:08 2015 +0200

    do not show reset button, if it is not working
---
 debian/patches/reset_button.patch | 13 +++++++++++++
 debian/patches/series             |  1 +
 2 files changed, 14 insertions(+)

diff --git a/debian/patches/reset_button.patch b/debian/patches/reset_button.patch
new file mode 100644
index 0000000..ede35e8
--- /dev/null
+++ b/debian/patches/reset_button.patch
@@ -0,0 +1,13 @@
+Index: charmtimetracker/Charm/Widgets/CharmPreferences.cpp
+===================================================================
+--- charmtimetracker.orig/Charm/Widgets/CharmPreferences.cpp	2015-10-06 15:25:00.001340812 +0200
++++ charmtimetracker/Charm/Widgets/CharmPreferences.cpp	2015-10-15 19:17:35.395175781 +0200
+@@ -46,6 +46,8 @@
+ 
+     m_ui.lbWarnUnuploadedTimesheets->setVisible( httpJobPossible );
+     m_ui.cbWarnUnuploadedTimesheets->setVisible( httpJobPossible );
++    m_ui.lbResetPassword.setVisible( httpJobPossible );
++    m_ui.pbResetPassword.setVisible( httpJobPossible );
+     m_ui.cbIdleDetection->setEnabled( haveIdleDetection );
+     m_ui.lbIdleDetection->setEnabled( haveIdleDetection );
+     m_ui.cbIdleDetection->setChecked( config.detectIdling && m_ui.cbIdleDetection->isEnabled() );
diff --git a/debian/patches/series b/debian/patches/series
index b54bd59..da57cd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 notinstall_license.txt.patch
 use_system_qtkeychain.patch
+reset_button.patch

-- 
charmtimetracker packaging