← 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/0004-Support-for-icon-in-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/0004-Support-for-icon-in-indicators.diff
1
 
From 2273456adf1499499a3a64e94b1d6318ea183bed Mon Sep 17 00:00:00 2001
 
1
From a05e4d0845f4cce6c09b8a8269967641c73f2b07 Mon Sep 17 00:00:00 2001
2
2
From: Aurelien Gateau <aurelien.gateau@canonical.com>
3
 
Date: Thu, 13 Aug 2009 17:07:24 +0200
 
3
Date: Wed, 16 Sep 2009 11:37:06 +0200
4
4
Subject: [PATCH 4/5] Support for icon in indicators.
5
5
 
6
6
This feature required duplicating code from FolderViewItem.
12
12
 2 files changed, 139 insertions(+), 4 deletions(-)
13
13
 
14
14
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
15
 
index 7efd11e..9310e30 100644
 
15
index 2905012..aa6ee1a 100644
16
16
--- a/kmail/kmfolder.cpp
17
17
+++ b/kmail/kmfolder.cpp
18
18
@@ -932,11 +932,10 @@ void KMFolder::setIgnoreNewMail( bool b )
21
21
       SLOT( updateIndicator() ) );
22
22
-    QImage image( mUnreadIconPath );
23
23
-    if ( !image.isNull() ) {
24
 
-      mIndicator->setProperty( "icon", image );
 
24
-      mIndicator->setIconProperty( image );
25
25
-    }
26
26
+    connect( this, SIGNAL( iconsChanged() ),
27
27
+      SLOT( updateIndicatorIcon() ) );
165
165
+  if ( pix.isNull() ) {
166
166
+    kWarning() << "Could not read image from" << icon;
167
167
+  } else {
168
 
+    mIndicator->setProperty( "icon", pix.toImage() );
 
168
+    mIndicator->setIconProperty( pix.toImage() );
169
169
+  }
170
170
+}
171
171
+