← Back to branch summary

~ubuntu-branches/ubuntu/wily/psi/wily

« back to all changes in this revision

Viewing changes to src/psitrayicon.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2008-08-28 18:46:52 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080828184652-iiik12dl91nq7cdi
Tags: 0.12-2
http://bugs.debian.org/494352
Uploading to unstable (Closes: Bug#494352)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/psitrayicon.cpp
6
6
#include "psitrayicon.h"
7
7
#include "trayicon.h"
8
8
#include "iconset.h"
9
 
#include "common.h" // options
10
9
#include "alerticon.h"
 
10
#include "psioptions.h"
11
11
 
12
12
// TODO: remove the QPoint parameter from the signals when we finally move
13
13
// to the new system.
212
212
                if ( !icon_ )
213
213
                        return;
214
214
 
215
 
                QString cachedName = "PsiTray/" + option.defaultRosterIconset + "/" + icon_->name() + "/" + QString::number( icon_->frameNumber() );
 
215
                QString cachedName = "PsiTray/" + PsiOptions::instance()->getOption("options.iconsets.status").toString() + "/" + icon_->name() + "/" + QString::number( icon_->frameNumber() );
216
216
 
217
217
                QPixmap p;
218
218
                if ( !QPixmapCache::find(cachedName, p) ) {
229
229
                if ( !icon_ )
230
230
                        return;
231
231
 
232
 
                QString cachedName = "PsiTray/" + option.defaultRosterIconset + "/" + icon_->name() + "/" + QString::number( icon_->frameNumber() );
 
232
                QString cachedName = "PsiTray/" + PsiOptions::instance()->getOption("options.iconsets.status").toString() + "/" + icon_->name() + "/" + QString::number( icon_->frameNumber() );
233
233
 
234
234
                QPixmap p;
235
235
                if ( !QPixmapCache::find(cachedName, p) ) {