← Back to branch summary

~ubuntu-branches/ubuntu/lucid/kmess/lucid

« back to all changes in this revision

Viewing changes to src/account.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mark Purcell
  • Date: 2009-12-05 21:19:26 UTC
  • mfrom: (1.1.7 upstream) (0.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20091205211926-r26u8j38kysf6o2p
Tags: 2.0.2-1
https://launchpad.net/bugs/485640
* New upstream release 
  - Fixes friendly names (LP: #485640)
* Update Homepage: http://kmess.org
* Add Build-Depends: libphonon-dev | libqt4-phonon-dev (ubuntu friendly)
* kmess.1 fix lintian:hyphen-used-as-minus-sign

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/account.cpp
156
156
                                  account->getUseListFormatting()                  );
157
157
  setEmailInformation           ( account->getShowEmail(),
158
158
                                  account->getShowOtherFolders()                   );
159
 
  setEmoticonStyle              ( account->getEmoticonStyle()                      );
160
159
  setFontInformation            ( account->getFont(),
161
160
                                  account->getFontColor(),
162
161
                                  account->getContactFont(),
176
175
  setStatusOptions              ( account->getUseIdleTimer(),
177
176
                                  account->getIdleTime(),
178
177
                                  account->getHideNotificationsWhenBusy()          );
 
178
  setEmoticonStyle              ( account->getEmoticonStyle()                      );
179
179
 
180
180
  // With direct copying we can quickly duplicate those properties
181
181
  // for which we don't need to send updates
1220
1220
    emoticonStyle_ = emoticonStyle;
1221
1221
    emit changedEmoticonSettings();
1222
1222
 
 
1223
    // update friendly name. horrible.
 
1224
    friendlyName_.setString( friendlyName_.getOriginal() );
 
1225
 
1223
1226
    // Tell the account settings changed and need to be saved
1224
1227
    dirty_ = true;
1225
1228
#ifdef KMESSDEBUG_ACCOUNT_DIRTY