changeset 1182e1367856 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=1182e1367856 description: merge changes from default branch into otr branch

diffstat:

.hgignore | 6 - AUTHORS | 11 +- ChangeLog | 4 +- Makefile.am | 3 +- README.html | 94 +- THANKS.artists | 2 +- autogen.sh | 2 +- configure.ac | 45 +- data/Makefile.am | 4 +- data/activities/Makefile.am | 36 +- data/defs.py.in | 2 +- data/emoticons/Makefile.am | 39 +- data/emoticons/animated/emoticons.py | 96 +- data/emoticons/static-big/emoticons.py | 82 +- data/emoticons/static/emoticons.py | 82 +- data/emoticons/tango/alien.png | 0 data/emoticons/tango/angel.png | 0 data/emoticons/tango/arrogant.png | 0 data/emoticons/tango/beer.png | 0 data/emoticons/tango/bomb.png | 0 data/emoticons/tango/clap.png | 0 data/emoticons/tango/confused.png | 0 data/emoticons/tango/cowboy.png | 0 data/emoticons/tango/crying.png | 0 data/emoticons/tango/curl-lip.png | 0 data/emoticons/tango/cute.png | 0 data/emoticons/tango/dance.png | 0 data/emoticons/tango/devil.png | 0 data/emoticons/tango/disapointed.png | 0 data/emoticons/tango/doh.png | 0 data/emoticons/tango/dont-know.png | 0 data/emoticons/tango/embarrassed.png | 0 data/emoticons/tango/emoticons.py | 52 + data/emoticons/tango/fingers-crossed.png | 0 data/emoticons/tango/freaked-out.png | 0 data/emoticons/tango/giggle.png | 0 data/emoticons/tango/glasses-cool.png | 0 data/emoticons/tango/go-away.png | 0 data/emoticons/tango/good.png | 0 data/emoticons/tango/handshake.png | 0 data/emoticons/tango/hypnotized.png | 0 data/emoticons/tango/kiss.png | 0 data/emoticons/tango/laugh.png | 0 data/emoticons/tango/love.png | 0 data/emoticons/tango/mail.png | 0 data/emoticons/tango/musical-note.png | 0 data/emoticons/tango/party.png | 0 data/emoticons/tango/pissed-off.png | 0 data/emoticons/tango/question.png | 0 data/emoticons/tango/rose.png | 0 data/emoticons/tango/rotfl.png | 0 data/emoticons/tango/sad.png | 0 data/emoticons/tango/sarcastic.png | 0 data/emoticons/tango/shout.png | 0 data/emoticons/tango/shut-mouth.png | 0 data/emoticons/tango/sick.png | 0 data/emoticons/tango/silly.png | 0 data/emoticons/tango/sleepy.png | 0 data/emoticons/tango/smirk.png | 0 data/emoticons/tango/terror.png | 0 data/emoticons/tango/thinking.png | 0 data/emoticons/tango/tongue.png | 0 data/emoticons/tango/tremble.png | 0 data/emoticons/tango/victory.png | 0 data/emoticons/tango/wink.png | 0 data/glade/Makefile.am | 8 - data/glade/account_context_menu.glade | 144 - data/glade/account_creation_wizard_window.glade | 886 - data/glade/account_modification_window.glade | 1283 - data/glade/accounts_window.glade | 1394 - data/glade/add_new_contact_window.glade | 334 - data/glade/adhoc_commands_window.glade | 723 - data/glade/advanced_configuration_window.glade | 257 - data/glade/advanced_menuitem_menu.glade | 80 - data/glade/advanced_notifications_window.glade | 865 - data/glade/atom_entry_window.glade | 372 - data/glade/blocked_contacts_window.glade | 147 - data/glade/change_activity_dialog.glade | 327 - data/glade/change_mood_dialog.glade | 340 - data/glade/change_password_dialog.glade | 200 - data/glade/change_status_message_dialog.glade | 296 - data/glade/chat_context_menu.glade | 156 - data/glade/chat_to_muc_window.glade | 185 - data/glade/choose_gpg_key_dialog.glade | 142 - data/glade/contact_context_menu.glade | 466 - data/glade/contact_otr_window.glade | 390 - data/glade/data_form_window.glade | 800 - data/glade/dubbleinput_dialog.glade | 203 - data/glade/edit_groups_dialog.glade | 190 - data/glade/esession_info_window.glade | 200 - data/glade/features_window.glade | 117 - data/glade/filetransfers.glade | 281 - data/glade/gajim_themes_window.glade | 783 - data/glade/gc_control_popup_menu.glade | 134 - data/glade/gc_occupants_menu.glade | 179 - data/glade/groups_post_window.glade | 230 - data/glade/history_manager.glade | 321 - data/glade/history_window.glade | 210 - data/glade/input_dialog.glade | 113 - data/glade/input_text_dialog.glade | 109 - data/glade/join_groupchat_window.glade | 272 - data/glade/manage_accounts_window.glade | 306 - data/glade/manage_bookmarks_window.glade | 326 - data/glade/manage_pep_services_window.glade | 108 - data/glade/manage_proxies_window.glade | 440 - data/glade/manage_sounds_window.glade | 106 - data/glade/message_window.glade | 1099 - data/glade/otr_options_page.glade | 367 - data/glade/passphrase_dialog.glade | 100 - data/glade/popup_notification_window.glade | 165 - data/glade/preferences_window.glade | 2376 -- data/glade/privacy_list_window.glade | 540 - data/glade/privacy_lists_window.glade | 212 - data/glade/profile_window.glade | 1163 - data/glade/progress_dialog.glade | 98 - data/glade/remove_account_window.glade | 263 - data/glade/roster_item_exchange_window.glade | 110 - data/glade/roster_window.glade | 429 - data/glade/search_window.glade | 215 - data/glade/service_discovery_window.glade | 237 - data/glade/service_registration_window.glade | 133 - data/glade/single_message_window.glade | 344 - data/glade/subscription_request_popup_menu.glade | 39 - data/glade/subscription_request_window.glade | 364 - data/glade/synchronise_select_account_dialog.glade | 131 - data/glade/synchronise_select_contacts_dialog.glade | 131 - data/glade/systray_context_menu.glade | 158 - data/glade/vcard_information_window.glade | 1665 - data/glade/voip_call_received_dialog.glade | 39 - data/glade/xml_console_window.glade | 376 - data/glade/zeroconf_context_menu.glade | 41 - data/glade/zeroconf_information_window.glade | 666 - data/gui/Makefile.am | 8 + data/gui/account_context_menu.ui | 144 + data/gui/account_creation_wizard_window.ui | 899 + data/gui/accounts_window.ui | 1423 + data/gui/add_new_contact_window.ui | 391 + data/gui/adhoc_commands_window.ui | 434 + data/gui/advanced_configuration_window.ui | 153 + data/gui/advanced_menuitem_menu.ui | 78 + data/gui/advanced_notifications_window.ui | 951 + data/gui/atom_entry_window.ui | 219 + data/gui/blocked_contacts_window.ui | 91 + data/gui/change_activity_dialog.ui | 340 + data/gui/change_mood_dialog.ui | 352 + data/gui/change_password_dialog.ui | 143 + data/gui/change_status_message_dialog.ui | 316 + data/gui/chat_context_menu.ui | 111 + data/gui/chat_control.ui | 831 + data/gui/chat_to_muc_window.ui | 184 + data/gui/choose_gpg_key_dialog.ui | 104 + data/gui/contact_context_menu.ui | 444 + data/gui/contact_otr_window.ui | 390 + data/gui/data_form_window.ui | 392 + data/gui/dubbleinput_dialog.ui | 138 + data/gui/edit_groups_dialog.ui | 125 + data/gui/esession_info_window.ui | 151 + data/gui/features_window.ui | 119 + data/gui/filetransfers.ui | 296 + data/gui/gajim_themes_window.ui | 586 + data/gui/gc_control_popup_menu.ui | 133 + data/gui/gc_occupants_menu.ui | 188 + data/gui/groupchat_control.ui | 428 + data/gui/groups_post_window.ui | 138 + data/gui/history_manager.ui | 350 + data/gui/history_window.ui | 234 + data/gui/input_dialog.ui | 117 + data/gui/input_text_dialog.ui | 125 + data/gui/join_groupchat_window.ui | 336 + data/gui/manage_bookmarks_window.ui | 371 + data/gui/manage_pep_services_window.ui | 122 + data/gui/manage_proxies_window.ui | 458 + data/gui/manage_sounds_window.ui | 117 + data/gui/message_window.ui | 77 + data/gui/otr_options_page.ui | 367 + data/gui/passphrase_dialog.ui | 115 + data/gui/popup_notification_window.ui | 105 + data/gui/preferences_window.ui | 2771 ++ data/gui/privacy_list_window.ui | 624 + data/gui/privacy_lists_window.ui | 174 + data/gui/profile_window.ui | 1164 + data/gui/progress_dialog.ui | 68 + data/gui/remove_account_window.ui | 183 + data/gui/roster_item_exchange_window.ui | 143 + data/gui/roster_window.ui | 440 + data/gui/search_window.ui | 233 + data/gui/service_discovery_window.ui | 249 + data/gui/service_registration_window.ui | 145 + data/gui/single_message_window.ui | 275 + data/gui/subscription_request_popup_menu.ui | 34 + data/gui/subscription_request_window.ui | 184 + data/gui/synchronise_select_account_dialog.ui | 94 + data/gui/synchronise_select_contacts_dialog.ui | 96 + data/gui/systray_context_menu.ui | 128 + data/gui/vcard_information_window.ui | 1662 + data/gui/voip_call_received_dialog.ui | 40 + data/gui/xml_console_window.ui | 367 + data/gui/zeroconf_context_menu.ui | 41 + data/gui/zeroconf_information_window.ui | 399 + data/iconsets/Makefile.am | 43 +- data/iconsets/jabberbulb/32x32/icos/online.ico | 0 data/moods/Makefile.am | 36 +- data/other/cacerts.pem | 45 + data/pixmaps/Makefile.am | 18 +- data/pixmaps/agents/aim.png | 0 data/pixmaps/agents/bytestreams.png | 0 data/pixmaps/agents/conference.png | 0 data/pixmaps/agents/disc.png | 0 data/pixmaps/agents/error.png | 0 data/pixmaps/agents/facebook.png | 0 data/pixmaps/agents/gadu-gadu.png | 0 data/pixmaps/agents/http-ws.png | 0 data/pixmaps/agents/icq.png | 0 data/pixmaps/agents/irc.png | 0 data/pixmaps/agents/jabber.png | 0 data/pixmaps/agents/jud.png | 0 data/pixmaps/agents/mail.png | 0 data/pixmaps/agents/mrim.png | 0 data/pixmaps/agents/msn.png | 0 data/pixmaps/agents/pubsub.png | 0 data/pixmaps/agents/rss.png | 0 data/pixmaps/agents/sip.png | 0 data/pixmaps/agents/sms.png | 0 data/pixmaps/agents/tv.png | 0 data/pixmaps/agents/weather.png | 0 data/pixmaps/agents/yahoo.png | 0 data/pixmaps/events/chat_msg_recv.png | 0 data/pixmaps/events/connection_lost.png | 0 data/pixmaps/events/ft_done.png | 0 data/pixmaps/events/ft_error.png | 0 data/pixmaps/events/ft_request.png | 0 data/pixmaps/events/ft_stopped.png | 0 data/pixmaps/events/gc_invitation.png | 0 data/pixmaps/events/new_email_recv.png | 0 data/pixmaps/events/priv_msg_recv.png | 0 data/pixmaps/events/single_msg_recv.png | 0 data/pixmaps/events/subscription_request.png | 0 data/pixmaps/events/unsubscribed.png | 0 data/pixmaps/gajim.icns | 0 data/pixmaps/gajim.png | 0 data/pixmaps/gajim.svg | 444 - data/pixmaps/gajim_about.png | 0 data/pixmaps/kbd_input.png | 0 data/pixmaps/muc_separator.png | 0 data/pixmaps/person.png | 0 data/pixmaps/receipt_missing.png | 0 data/pixmaps/security-high-big.png | 0 data/pixmaps/security-high.png | 0 data/pixmaps/security-low-big.png | 0 data/pixmaps/security-low.png | 0 data/pixmaps/upload.png | 0 debian/changelog | 34 + debian/compat | 2 +- debian/control | 16 +- debian/copyright | 8 +- debian/gajim.lintian | 1 - debian/gajim.manpages | 2 + debian/rules | 1 - gajim.nsi | 12 +- icons/Makefile.am | 7 + icons/hicolor/128x128/apps/gajim-about.png | 0 icons/hicolor/16x16/actions/gajim-cam_active.png | 0 icons/hicolor/16x16/actions/gajim-cam_inactive.png | 0 icons/hicolor/16x16/actions/gajim-earth.png | 0 icons/hicolor/16x16/actions/gajim-kbd_input.png | 0 icons/hicolor/16x16/actions/gajim-mic_active.png | 0 icons/hicolor/16x16/actions/gajim-mic_inactive.png | 0 icons/hicolor/16x16/actions/gajim-muc_separator.png | 0 icons/hicolor/16x16/actions/gajim-receipt_missing.png | 0 icons/hicolor/16x16/actions/gajim-security_high.png | 0 icons/hicolor/16x16/actions/gajim-security_low.png | 0 icons/hicolor/16x16/actions/gajim-upload.png | 0 icons/hicolor/32x32/categories/gajim-agent-aim.png | 0 icons/hicolor/32x32/categories/gajim-agent-bytestreams.png | 0 icons/hicolor/32x32/categories/gajim-agent-conference.png | 0 icons/hicolor/32x32/categories/gajim-agent-disc.png | 0 icons/hicolor/32x32/categories/gajim-agent-error.png | 0 icons/hicolor/32x32/categories/gajim-agent-facebook.png | 0 icons/hicolor/32x32/categories/gajim-agent-gadu-gadu.png | 0 icons/hicolor/32x32/categories/gajim-agent-http-ws.png | 0 icons/hicolor/32x32/categories/gajim-agent-icq.png | 0 icons/hicolor/32x32/categories/gajim-agent-irc.png | 0 icons/hicolor/32x32/categories/gajim-agent-jabber.png | 0 icons/hicolor/32x32/categories/gajim-agent-jud.png | 0 icons/hicolor/32x32/categories/gajim-agent-mail.png | 0 icons/hicolor/32x32/categories/gajim-agent-mrim.png | 0 icons/hicolor/32x32/categories/gajim-agent-msn.png | 0 icons/hicolor/32x32/categories/gajim-agent-pubsub.png | 0 icons/hicolor/32x32/categories/gajim-agent-rss.png | 0 icons/hicolor/32x32/categories/gajim-agent-sip.png | 0 icons/hicolor/32x32/categories/gajim-agent-sms.png | 0 icons/hicolor/32x32/categories/gajim-agent-tv.png | 0 icons/hicolor/32x32/categories/gajim-agent-weather.png | 0 icons/hicolor/32x32/categories/gajim-agent-yahoo.png | 0 icons/hicolor/48x48/actions/gajim-chat_msg_recv.png | 0 icons/hicolor/48x48/actions/gajim-connection_lost.png | 0 icons/hicolor/48x48/actions/gajim-ft_done.png | 0 icons/hicolor/48x48/actions/gajim-ft_error.png | 0 icons/hicolor/48x48/actions/gajim-ft_request.png | 0 icons/hicolor/48x48/actions/gajim-ft_stopped.png | 0 icons/hicolor/48x48/actions/gajim-gc_invitation.png | 0 icons/hicolor/48x48/actions/gajim-new_email_recv.png | 0 icons/hicolor/48x48/actions/gajim-priv_msg_recv.png | 0 icons/hicolor/48x48/actions/gajim-security_high.png | 0 icons/hicolor/48x48/actions/gajim-security_low.png | 0 icons/hicolor/48x48/actions/gajim-single_msg_recv.png | 0 icons/hicolor/48x48/actions/gajim-subscription_request.png | 0 icons/hicolor/48x48/actions/gajim-unsubscribed.png | 0 icons/hicolor/64x64/apps/gajim.png | 0 icons/hicolor/index.theme | 1662 + icons/hicolor/scalable/apps/gajim.svg | 444 + launch.sh | 2 +- po/be.po | 4382 ++- po/be@latin.po | 4379 ++- po/bg.po | 4201 +- po/br.po | 4400 ++-- po/cs.po | 6270 ++--- po/da.po | 4962 ++-- po/de.po | 6586 ++--- po/el.po | 4427 ++-- po/en_GB.po | 4796 ++-- po/eo.po | 4375 ++- po/es.po | 5122 ++-- po/eu.po | 4395 ++-- po/fr.po | 4747 ++-- po/gl.po | 4835 ++-- po/hr.po | 4784 ++-- po/it.po | 4379 ++- po/lt.po | 6409 ++--- po/nb.po | 4806 ++-- po/nl.po | 4439 ++-- po/no.po | 4806 ++-- po/pl.po | 6705 ++--- po/pt.po | 4437 ++-- po/pt_BR.po | 5347 ++-- po/ru.po | 4485 ++-- po/sk.po | 4203 +- po/sr.po | 4761 ++-- po/sr@Latn.po | 4775 ++-- po/sv.po | 4513 ++-- po/uk.po | 4535 ++-- po/zh_CN.po | 4357 ++- scripts/dev/run-build-test.py | 15 +- scripts/dev/run-pylint.py | 6 +- scripts/gajim.in | 8 +- setup_win32.py | 41 +- src/Makefile.am | 69 +- src/adhoc_commands.py | 826 +- src/advanced_configuration_window.py | 432 +- src/atom_window.py | 182 +- src/cell_renderer_image.py | 194 +- src/chat_control.py | 5655 ++-- src/command_system/__init__.py | 8 +- src/command_system/dispatching.py | 9 +- src/command_system/errors.py | 14 +- src/command_system/framework.py | 186 +- src/command_system/implementation/__init__.py | 7 +- src/command_system/implementation/custom.py | 36 +- src/command_system/implementation/hosts.py | 18 +- src/command_system/implementation/middleware.py | 22 +- src/command_system/implementation/standard.py | 128 +- src/command_system/mapping.py | 206 +- src/common/GnuPG.py | 364 +- src/common/GnuPGInterface.py | 64 +- src/common/__init__.py | 2 - src/common/account.py | 35 + src/common/atom.py | 213 +- src/common/caps.py | 398 - src/common/caps_cache.py | 403 + src/common/check_paths.py | 405 +- src/common/commands.py | 662 +- src/common/config.py | 1278 +- src/common/configpaths.py | 204 +- src/common/connection.py | 3859 +- src/common/connection_handlers.py | 4797 +-- src/common/contacts.py | 1335 +- src/common/crypto.py | 88 +- src/common/dataforms.py | 906 +- src/common/dbus_support.py | 239 +- src/common/defs.py | 8 +- src/common/dh.py | 57 +- src/common/events.py | 521 +- src/common/exceptions.py | 136 +- src/common/fuzzyclock.py | 60 +- src/common/gajim.py | 468 +- src/common/ged.py | 64 + src/common/helpers.py | 2192 +- src/common/i18n.py | 93 +- src/common/idle.py | 113 +- src/common/jingle.py | 1219 +- src/common/jingle_content.py | 140 + src/common/jingle_rtp.py | 351 + src/common/jingle_session.py | 654 + src/common/jingle_transport.py | 148 + src/common/kwalletbinding.py | 84 +- src/common/latex.py | 175 +- src/common/location_listener.py | 137 + src/common/logger.py | 1747 +- src/common/logging_helpers.py | 252 +- src/common/meta.py | 36 - src/common/multimedia_helpers.py | 98 + src/common/optparser.py | 1507 +- src/common/passwords.py | 322 +- src/common/pep.py | 1126 +- src/common/protocol/__init__.py | 3 + src/common/protocol/bytestream.py | 649 + src/common/protocol/caps.py | 109 + src/common/proxy65_manager.py | 741 +- src/common/pubsub.py | 284 +- src/common/resolver.py | 541 +- src/common/rst_xhtml_generator.py | 225 +- src/common/sleepy.py | 168 +- src/common/socks5.py | 2010 +- src/common/stanza_session.py | 1538 +- src/common/xmpp/__init__.py | 2 - src/common/xmpp/auth_nb.py | 1010 +- src/common/xmpp/bosh.py | 856 +- src/common/xmpp/c14n.py | 61 +- src/common/xmpp/client_nb.py | 974 +- src/common/xmpp/dispatcher_nb.py | 990 +- src/common/xmpp/features_nb.py | 293 +- src/common/xmpp/idlequeue.py | 866 +- src/common/xmpp/plugin.py | 135 +- src/common/xmpp/protocol.py | 1864 +- src/common/xmpp/proxy_connectors.py | 396 +- src/common/xmpp/roster_nb.py | 547 +- src/common/xmpp/simplexml.py | 1071 +- src/common/xmpp/stringprepare.py | 263 +- src/common/xmpp/tls_nb.py | 664 +- src/common/xmpp/transports_nb.py | 1205 +- src/common/zeroconf/__init__.py | 2 - src/common/zeroconf/client_zeroconf.py | 1329 +- src/common/zeroconf/connection_handlers_zeroconf.py | 544 +- src/common/zeroconf/connection_zeroconf.py | 803 +- src/common/zeroconf/roster_zeroconf.py | 231 +- src/common/zeroconf/zeroconf.py | 36 +- src/common/zeroconf/zeroconf_avahi.py | 734 +- src/common/zeroconf/zeroconf_bonjour.py | 490 +- src/config.py | 8081 +++--- src/conversation_textview.py | 2250 +- src/dataforms_widget.py | 950 +- src/dialogs.py | 9265 ++++---- src/disco.py | 3695 +- src/eggtrayicon.c | 584 - src/eggtrayicon.h | 80 - src/features_window.py | 427 +- src/filetransfers_window.py | 1668 +- src/gajim-remote.py | 1015 +- src/gajim.py | 4379 +--- src/gajim_themes_window.py | 663 +- src/groupchat_control.py | 4119 +- src/groups.py | 71 +- src/gtkexcepthook.py | 113 +- src/gtkgui_helpers.py | 1710 +- src/gtkspell.py | 1 - src/gui_interface.py | 3627 +++ src/gui_menu_builder.py | 851 +- src/history_manager.py | 992 +- src/history_window.py | 1027 +- src/htmltextview.py | 1637 +- src/ipython_view.py | 949 +- src/message_control.py | 385 +- src/message_textview.py | 494 +- src/message_window.py | 2025 +- src/music_track_listener.py | 478 +- src/negotiation.py | 85 +- src/network_manager_listener.py | 112 +- src/notify.py | 1145 +- src/otr_windows.py | 722 +- src/profile_window.py | 597 +- src/remote_control.py | 1241 +- src/roster_window.py | 11842 +++++----- src/search_window.py | 356 +- src/secrets.py | 122 +- src/session.py | 775 +- src/statusicon.py | 459 +- src/systray.py | 459 - src/tooltips.py | 1296 +- src/trayicon.defs | 59 - src/trayicon.override | 47 - src/trayiconmodule.c | 43 - src/vcard.py | 923 +- test/integration/__init__.py | 6 + test/integration/test_gui_event_integration.py | 191 + test/integration/test_resolver.py | 100 + test/integration/test_roster.py | 203 + test/integration/test_xmpp_client_nb.py | 169 + test/integration/test_xmpp_transports_nb.py | 276 + test/lib/__init__.py | 40 +- test/lib/data.py | 124 +- test/lib/gajim_mocks.py | 200 +- test/lib/mock.py | 10 +- test/lib/notify.py | 10 +- test/lib/xmpp_mocks.py | 136 +- test/runtests.py | 72 +- test/test_caps.py | 154 - test/test_contacts.py | 51 - test/test_misc_interface.py | 224 - test/test_resolver.py | 102 - test/test_roster.py | 209 - test/test_sessions.py | 210 - test/test_xmpp_client_nb.py | 171 - test/test_xmpp_dispatcher_nb.py | 99 - test/test_xmpp_transports_nb.py | 332 - test/unit/__init__.py | 5 + test/unit/test_account.py | 21 + test/unit/test_caps_cache.py | 149 + test/unit/test_contacts.py | 129 + test/unit/test_gui_interface.py | 115 + test/unit/test_protocol_caps.py | 73 + test/unit/test_sessions.py | 212 + test/unit/test_xmpp_dispatcher_nb.py | 97 + test/unit/test_xmpp_transports_nb.py | 78 + 513 files changed, 166349 insertions(+), 164041 deletions(-)

