← Back to branch summary

~ubuntu-branches/ubuntu/karmic/kdepim/karmic-backports

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu-message-indicator/0005-Configuration-option-to-enable-disable-indicators.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas, Jonathan Thomas, Jonathan Riddell
  • Date: 2009-09-14 17:50:51 UTC
  • Revision ID: james.westby@ubuntu.com-20090914175051-fouzg40tmwz2a1py
Tags: 4:4.3.1-0ubuntu3
https://launchpad.net/bugs/222144
[ Jonathan Thomas ]
* Update message indicator patches for libindicate 0.2 from 
  http://people.canonical.com/~agateau/indicate/index.html

[ Jonathan Riddell ]
* Add kubuntu_03_restore_bcc_on_resend.diff to make KMail include the BCC
  addresses while resending a message (BKO: #176590, LP: #222144)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu-message-indicator/0005-Configuration-option-to-enable-disable-indicators.diff
1
 
From 9dbceb05e1140fa1da2eb213858d879e30b29d99 Mon Sep 17 00:00:00 2001
 
1
From 0dc68e5588f8270fada52e4993ac68203901a744 Mon Sep 17 00:00:00 2001
2
2
From: Aurelien Gateau <aurelien.gateau@canonical.com>
3
 
Date: Fri, 14 Aug 2009 19:35:51 +0200
 
3
Date: Wed, 16 Sep 2009 11:42:09 +0200
4
4
Subject: [PATCH 5/5] Configuration option to enable/disable indicators
5
5
 
6
6
---
12
12
 5 files changed, 26 insertions(+), 2 deletions(-)
13
13
 
14
14
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
15
 
index f8e98c1..73525bb 100644
 
15
index 2e7f61c..d6d6872 100644
16
16
--- a/kmail/configuredialog.cpp
17
17
+++ b/kmail/configuredialog.cpp
18
18
@@ -863,6 +863,14 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( QWidget * parent )
55
55
   general.writeEntry( "checkmail-startup", mCheckmailStartupCheck->isChecked() );
56
56
 
57
57
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
58
 
index f177e40..f3e2867 100644
 
58
index 2f7e2f3..63ca229 100644
59
59
--- a/kmail/configuredialog_p.h
60
60
+++ b/kmail/configuredialog_p.h
61
61
@@ -342,6 +342,7 @@ private:
67
67
   QPushButton   *mOtherNewMailActionsButton;
68
68
 
69
69
diff --git a/kmail/kmail.kcfg.cmake b/kmail/kmail.kcfg.cmake
70
 
index d860c55..df73757 100644
 
70
index dc2643b..3be899f 100644
71
71
--- a/kmail/kmail.kcfg.cmake
72
72
+++ b/kmail/kmail.kcfg.cmake
73
73
@@ -122,6 +122,11 @@
83
83
         <label>Specify e&amp;ditor:</label>
84
84
         <default>kwrite %f</default>
85
85
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
86
 
index 9310e30..ddfb714 100644
 
86
index aa6ee1a..ef09b43 100644
87
87
--- a/kmail/kmfolder.cpp
88
88
+++ b/kmail/kmfolder.cpp
89
89
@@ -32,6 +32,7 @@
109
109
   int count = mStorage->countUnread();
110
110
-  if ( count > 0 ) {
111
111
+  if ( count > 0 && GlobalSettings::useMessageIndicator() ) {
112
 
     QString text = QString( "%1 (%2)" ).arg( label() ).arg( count );
113
 
     mIndicator->setProperty( "sender", text );
 
112
     mIndicator->setNameProperty( label() );
 
113
     mIndicator->setCountProperty( count );
114
114
     mIndicator->show();
115
115
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
116
 
index 176b045..fdb6f42 100644
 
116
index 78c7e39..96e1731 100644
117
117
--- a/kmail/kmkernel.cpp
118
118
+++ b/kmail/kmkernel.cpp
119
 
@@ -1458,7 +1458,6 @@ void KMKernel::init()
 
119
@@ -1473,7 +1473,6 @@ void KMKernel::init()
120
120
   }
121
121
   connect( the_indicateServer, SIGNAL( serverDisplay() ),
122
122
            SLOT( activateMainWin() ) );
124
124
 
125
125
   the_undoStack     = new UndoStack(20);
126
126
   the_folderMgr     = new KMFolderMgr(foldersPath);
127
 
@@ -1516,6 +1515,11 @@ void KMKernel::init()
 
127
@@ -1531,6 +1530,11 @@ void KMKernel::init()
128
128
 
129
129
 void KMKernel::readConfig()
130
130
 {