← 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/0002-Click-on-folder-show-folder.-Click-on-server-show-mai.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/0002-Click-on-folder-show-folder.-Click-on-server-show-mai.diff
1
 
From 7fc68d43d2d6d04285217b2fe2d13fdef28d0d88 Mon Sep 17 00:00:00 2001
 
1
From 2ccae3d9d2ac947a3883cc719a5d4ea456fe5c88 Mon Sep 17 00:00:00 2001
2
2
From: Aurelien Gateau <aurelien.gateau@canonical.com>
3
 
Date: Wed, 12 Aug 2009 19:00:52 +0200
 
3
Date: Wed, 16 Sep 2009 11:35:47 +0200
4
4
Subject: [PATCH 2/5] Click on folder: show folder. Click on server: show mainwindow.
5
5
 
6
6
---
11
11
 4 files changed, 30 insertions(+), 0 deletions(-)
12
12
 
13
13
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
14
 
index cc8c403..7efd11e 100644
 
14
index ad3d32f..2905012 100644
15
15
--- a/kmail/kmfolder.cpp
16
16
+++ b/kmail/kmfolder.cpp
17
17
@@ -928,6 +928,8 @@ void KMFolder::setIgnoreNewMail( bool b )
18
18
     mIndicator = 0;
19
19
   } else if ( !b && !mIndicator ) {
20
20
     mIndicator = new QIndicate::Indicator( this );
21
 
+    connect( mIndicator, SIGNAL( display() ),
 
21
+    connect( mIndicator, SIGNAL( display( QIndicate::Indicator* ) ),
22
22
+      SLOT( slotIndicatorClicked() ) );
23
23
     connect( mStorage, SIGNAL( numUnreadMsgsChanged( KMFolder* ) ),
24
24
       SLOT( updateIndicator() ) );
50
50
   FolderStorage* mStorage;
51
51
   KMFolderDir* mChild;
52
52
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
53
 
index c5ff868..01b7ec7 100644
 
53
index 3d271cd..53d585c 100644
54
54
--- a/kmail/kmkernel.cpp
55
55
+++ b/kmail/kmkernel.cpp
56
 
@@ -1456,6 +1456,8 @@ void KMKernel::init()
 
56
@@ -1471,6 +1471,8 @@ void KMKernel::init()
57
57
   } else {
58
58
     kWarning() << "Could not find desktop file for application";
59
59
   }
62
62
   the_indicateServer->show();
63
63
 
64
64
   the_undoStack     = new UndoStack(20);
65
 
@@ -2120,6 +2122,13 @@ KMainWindow* KMKernel::mainWin()
 
65
@@ -2133,6 +2135,13 @@ KMainWindow* KMKernel::mainWin()
66
66
   return mWin;
67
67
 }
68
68
 
76
76
 
77
77
 /**
78
78
  * Empties all trash folders
79
 
@@ -2183,6 +2192,11 @@ void KMKernel::selectFolder( const QString &folderPath )
 
79
@@ -2196,6 +2205,11 @@ void KMKernel::selectFolder( const QString &folderPath )
80
80
   if ( !folder )
81
81
     folder = kmkernel->dimapFolderMgr()->getFolderByURL( folderPath );
82
82