diffs (truncated from 470241 to 300 lines):

diff -r 87f851197d60 -r 1182e1367856 .hgignore --- a/.hgignore Tue Nov 03 17:09:42 2009 +0100 +++ b/.hgignore Sat Feb 27 19:03:07 2010 +0100 @@ -2,13 +2,9 @@ *.orig *.gmo *.in -*.la -*.lo *.m4 *.pyc *.pyo -*.o -*.Plo *~ autom4te.cache data/defs.py @@ -23,6 +19,4 @@ syntax: regexp ^config.* ^config/ -^src/.libs -^src/trayicon.c ^scripts/gajim.* diff -r 87f851197d60 -r 1182e1367856 AUTHORS --- a/AUTHORS Tue Nov 03 17:09:42 2009 +0100 +++ b/AUTHORS Sat Feb 27 19:03:07 2010 +0100 @@ -1,12 +1,8 @@ CURRENT DEVELOPERS:

-Nikos Kouremenos (kourem AT gmail.com) +Alexander Cherniuk (ts33kr AT gmail.com) Yann Leboulanger (asterix AT lagaule.org) -Julien Pivotto (roidelapluie AT gmail.com) Jonathan Schleifer (js-gajim AT webkeks.org) -Travis Shirk (travis AT pobox.com) -Brendan Taylor (whateley AT gmail.com) -Jean-Marie Traissard (jim AT lapin.org)

