Refactoring work.
Refactoring work.

git-svn-id: 0d4d1bf2e47502aa0f0957c230a0ec7fa56198fd@3179 b35dd754-fafc-0310-a699-88a17e54d16e

kkroid/OnechatSmack,lovely3x/Smack,opg7371/Smack,TTalkIM/Smack,vanitasvitae/Smack,unisontech/Smack,andrey42/Smack,deeringc/Smack,vanitasvitae/smack-omemo,kkroid/OnechatSmack,annovanvliet/Smack,qingsong-xu/Smack,andrey42/Smack,cjpx00008/Smack,Tibo-lg/Smack,xuIcream/Smack,igniterealtime/Smack,vanitasvitae/Smack,igorexax3mal/Smack,xuIcream/Smack,mar-v-in/Smack,esl/Smack,TTalkIM/Smack,kkroid/OnechatSmack,ayne/Smack,chuangWu/Smack,chuangWu/Smack,vito-c/Smack,deeringc/Smack,u20024804/Smack,mar-v-in/Smack,magnetsystems/message-smack,igorexax3mal/Smack,hy9902/Smack,qingsong-xu/Smack,cjpx00008/Smack,esl/Smack,andrey42/Smack,Flowdalic/Smack,TTalkIM/Smack,mar-v-in/Smack,Tibo-lg/Smack,vanitasvitae/smack-omemo,lovely3x/Smack,chuangWu/Smack,unisontech/Smack,magnetsystems/message-smack,hy9902/Smack,ishan1604/Smack,magnetsystems/message-smack,ayne/Smack,esl/Smack,opg7371/Smack,u20024804/Smack,igniterealtime/Smack,dpr-odoo/Smack,dpr-odoo/Smack,Flowdalic/Smack,xuIcream/Smack,Flowdalic/Smack,lovely3x/Smack,ayne/Smack,vanitasvitae/Smack,igorexax3mal/Smack,Tibo-lg/Smack,ishan1604/Smack,hy9902/Smack,annovanvliet/Smack,igniterealtime/Smack,cjpx00008/Smack,annovanvliet/Smack,unisontech/Smack,opg7371/Smack,vito-c/Smack,qingsong-xu/Smack,dpr-odoo/Smack,u20024804/Smack,ishan1604/Smack,deeringc/Smack,vanitasvitae/smack-omemo