----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/118060/ -----------------------------------------------------------
(Updated May 17, 2014, 2:34 p.m.) Review request for Kopete. Changes ------- Rebase on top of kopete master & fix compile error Repository: kopete Description ------- Add contact property custom name and support for preferred display name type Add customName property to Kopete::Global and helper functions to Contact class (customName() and setCustomName()). Property nickName should be used for nick name which comes from remote user. Custom name property should be used for customized (nick) name set by local user. Property customName can be also stored on remote contact list server (if protocol supports it). This allow kopete to distinguish between contact with customized nickname set by local user (property customName) and by remote contact (property nickName). So user can choose if want to see original nickname of contact or his customized name in contact list. Add enum Kopete::Contact::NameType which indicate which name string should be used as "display" name for contact. It can be either CustomName or NickName or FormattedName or ContactId. Add method displayName() which will return either formattedName or nickName or customName or contactId depending on chosen NameType enum. NameType can be changed by new method setPreferredNameType(). Default is CustomName. Add also signal displayNameChanged() so other classes can easy watch for event when display name of contact changes and do not need to watch for all kopete name properties and parse which is used. This will simplify other kopete code. This finally should fix problem with storing custom names on remote server and also to have support for choosing original nick name set by remote contact. -- Fix nickName, customName and displayName usage in other protocols Fix nickName and displayName usage in wlm protocol Fix nickName, customName and displayName usage in jabber protocol Fix nickName, customName, formattedName and displayName usage in skype protocol Fix nickName, customName and displayName usage in oscar protocol Implement selecting preferred contact display name type in metacontact dialog Use new signal Kopete::Contact::displayNameChanged() instead watching for name properties Use Kopete::Contact::displayName() instead nickName() in plugins and kopete code Store/restore preferredNameType contact property for all protocols in Protocol::serialize and Protocol::deserializeContact functions -- Patches are in my cloned git repo http://quickgit.kde.org/?p=clones/kopete/pali/kopete.git branch master Diffs (updated) ----- kopete/chatwindow/chatmessagepart.cpp 1b01db6dcce0a8016121c6924cf53a449dba344b kopete/chatwindow/chattexteditpart.h 0d34e58e3be04c00a4a334c5f7ad9c2520d34fb3 kopete/chatwindow/chattexteditpart.cpp 107861ce38ad8cb5b960aa6f28c6e1e7bee04534 kopete/chatwindow/chatview.h 8dee749aac144074bea5f2aebae059980b431430 kopete/chatwindow/chatview.cpp eccee59c985d0d174b272ba24358caf1ccb558b7 kopete/contactlist/contactlistmodel.cpp f1980c78bf7f91983edacab35e88b47a048e3ade kopete/contactlist/kopetelviprops.h 274f33760be623c0eaa4e761e8d90ace840978ca kopete/contactlist/kopetelviprops.cpp 1a22f9e2983092fc5c401902f9025b12f7c28d26 libkopete/chatsessionmemberslistmodel.cpp 29635f2726be18f050192c5a1700d42b08cc08d7 libkopete/kopeteaccount.cpp 60a968de21c146640bcc1ae03e7b5b15ff363eba libkopete/kopetechatsession.h 5bac8aaffc67ce6ff56b0f444a9bd33e8fac275f libkopete/kopetechatsession.cpp 8c9472312ea2a86c7d6cbad5538a07ec53b828e9 libkopete/kopetecommand.cpp de5485c69546b024602759e84904acf4a492b3c0 libkopete/kopetecontact.h 3ceef46bbf0a347634c2348cd5a459f2225500e3 libkopete/kopetecontact.cpp 054a0b0bc944a3feca4848ab91d01b147f459a7d libkopete/kopeteglobal.h 359933b96dc02ebe66267f558fc621b36ce537bf libkopete/kopeteglobal.cpp 537e97534a2aeedc6d3f8b625971b9395f720aeb libkopete/kopetemetacontact.h 65a68c150c048464603a86c5fff62883dfdb12b8 libkopete/kopetemetacontact.cpp 307dfa956eaf11238814a29e804f969713c1f07b libkopete/kopeteprotocol.cpp 700cd7752a4fbbf209ed454492cce0e079033b84 plugins/addbookmarks/addbookmarksplugin.cpp 087db22b2cfd7195880bc8be44942407acb33cbc plugins/history/historydialog.cpp 1dcf2f64111c41d9ff72914e2d42b5bb3ddc0bff plugins/history/historyimport.cpp 4458a2d738846a2a4e753a6c60cbdad5d525e3be plugins/history/historylogger.cpp d802549b3116f0949194af801fed5b7d46471efd plugins/history2/history2dialog.cpp a8465d68f0bb75431d9d2d4307ec7842f8abbd0e plugins/history2/history2import.cpp 3afb13b1583aaa4fed67fb6e3ceb1e967155ff66 plugins/history2/history2logger.cpp ffc3317a5a80088eb0833cacd565699ebd45af74 plugins/pipes/pipesplugin.cpp c9bc179d49fed0e8f256dead5384603be65d89e4 plugins/webpresence/webpresenceplugin.cpp 41ad0eb0718427660c33893f03531c75f6290fd0 protocols/bonjour/bonjourprotocol.cpp 07d1bee7150a8ac0a838daf8b7670948850f4c0b protocols/gadu/gaduaccount.cpp 5c786931f1b8b401d5449c4b44e320be0c469dc5 protocols/gadu/gadueditaccount.cpp 5c930fffc7b260d17d8c45c1dc765126a0f5d294 protocols/gadu/gaduprotocol.cpp ba587f0314cd8f8926b4d4f3494e5e33d74056bc protocols/groupwise/gwaccount.cpp e95df09fb55eaf00e63f071c58e504c55aec02b9 protocols/groupwise/gwcontact.cpp a7ff322641d0e3826033902809134435b36bdad3 protocols/groupwise/gwprotocol.cpp a97cfc5a96da8d0dda95188b5195015807060b5a protocols/jabber/jabberbasecontact.cpp dd9da1622926103b929084e2449444f4494fe1c0 protocols/jabber/jabberbookmarks.cpp a25ab740fc1f7a85b972ce01a7cceef8fe1e95c6 protocols/jabber/jabberprotocol.cpp cd15420db048d718129e9c44dfb2b31899f37a86 protocols/jabber/jabbertransport.cpp 8764350ae18a47daf877da6244b1147bf0026969 protocols/jabber/ui/privacydlg.cpp f0463f3f9679dc14c1fd4e29635300f12be26383 protocols/meanwhile/meanwhileprotocol.cpp 4bd3e4126eeaed366babd73eca71bccc67b776b2 protocols/meanwhile/meanwhilesession.cpp 45cb8bbf6700de1e531006ebb0d13c11fd20cc0e protocols/oscar/aim/aimcontact.cpp a26aa08464e521132e6216e6a02d76f94676ea3a protocols/oscar/aim/aimuserinfo.cpp 26529b1f11fd0cb922becacf12b9352a5ca69fdf protocols/oscar/icq/aimcontact.cpp e13edf06d7d44f14918c885a894aa3c8dc925e51 protocols/oscar/icq/icqaccount.cpp 249f9b6057466c98246fb7b7fafa6a66055e62be protocols/oscar/icq/icqcontact.cpp e552b18c82fbf9b21ca9170305811e83d7d34b8e protocols/oscar/oscarcontact.cpp 72fe96a091e7a5f270109dd68028eb3526570740 protocols/oscar/oscarprivacyengine.cpp 969edf725d4fac569ad6aceec39e74cd4c7bc58e protocols/oscar/oscarprotocol.cpp ca2d5e7e146edea9b1e2bd834646c6b93945b051 protocols/qq/qqaccount.cpp 710d0c78176bcb70c89ad757fbef8d6499c1eb71 protocols/qq/qqcontact.cpp 13945ac25b31796100e6bb32a57f9756f732e842 protocols/qq/qqprotocol.cpp 321aafac79eb6fb519af647701147ed95a4dcf0f protocols/skype/skypeaccount.cpp a82616577d3803f67703e9c3f7ed0ac6cbf3e423 protocols/skype/skypecontact.h e885c73f220cac4d2d1dc7b1b432df994442bc14 protocols/skype/skypecontact.cpp 8971560118eaee13086852e3a8e962676b606217 protocols/skype/skypeprotocol.cpp bae40fafba6ece26f51888401009e9c6736dbca2 protocols/sms/smsprotocol.cpp 82221a2e7ac53f8aba50b5ec360e35cc956783a5 protocols/sms/smsuserpreferences.cpp 2bdbaa5b958f93297b488c5845a8a62b3b97fae7 protocols/testbed/testbededitaccountwidget.cpp fb39eb0a94ab7a29dd14c2a4ea8d12aae4952e59 protocols/testbed/testbedprotocol.cpp 0b17b55d6e7b163eaaf2a67686e6bdd9190a5017 protocols/winpopup/wpprotocol.cpp 6ea87a638c4d794e5e4f8eaa49214a15adc669e2 protocols/winpopup/wpuserinfo.cpp 2025842c245252d20d544b3ac00b3b76945c12e8 protocols/wlm/wlmaccount.cpp 00af78d459281618cb18910d055be68fcdb994b3 protocols/wlm/wlmchatsession.cpp 018cba992f7580e93a357a56d80a5cda36b064e0 protocols/wlm/wlmcontact.cpp c6ba43a72212f61aaf7abc554238ed86cd8f4dd8 protocols/wlm/wlmprotocol.cpp 71733394a56775a7eaf78aadffa19e53172c7265 protocols/yahoo/yahooprotocol.cpp 118ecb7d0cd515a7eaa971d9a8b5755111bfc69d Diff: https://git.reviewboard.kde.org/r/118060/diff/ Testing ------- This is bigger change in core kopete code, so somebody else should test if everything working fine and does not introduce new bugs... Thanks, Pali Rohár
_______________________________________________ kopete-devel mailing list kopete-devel@kde.org https://mail.kde.org/mailman/listinfo/kopete-devel
