Changeset 9123

Timestamp:

12/12/07 09:44:46 (9 months ago)

Author:

asterix

Message:

merge diff from trunk

Location:

branches/pep

Files:

• AUTHORS (modified) (view diffs)
• autogen.sh (modified) (view diffs)
• ChangeLog (modified) (view diffs)
• configure.ac (modified) (view diffs)
• COPYING (modified) (view diffs)
• data/emoticons/animated/emoticons.py (modified) (view diffs)
• data/emoticons/static-big/emoticons.py (modified) (view diffs)
• data/emoticons/static-big/lion.png (copied) (copied from trunk/data/emoticons/static-big/lion.png) (view diffs)
• data/emoticons/static/emoticons.py (modified) (view diffs)
• data/emoticons/static/lion.png (copied) (copied from trunk/data/emoticons/static/lion.png) (view diffs)
• data/gajim.desktop.in.in (modified) (view diffs)
• data/gajim-remote.1 (modified) (view diffs)
• data/glade/account_context_menu.glade (modified) (view diffs)
• data/glade/account_creation_wizard_window.glade (modified) (view diffs)
• data/glade/accounts_window.glade (modified) (view diffs)
• data/glade/add_new_contact_window.glade (modified) (view diffs)
• data/glade/advanced_menuitem_menu.glade (modified) (view diffs)
• data/glade/chat_context_menu.glade (modified) (view diffs)
• data/glade/chat_control_popup_menu.glade (modified) (view diffs)
• data/glade/chat_to_muc_window.glade (copied) (copied from trunk/data/glade/chat_to_muc_window.glade) (view diffs)
• data/glade/filetransfers.glade (modified) (view diffs)
• data/glade/gc_control_popup_menu.glade (modified) (view diffs)
• data/glade/gc_occupants_menu.glade (modified) (view diffs)
• data/glade/history_manager.glade (modified) (view diffs)
• data/glade/history_window.glade (modified) (view diffs)
• data/glade/message_window.glade (modified) (view diffs)
• data/glade/passphrase_dialog.glade (modified) (view diffs)
• data/glade/preferences_window.glade (modified) (view diffs)
• data/glade/roster_contact_context_menu.glade (modified) (view diffs)
• data/glade/roster_window.glade (modified) (view diffs)
• data/glade/service_discovery_window.glade (modified) (view diffs)
• data/glade/single_message_window.glade (modified) (view diffs)
• data/glade/zeroconf_contact_context_menu.glade (modified) (view diffs)
• data/glade/zeroconf_context_menu.glade (modified) (view diffs)
• data/Makefile.am (modified) (view diffs)
• data/nibs (copied) (copied from trunk/data/nibs) (view diffs)
• data/other/cacerts.pem (modified) (view diffs)
• data/pixmaps/gajim.icns (copied) (copied from trunk/data/pixmaps/gajim.icns) (view diffs)
• debian/changelog (modified) (view diffs)
• debian/control (modified) (view diffs)
• debian/gajim.menu (modified) (view diffs)
• gajim.iss (modified) (view diffs)
• launch.sh (modified) (view diffs)
• Makefile.am (modified) (view diffs)
• po/cs.po (modified) (view diffs)
• po/da.po (copied) (copied from trunk/po/da.po) (view diffs)
• po/de.po (modified) (view diffs)
• po/fr.po (modified) (view diffs)
• po/gl_ES.po (deleted)
• po/gl.po (copied) (copied from trunk/po/gl.po) (view diffs)
• po/it.po (modified) (view diffs)
• po/LINGUAS (modified) (view diffs)
• po/lt.po (copied) (copied from trunk/po/lt.po) (view diffs)
• po/pl.po (modified) (view diffs)
• po/pt_BR.po (modified) (view diffs)
• po/ru.po (modified) (view diffs)
• po/sr@Latn.po (copied) (copied from trunk/po/sr@Latn.po) (view diffs)
• README.html (modified) (view diffs)
• README.osx (copied) (copied from trunk/README.osx) (view diffs)
• setup_osx.py (copied) (copied from trunk/setup_osx.py) (view diffs)
• setup_win32.py (modified) (view diffs)
• src/adhoc_commands.py (modified) (view diffs)
• src/advanced.py (modified) (view diffs)
• src/atom_window.py (modified) (view diffs)
• src/cell_renderer_image.py (modified) (view diffs)
• src/chat_control.py (modified) (view diffs)
• src/common/caps.py (modified) (view diffs)
• src/common/check_paths.py (modified) (view diffs)
• src/common/commands.py (modified) (view diffs)
• src/common/configpaths.py (modified) (view diffs)
• src/common/config.py (modified) (view diffs)
• src/common/connection_handlers.py (modified) (view diffs)
• src/common/connection.py (modified) (view diffs)
• src/common/contacts.py (modified) (view diffs)
• src/common/crypto.py (copied) (copied from trunk/src/common/crypto.py) (view diffs)
• src/common/dataforms.py (modified) (view diffs)
• src/common/dbus_support.py (modified) (view diffs)
• src/common/defs.py (modified) (view diffs)
• src/common/dh.py (copied) (copied from trunk/src/common/dh.py) (view diffs)
• src/common/events.py (modified) (view diffs)
• src/common/exceptions.py (modified) (view diffs)
• src/common/fuzzyclock.py (modified) (view diffs)
• src/common/gajim.py (modified) (view diffs)
• src/common/GnuPGInterface.py (modified) (view diffs)
• src/common/GnuPG.py (modified) (view diffs)
• src/common/helpers.py (modified) (view diffs)
• src/common/i18n.py (modified) (view diffs)
• src/common/logger.py (modified) (view diffs)
• src/common/nslookup.py (modified) (view diffs)
• src/common/optparser.py (modified) (view diffs)
• src/common/passwords.py (modified) (view diffs)
• src/common/proxy65_manager.py (modified) (view diffs)
• src/common/rst_xhtml_generator.py (modified) (view diffs)
• src/common/sleepy.py (modified) (view diffs)
• src/common/socks5.py (modified) (view diffs)
• src/common/stanza_session.py (copied) (copied from trunk/src/common/stanza_session.py) (view diffs)
• src/common/xmpp/c14n.py (copied) (copied from trunk/src/common/xmpp/c14n.py) (view diffs)
• src/common/xmpp/idlequeue.py (modified) (view diffs)
• src/common/xmpp/protocol.py (modified) (view diffs)
• src/common/xmpp/roster.py (modified) (view diffs)
• src/common/xmpp_stringprep.py (modified) (view diffs)
• src/common/xmpp/transports_nb.py (modified) (view diffs)
• src/common/zeroconf/client_zeroconf.py (modified) (view diffs)
• src/common/zeroconf/connection_handlers_zeroconf.py (modified) (view diffs)
• src/common/zeroconf/connection_zeroconf.py (modified) (view diffs)
• src/common/zeroconf/roster_zeroconf.py (modified) (view diffs)
• src/common/zeroconf/zeroconf_avahi.py (modified) (view diffs)
• src/common/zeroconf/zeroconf_bonjour.py (modified) (view diffs)
• src/common/zeroconf/zeroconf.py (modified) (view diffs)
• src/config.py (modified) (view diffs)
• src/conversation_textview.py (modified) (view diffs)
• src/dataforms_widget.py (modified) (view diffs)
• src/dialogs.py (modified) (view diffs)
• src/disco.py (modified) (view diffs)
• src/features_window.py (modified) (view diffs)
• src/filetransfers_window.py (modified) (view diffs)
• src/gajim.py (modified) (view diffs)
• src/gajim-remote.py (modified) (view diffs)
• src/gajim_themes_window.py (modified) (view diffs)
• src/groupchat_control.py (modified) (view diffs)
• src/gtkexcepthook.py (modified) (view diffs)
• src/gtkgui_helpers.py (modified) (view diffs)
• src/history_manager.py (modified) (view diffs)
• src/history_window.py (modified) (view diffs)
• src/htmltextview.py (modified) (view diffs)
• src/lastfm.py (copied) (copied from trunk/src/lastfm.py) (view diffs)
• src/lastfm_track_listener.py (copied) (copied from trunk/src/lastfm_track_listener.py) (view diffs)
• src/Makefile.am (modified) (view diffs)
• src/message_control.py (modified) (view diffs)
• src/message_textview.py (modified) (view diffs)
• src/message_window.py (modified) (view diffs)
• src/music_track_listener.py (modified) (view diffs)
• src/negotiation.py (copied) (copied from trunk/src/negotiation.py) (view diffs)
• src/network_manager_listener.py (modified) (view diffs)
• src/notify.py (modified) (view diffs)
• src/osx (copied) (copied from trunk/src/osx) (view diffs)
• src/profile_window.py (modified) (view diffs)
• src/remote_control.py (modified) (view diffs)
• src/roster_window.py (modified) (view diffs)
• src/search_window.py (modified) (view diffs)
• src/secrets.py (copied) (copied from trunk/src/secrets.py) (view diffs)
• src/statusicon.py (modified) (view diffs)
• src/systray.py (modified) (view diffs)
• src/tooltips.py (modified) (view diffs)
• src/vcard.py (modified) (view diffs)
• THANKS (modified) (view diffs)
• TODO.osx (copied) (copied from trunk/TODO.osx) (view diffs)