Merged in trunk updates, including meta_contacts
Merged revisions 4951,4962-4969 via svnmerge from svn://svn.gajim.org/gajim/trunk ........ r4951 | nk | 2005-12-30 16:50:36 -0700 (Fri, 30 Dec 2005) | 1 line fixes in greek transl ........ r4962 | asterix | 2006-01-01 11:41:04 -0700 (Sun, 01 Jan 2006) | 2 lines merge meta_contacts branch with trunk. Meta contacts are not in gajim yet, but framework is here. We now use gajim.contacts.many_functions() to handle contacts and groupchat_contacts. ........ r4963 | asterix | 2006-01-01 11:43:24 -0700 (Sun, 01 Jan 2006) | 2 lines correct contacts file ........ r4964 | asterix | 2006-01-01 11:47:26 -0700 (Sun, 01 Jan 2006) | 2 lines dict.remove() doesn't exists, it's del dict[] ........ r4965 | asterix | 2006-01-01 11:50:15 -0700 (Sun, 01 Jan 2006) | 2 lines some missing commits from branch ........ r4966 | asterix | 2006-01-01 11:53:30 -0700 (Sun, 01 Jan 2006) | 2 lines end of gc_contact.nick -> gc_contact.name ........ r4967 | asterix | 2006-01-01 12:05:59 -0700 (Sun, 01 Jan 2006) | 2 lines new ACE option: send_sha_in_gc_presence that allow to send sha info in groupchat presences ........ r4968 | asterix | 2006-01-01 12:12:36 -0700 (Sun, 01 Jan 2006) | 2 lines 0.9.1-2 in debian that solve the group bug (commit [4924]) ........ r4969 | asterix | 2006-01-01 12:31:13 -0700 (Sun, 01 Jan 2006) | 2 lines typo ........
Showing
- debian/changelog 6 additions, 0 deletionsdebian/changelog
- debian/patches/00_debian-group_bugfix.patch 13 additions, 0 deletionsdebian/patches/00_debian-group_bugfix.patch
- po/el/LC_MESSAGES/gajim.po 4 additions, 4 deletionspo/el/LC_MESSAGES/gajim.po
- src/chat.py 6 additions, 6 deletionssrc/chat.py
- src/common/config.py 1 addition, 0 deletionssrc/common/config.py
- src/common/connection.py 4 additions, 2 deletionssrc/common/connection.py
- src/common/contacts.py 295 additions, 0 deletionssrc/common/contacts.py
- src/common/gajim.py 2 additions, 34 deletionssrc/common/gajim.py
- src/config.py 10 additions, 20 deletionssrc/config.py
- src/conversation_textview.py 2 additions, 2 deletionssrc/conversation_textview.py
- src/dialogs.py 25 additions, 28 deletionssrc/dialogs.py
- src/disco.py 4 additions, 4 deletionssrc/disco.py
- src/filetransfers_window.py 4 additions, 3 deletionssrc/filetransfers_window.py
- src/gajim.py 32 additions, 62 deletionssrc/gajim.py
- src/groupchat_window.py 62 additions, 72 deletionssrc/groupchat_window.py
- src/history_window.py 11 additions, 8 deletionssrc/history_window.py
- src/notify.py 7 additions, 6 deletionssrc/notify.py
- src/remote_control.py 72 additions, 77 deletionssrc/remote_control.py
- src/roster_window.py 213 additions, 192 deletionssrc/roster_window.py
- src/systray.py 4 additions, 4 deletionssrc/systray.py
Loading
Please register or sign in to comment