PAST DEVELOPERS:

@@ -14,3 +10,8 @@ Stephan Erb (steve-e AT h3c.de) Vincent Hanquez (tab AT snarc.org) Dimitur Kirov (dkirov AT gmail.com) +Nikos Kouremenos (kourem AT gmail.com) +Julien Pivotto (roidelapluie AT gmail.com) +Travis Shirk (travis AT pobox.com) +Brendan Taylor (whateley AT gmail.com) +Jean-Marie Traissard (jim AT lapin.org) diff -r 87f851197d60 -r 1182e1367856 ChangeLog --- a/ChangeLog Tue Nov 03 17:09:42 2009 +0100 +++ b/ChangeLog Sat Feb 27 19:03:07 2010 +0100 @@ -15,7 +15,7 @@ * Ability to enable / disable accounts * better URL recognition * groupchat autoreconnect - * Store passwords in KDE wallet is available + * Store passwords in KDE wallet if available * Better MUC errors handling * Fix sound player launch (don't create zombies anymore) * Optional shell like completion @@ -44,7 +44,7 @@ * Improve error messages handling * Totem support for played music * Fix SSL with some servers - * Handle XFCE notification-daemon + * Handle Xfce notification-daemon * Restore old behaviour of click on systray: left click to open events * Network manager 0.7 support * Move logs file under windows to $APPDATA/gajim diff -r 87f851197d60 -r 1182e1367856 Makefile.am --- a/Makefile.am Tue Nov 03 17:09:42 2009 +0100 +++ b/Makefile.am Sat Feb 27 19:03:07 2010 +0100 @@ -1,4 +1,4 @@ -SUBDIRS = src data po +SUBDIRS = src data po icons

ACLOCAL_AMFLAGS = -I m4

@@ -50,7 +50,6 @@ aclocal.m4 \ libtool \ po/POTFILES.in \ - src/trayicon_la-eggtrayicon.loT \ m4/intltool.m4

MAINTAINERCLEANDIRS = \ diff -r 87f851197d60 -r 1182e1367856 README.html --- a/README.html Tue Nov 03 17:09:42 2009 +0100 +++ b/README.html Sat Feb 27 19:03:07 2010 +0100 @@ -4,27 +4,22 @@ <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> <title>Gajim - Read Me</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> </head> <body>

<h1>Gajim Read Me</h1>

-<p> -Welcome to Gajim and thank you for trying out our client. -</p> +<p>Welcome to Gajim and thank you for trying out our client.</p>

<h2>Runtime Requirements</h2> <ul> <li>python2.5 or higher</li> -<li>pygtk2.12 or higher</li> -<li>python-libglade</li> +<li>pygtk2.16 or higher</li> <li>pysqlite2 (if you have python 2.5, you already have this)</li> </ul>

-<p> -<strong>Note to packagers</strong> -Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gnomepythonextras (aka gnome-python-desktop) which is gnome dep, but you will miss gnomekeyring integration. -</p> +<p><strong>Note to packagers</strong> Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gnomepythonextras (aka gnome-python-desktop) which is gnome dep, but you will miss gnomekeyring integration.</p>

<h2>Optional Runtime Requirements</h2> <ul> @@ -34,34 +29,23 @@ <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li> -<li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li> <li>gnome-python-desktop (for GnomeKeyring support)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> <li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li> -<li>python-dbus bindings (>=0.80)</li> -<li>python-sexy to have clickable URLs in chat windows</li> +<li>python-dbus bindings (>=0.81)</li> <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li> </ul>

-<p> -Some distributions also split too much python standard library. -I know SUSE does. In such distros you also need python-xml -the xml lib that *comes* with python and not pyxml or whatever. -</p> +<p>Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.</p>

<h2>Compile-time Requirements</h2> <ul> <li>python-dev</li> <li>python-gtk2-dev</li> -<li>libgtk2.0-dev aka. gtk2-devel</li> -<li>libgtkspell-dev (for the gtkspell module)</li> <li>intltool (>= 0.40.1)</li> </ul>

-<p> -<strong>NOTE:</strong> -If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies. -</p> +<p><strong>NOTE:</strong> If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.</p>

<h2>Installation Procedure</h2> <ol> @@ -72,25 +56,22 @@ <li>su -c make install</li> </ol>

-<p> -To specify what modules to build do: -make help -</p> +<p>To specify what modules to build do:</p> +<pre> + make help +</pre>

-<p> -To specify where to install do: -su -c make PREFIX=custom_path install -</p> +<p>To specify where to install do:</p> +<pre> + su -c make PREFIX=custom_path install +</pre>

<h2>Running Gajim</h2> -<p> -Just do <em>gajim</em> or you can run Gajim from your GNOME/XFCE/KDE/whatever menus.<br/><br/> - -or if you didn't 'make install' you can also run from gajim folder with -<em>./launch.sh</em></p> +<p>Just do <em>gajim</em> or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.<br/><br/> +or if you didn't 'make install' you can also run from gajim folder with<em>./launch.sh</em></p> <hr /> -<h3>Note for svn users</h3> -You will need GNU autotools in order to install Gajim from svn. This includes: +<h3>Note for hg users</h3> +<p>You will need GNU autotools in order to install Gajim from svn. This includes:</p> <ul> <li>automake &gt;= 1.8 </li> <li>autoconf &gt;= 2.59 </li> @@ -98,45 +79,41 @@ <li>intltool-0.40.1 </li> <li>pkgconfig &gt;= 0.19</li> </ul> -</p> -steps to compile gajim: +<p>steps to compile gajim:</p> <pre> $ sh autogen.sh $ ./configure $ make </pre> -Alternatively, if you don't want to install all these packages, you can get a nightly snapshot from <a href="http://www.gajim.org/downloads/snap/">here</a> and procede as usual: +<p>Alternatively, if you don't want to install all these packages, you can get a nightly snapshot from <a href="http://www.gajim.org/downloads/snap/">here</a> and procede as usual:</p> <pre> $ ./configure $ make </pre> <h2>Uninstallation Procedure</h2> -<p> -su -c make uninstall<br/> -this will try to remove Gajim from the default directories. -If you want to remove it from custom directory provide it as:<br/> -make PREFIX=custom_path uninstall +<pre> + su -c make uninstall +</pre> +<p>this will try to remove Gajim from the default directories. +If you want to remove it from custom directory provide it as: </p> +<pre> + make PREFIX=custom_path uninstall +</pre>

<h2>Miscellaneous</h2> <h3>XML &amp; Debugging</h3> -<p> -If you want to see the xml stanzas and/or help us debugging +<p>If you want to see the xml stanzas and/or help us debugging you're advised to enable verbose via advanced configuration window. If you don't want to make this permanent, execute gajim with --verbose -everytime you want to have verbose output. -</p> +everytime you want to have verbose output.</p>

<h3>FAQ/Wiki</h3> -<p> -FAQ can be found at <a href="http://trac.gajim.org/wiki/GajimFaq">http://trac.gajim.org/wiki/GajimFaq</a><br/> -Wiki can be found at <a href="http://trac.gajim.org/wiki">http://trac.gajim.org/wiki</a> -</p> +<p>FAQ can be found at <a href="http://trac.gajim.org/wiki/GajimFaq">http://trac.gajim.org/wiki/GajimFaq</a><br/> +Wiki can be found at <a href="http://trac.gajim.org/wiki">http://trac.gajim.org/wiki</a></p>

-<p> -That is all, <strong>enjoy!</strong> -</p> +<p>That is all, <strong>enjoy!</strong></p>

<p> <br/> @@ -152,6 +129,5 @@ We use original art and parts of sounds and other art from Psi, Gossip, Gnomebaker, Gaim and some icons from various gnome-icons (mostly Dropline Etiquette) we found at art.gnome.org -If you think we're violating a license please inform us. Thank you. -</p> +If you think we're violating a license please inform us. Thank you.</p> </body></html> diff -r 87f851197d60 -r 1182e1367856 THANKS.artists --- a/THANKS.artists Tue Nov 03 17:09:42 2009 +0100 +++ b/THANKS.artists Sat Feb 27 19:03:07 2010 +0100 @@ -1,10 +1,10 @@ Anders Ström Christophe Got Dennis Craven +Dmitry Korzhevin Guillaume Morin Gvorcek Spajreh Josef Vybíral Membris Khan Rederick Asher Jakub Szypulka - diff -r 87f851197d60 -r 1182e1367856 autogen.sh --- a/autogen.sh Tue Nov 03 17:09:42 2009 +0100 +++ b/autogen.sh Sat Feb 27 19:03:07 2010 +0100 @@ -8,7 +8,7 @@ fi

echo "[encoding: UTF-8]" > po/POTFILES.in \ - && ls -1 data/gajim.desktop.in.in data/glade/*.glade \ + && ls -1 data/gajim.desktop.in.in data/gui/*.ui \ src/*py src/common/*py src/common/zeroconf/*.py | grep -v ipython_view.py >> \ po/POTFILES.in || exit 1 if test -z `which pkg-config 2>/dev/null`;then diff -r 87f851197d60 -r 1182e1367856 configure.ac --- a/configure.ac Tue Nov 03 17:09:42 2009 +0100 +++ b/configure.ac Sat Feb 27 19:03:07 2010 +0100 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager],