merge from trunk
Showing
- Changelog 32 additions, 8 deletionsChangelog
- README 7 additions, 9 deletionsREADME
- data/glade/gajim_themes_window.glade 0 additions, 46 deletionsdata/glade/gajim_themes_window.glade
- data/glade/message_window.glade 2 additions, 2 deletionsdata/glade/message_window.glade
- data/glade/preferences_window.glade 188 additions, 100 deletionsdata/glade/preferences_window.glade
- data/glade/privacy_list_window.glade 779 additions, 0 deletionsdata/glade/privacy_list_window.glade
- data/glade/privacy_lists_window.glade 255 additions, 0 deletionsdata/glade/privacy_lists_window.glade
- data/glade/profile_window.glade 202 additions, 120 deletionsdata/glade/profile_window.glade
- data/glade/roster_window.glade 411 additions, 326 deletionsdata/glade/roster_window.glade
- data/glade/systray_context_menu.glade 7 additions, 5 deletionsdata/glade/systray_context_menu.glade
- data/glade/vcard_information_window.glade 55 additions, 29 deletionsdata/glade/vcard_information_window.glade
- po/pl.po 1 addition, 1 deletionpo/pl.po
- src/chat_control.py 4 additions, 5 deletionssrc/chat_control.py
- src/common/config.py 5 additions, 4 deletionssrc/common/config.py
- src/common/connection_handlers.py 7 additions, 1 deletionsrc/common/connection_handlers.py
- src/common/helpers.py 15 additions, 0 deletionssrc/common/helpers.py
- src/common/socks5.py 5 additions, 5 deletionssrc/common/socks5.py
- src/common/xmpp/protocol.py 13 additions, 2 deletionssrc/common/xmpp/protocol.py
- src/config.py 59 additions, 25 deletionssrc/config.py
- src/conversation_textview.py 9 additions, 6 deletionssrc/conversation_textview.py
Loading
Please register or sign in to comment