diff --exclude='*orig' -Naur psi-0.10-test3-orig/iconsets/system/default/icondef.xml psi-0.10-test3/iconsets/system/default/icondef.xml --- psi-0.10-test3-orig/iconsets/system/default/icondef.xml 2005-12-21 08:36:41.000000000 +0100 +++ psi-0.10-test3/iconsets/system/default/icondef.xml 2005-12-21 08:38:19.000000000 +0100 @@ -411,7 +411,7 @@ - + diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/avatars.h psi-0.10-test3/src/avatars.h --- psi-0.10-test3-orig/src/avatars.h 2005-12-21 08:36:37.000000000 +0100 +++ psi-0.10-test3/src/avatars.h 2005-12-21 08:38:48.000000000 +0100 @@ -1,7 +1,7 @@ #ifndef AVATARS_H #define AVATARS_H -//#define AVATARS +#define AVATARS #include #include diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/chatdlg.cpp psi-0.10-test3/src/chatdlg.cpp --- psi-0.10-test3-orig/src/chatdlg.cpp 2005-12-21 08:36:44.000000000 +0100 +++ psi-0.10-test3/src/chatdlg.cpp 2005-12-21 08:37:38.000000000 +0100 @@ -73,9 +73,7 @@ ChatView *log; ChatEdit *mle; -#ifdef AVATARS QLabel *avatar; -#endif QLabel *lb_ident; IconLabel *lb_status; @@ -309,7 +307,6 @@ connect(d->mle, SIGNAL(textChanged()), d, SLOT(updateCounter())); // Avatars -#ifdef AVATARS d->avatar = new QLabel(sp_bottom); hb4->addWidget(d->avatar); updateAvatar(); @@ -317,7 +314,6 @@ // open window when an avatar changes. connect(d->pa->avatarFactory(),SIGNAL(avatarChanged(const Jid&)), this, SLOT(updateAvatar(const Jid&))); connect(d->pa->psi(),SIGNAL(emitOptionsUpdate()), this, SLOT(updateAvatar())); -#endif d->pm_settings = new QPopupMenu(this); connect(d->pm_settings, SIGNAL(aboutToShow()), SLOT(buildMenu())); @@ -662,7 +658,6 @@ void ChatDlg::updateAvatar() { -#ifdef AVATARS QString res; QString client; @@ -688,7 +683,6 @@ d->avatar->setPixmap(p); d->avatar->show(); } -#endif } diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/contactview.cpp psi-0.10-test3/src/contactview.cpp --- psi-0.10-test3-orig/src/contactview.cpp 2005-12-21 08:36:45.000000000 +0100 +++ psi-0.10-test3/src/contactview.cpp 2005-12-21 08:37:38.000000000 +0100 @@ -1442,14 +1442,12 @@ } // Avatars -#ifdef AVATARS QPopupMenu *avpm = new QPopupMenu(mm); d->cv->qa_assignAvatar->addTo(avpm); d->cv->qa_clearAvatar->setEnabled(d->pa->avatarFactory()->hasManualAvatar(u->jid())); d->cv->qa_clearAvatar->addTo(avpm); mm->insertItem(tr("&Avatar"), avpm); avpm->setEnabled(option.avatarsEnabled); -#endif if(d->pa->psi()->pgp()) { if(u->publicKeyID().isEmpty()) @@ -2135,12 +2133,10 @@ connect(qa_send, SIGNAL(activated()), SLOT(doSendMessage())); qa_ren = new IconAction("", /*"psi/edit/clear",*/ tr("Re&name"), QListView::Key_F2, this); connect(qa_ren, SIGNAL(activated()), SLOT(doRename())); -#ifdef AVATARS qa_assignAvatar = new IconAction("", tr("&Assign Custom Avatar"),QKeySequence(), this); connect(qa_assignAvatar, SIGNAL(activated()), SLOT(doAssignAvatar())); qa_clearAvatar = new IconAction("", tr("&Clear Custom Avatar"), QKeySequence(), this); connect(qa_clearAvatar, SIGNAL(activated()), SLOT(doClearAvatar())); -#endif qa_chat = new IconAction("", "psi/start-chat", tr("Open &chat window"), QListView::CTRL+QListView::Key_C, this); connect(qa_chat, SIGNAL(activated()), SLOT(doOpenChat())); qa_hist = new IconAction("", "psi/history", tr("&History"), QListView::CTRL+QListView::Key_H, this); diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/psiaccount.cpp psi-0.10-test3/src/psiaccount.cpp --- psi-0.10-test3-orig/src/psiaccount.cpp 2005-12-21 08:36:45.000000000 +0100 +++ psi-0.10-test3/src/psiaccount.cpp 2005-12-21 08:37:38.000000000 +0100 @@ -390,9 +390,7 @@ d->cp = 0; d->userCounter = 0; -#ifdef AVATARS d->avatarFactory = new AvatarFactory(this); -#endif d->blockTransportPopupList = new BlockTransportPopupList(); @@ -418,9 +416,7 @@ d->self.setSubscription(Subscription::Both); d->nickFromVCard = false; -#ifdef AVATARS d->self.setAvatarFactory(d->avatarFactory); -#endif d->messageQueue.setAutoDelete(true); d->ppdlg = 0; @@ -1293,9 +1289,7 @@ // we don't have it at all, so add it u = new UserListItem; u->setRosterItem(r); -#ifdef AVATARS u->setAvatarFactory(d->avatarFactory); -#endif d->userList.append(u); } u->setInList(true); @@ -2540,9 +2534,7 @@ void PsiAccount::actionRemove(const Jid &j) { -#ifdef AVATARS avatarFactory()->removeManualAvatar(j); -#endif dj_remove(j); } @@ -3388,9 +3380,7 @@ u = new UserListItem; u->setJid(e->jid()); u->setInList(false); -#ifdef AVATARS u->setAvatarFactory(d->avatarFactory); -#endif // is it a private groupchat? Jid j = u->jid(); @@ -4220,9 +4210,7 @@ u->setInList(false); u->setName(j.resource()); u->setPrivate(true); -#ifdef AVATARS u->setAvatarFactory(d->avatarFactory); -#endif // make a resource so the contact appears online UserResource ur; @@ -4247,9 +4235,7 @@ u->setInList(false); u->setName(j.resource()); u->setPrivate(true); -#ifdef AVATARS u->setAvatarFactory(d->avatarFactory); -#endif // make a resource so the contact appears online UserResource ur; diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/psigrowlnotifier.cpp psi-0.10-test3/src/psigrowlnotifier.cpp --- psi-0.10-test3-orig/src/psigrowlnotifier.cpp 2005-10-14 02:36:14.000000000 +0200 +++ psi-0.10-test3/src/psigrowlnotifier.cpp 2005-12-21 08:37:38.000000000 +0100 @@ -115,11 +115,9 @@ else contact = jid.bare(); -#ifdef AVATARS // FIXME: Lookup the client version if (account->avatarFactory()) icon = account->avatarFactory()->getAvatar(jid, "Psi"); -#endif // Default value for the title title = contact; diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/userlist.cpp psi-0.10-test3/src/userlist.cpp --- psi-0.10-test3-orig/src/userlist.cpp 2005-12-21 08:36:40.000000000 +0100 +++ psi-0.10-test3/src/userlist.cpp 2005-12-21 08:37:38.000000000 +0100 @@ -340,7 +340,6 @@ { QString str; -#ifdef AVATARS str += ""; if (option.avatarsEnabled) { QString client; @@ -361,7 +360,6 @@ } str += ""; str += "
"; -#endif QString nick = jidnick(jid().full(), name()); str += QString("%1").arg(expandEntities(nick)); @@ -498,10 +496,8 @@ } } -#ifdef AVATARS str += "
"; -#endif return str; }