← Back to branch summary

~ubuntu-branches/ubuntu/feisty/psi/feisty

« back to all changes in this revision

Viewing changes to src/psiiconset.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Stephan Hermann
  • Date: 2005-09-14 16:33:49 UTC
  • mfrom: (2.1.1 sarge)
  • Revision ID: james.westby@ubuntu.com-20050914163349-3zacov4afysz5cw5
Tags: 0.9.3-2ubuntu1
* Sync with debian
* Applied patch to psi.desktop to start psi without gpg-agent use (known
  issue)
* Updated README.Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/psiiconset.cpp
171
171
                return icon;
172
172
        }
173
173
 
174
 
        Iconset systemIconset()
 
174
        Iconset systemIconset(bool *ok)
175
175
        {
176
176
                Iconset def;
177
 
                def.load ( iconsetPath("system/default") );
 
177
                *ok = def.load ( iconsetPath("system/default") );
178
178
 
179
179
                if ( option.systemIconset != "default" ) {
180
180
                        Iconset is;
188
188
                return def;
189
189
        }
190
190
 
191
 
        Iconset *defaultRosterIconset()
 
191
        Iconset *defaultRosterIconset(bool *ok)
192
192
        {
193
193
                Iconset *def = new Iconset;
194
 
                def->load ( iconsetPath("roster/default") );
 
194
                *ok = def->load ( iconsetPath("roster/default") );
195
195
 
196
196
                if ( option.defaultRosterIconset != "default" ) {
197
197
                        Iconset is;
237
237
 
238
238
bool PsiIconset::loadSystem()
239
239
{
240
 
        Iconset sys = d->systemIconset();
 
240
        bool ok;
 
241
        Iconset sys = d->systemIconset(&ok);
241
242
        d->loadIconset( &d->system, &sys );
242
243
 
243
244
        //d->system = d->systemIconset();
244
245
        d->system.addToFactory();
245
246
 
246
 
        return d->system.count() > 10;
 
247
        return ok;
247
248
}
248
249
 
249
250
bool PsiIconset::loadAll()
251
252
        if ( !loadSystem() )
252
253
                return false;
253
254
 
 
255
        bool ok;
 
256
 
254
257
        // load roster
255
258
        roster.clear();
256
259
 
257
260
        // default roster iconset
258
 
        Iconset *def = d->defaultRosterIconset();
 
261
        Iconset *def = d->defaultRosterIconset(&ok);
259
262
        def->addToFactory();
260
263
        roster.insert (option.defaultRosterIconset, def);
261
264
 
291
294
        emoticons.clear();
292
295
        emoticons = d->emoticons();
293
296
 
294
 
        return true;
 
297
        return ok;
295
298
}
296
299
 
297
300
bool PsiIconset::optionsChanged(const Options *old)
298
301
{
299
 
        loadSystem();
 
302
        bool ok = loadSystem();
300
303
 
301
304
        // default roster iconset
302
305
        if ( old->defaultRosterIconset != option.defaultRosterIconset ) {
303
 
                Iconset *newDef = d->defaultRosterIconset();
 
306
                Iconset *newDef = d->defaultRosterIconset(&ok);
304
307
                Iconset *oldDef = roster[old->defaultRosterIconset];
305
308
                d->loadIconset( oldDef, newDef );
306
309