Commits May 2010

commits@gajim.org

6 participants
37 discussions

gajim: fix installation procedure to choose dest folder
by Yann Leboulanger 26 May '10

26 May '10

changeset ba59d9f1b8d9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ba59d9f1b8d9 description: fix installation procedure to choose dest folder diffstat: README.html | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (22 lines): diff -r 0809f947fd8b -r ba59d9f1b8d9 README.html --- a/README.html Tue May 25 09:47:44 2010 +0200 +++ b/README.html Wed May 26 08:59:01 2010 +0200 @@ -63,7 +63,7 @@ <p>To specify where to install do:</p> <pre> - su -c make PREFIX=custom_path install + ./configure --prefix=custom_path </pre> <h2>Running Gajim</h2> @@ -98,7 +98,8 @@ If you want to remove it from custom directory provide it as: </p> <pre> - make PREFIX=custom_path uninstall + ./configure --prefix=custom_path + make uninstall </pre> <h2>Miscellaneous</h2>

1 0

gajim: merge from trunk
by Yann Leboulanger 25 May '10

25 May '10

changeset 9c17bf82e36a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9c17bf82e36a description: merge from trunk diffstat: AUTHORS | 10 +- ChangeLog | 2 +- Makefile.am | 2 +- README.html | 93 +- README.transifex | 11 + autogen.sh | 4 +- configure.ac | 31 +- data/Makefile.am | 4 +- data/activities/Makefile.am | 36 +- data/defs.py.in | 2 +- data/emoticons/Makefile.am | 39 +- 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 | 87 - data/glade/advanced_notifications_window.glade | 865 - data/glade/archiving_preferences_window.glade | 230 - 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 | 421 - 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/item_archiving_preferences_window.glade | 177 - 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/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 | 140 - 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 | 1485 + data/gui/add_new_contact_window.ui | 391 + data/gui/adhoc_commands_window.ui | 450 + data/gui/advanced_configuration_window.ui | 153 + data/gui/advanced_menuitem_menu.ui | 85 + data/gui/advanced_notifications_window.ui | 951 + data/gui/archiving_preferences_window.ui | 312 + 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 | 181 + data/gui/choose_gpg_key_dialog.ui | 104 + data/gui/contact_context_menu.ui | 399 + 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 | 118 + data/gui/input_text_dialog.ui | 125 + data/gui/item_archiving_preferences_window.ui | 227 + 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/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 | 1165 + 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 | 244 + 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/cam_active.png | 0 data/pixmaps/cam_inactive.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/mic_active.png | 0 data/pixmaps/mic_inactive.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 | 50 + debian/compat | 2 +- debian/control | 16 +- debian/copyright | 10 +- debian/gajim.lintian | 1 - debian/gajim.manpages | 2 + debian/rules | 1 - gajim.nsi | 8 +- 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 + po/LINGUAS | 2 + po/be.po | 7448 +++--- po/be(a)latin.po | 7457 +++--- po/bg.po | 7308 +++--- po/br.po | 7406 +++--- po/cs.po | 7745 ++++--- po/da.po | 8009 ++++--- po/de.po | 7769 ++++--- po/el.po | 7478 +++--- po/en_GB.po | 7929 ++++--- po/eo.po | 7443 +++--- po/es.po | 7796 ++++--- po/eu.po | 7473 +++--- po/fr.po | 9432 ++++----- po/gl.po | 7485 +++--- po/hr.po | 7889 ++++--- po/it.po | 7445 +++--- po/ja.po | 10374 ++++++++++ po/kk.po | 9715 +++++++++ po/lt.po | 9401 ++++---- po/nb.po | 7906 ++++--- po/nl.po | 10892 +++++----- po/no.po | 7906 ++++--- po/pl.po | 7849 ++++--- po/pt.po | 7458 +++--- po/pt_BR.po | 7770 ++++--- po/ru.po | 9067 ++++---- po/sk.po | 8335 ++++---- po/sr.po | 7854 ++++--- po/sr(a)Latn.po | 7873 ++++--- po/sv.po | 7647 ++++--- po/tr.po | 9439 +++++++++ po/uk.po | 9131 ++++---- po/zh_CN.po | 7406 +++--- scripts/dev/run-pylint.py | 2 +- scripts/gajim.in | 7 +- setup_win32.py | 2 +- src/Makefile.am | 40 +- src/adhoc_commands.py | 110 +- src/advanced_configuration_window.py | 20 +- src/atom_window.py | 54 +- src/cell_renderer_image.py | 2 +- src/chat_control.py | 512 +- src/command_system/__init__.py | 8 +- src/command_system/dispatching.py | 9 +- src/command_system/errors.py | 20 +- src/command_system/framework.py | 192 +- src/command_system/implementation/__init__.py | 7 +- src/command_system/implementation/custom.py | 40 +- src/command_system/implementation/hosts.py | 18 +- src/command_system/implementation/middleware.py | 56 +- src/command_system/implementation/standard.py | 128 +- src/command_system/mapping.py | 206 +- src/common/GnuPG.py | 11 +- src/common/GnuPGInterface.py | 64 +- src/common/account.py | 5 +- src/common/atom.py | 55 +- src/common/caps.py | 434 - src/common/caps_cache.py | 403 + src/common/check_paths.py | 268 +- src/common/commands.py | 83 +- src/common/config.py | 27 +- src/common/configpaths.py | 142 +- src/common/connection.py | 447 +- src/common/connection_handlers.py | 986 +- src/common/contacts.py | 240 +- src/common/dataforms.py | 134 +- src/common/dbus_support.py | 31 +- src/common/defs.py | 8 +- src/common/dh.py | 9 +- src/common/events.py | 95 +- src/common/exceptions.py | 72 +- src/common/fuzzyclock.py | 6 +- src/common/gajim.py | 98 +- src/common/ged.py | 64 + src/common/helpers.py | 274 +- src/common/i18n.py | 45 +- src/common/idle.py | 5 +- src/common/jingle.py | 85 +- src/common/jingle_content.py | 84 +- src/common/jingle_rtp.py | 230 +- src/common/jingle_session.py | 398 +- src/common/jingle_transport.py | 32 +- src/common/kwalletbinding.py | 12 +- src/common/latex.py | 7 +- src/common/location_listener.py | 150 + src/common/logger.py | 245 +- src/common/logging_helpers.py | 6 +- src/common/multimedia_helpers.py | 101 + src/common/optparser.py | 111 +- src/common/passwords.py | 2 +- src/common/pep.py | 128 +- src/common/protocol/__init__.py | 3 + src/common/protocol/bytestream.py | 649 + src/common/protocol/caps.py | 109 + src/common/proxy65_manager.py | 70 +- src/common/pubsub.py | 22 +- src/common/resolver.py | 63 +- src/common/rst_xhtml_generator.py | 41 +- src/common/sleepy.py | 10 +- src/common/socks5.py | 192 +- src/common/stanza_session.py | 76 +- src/common/xmpp/auth_nb.py | 231 +- src/common/xmpp/bosh.py | 68 +- src/common/xmpp/c14n.py | 5 +- src/common/xmpp/client_nb.py | 157 +- src/common/xmpp/dispatcher_nb.py | 189 +- src/common/xmpp/features_nb.py | 69 +- src/common/xmpp/idlequeue.py | 174 +- src/common/xmpp/plugin.py | 31 +- src/common/xmpp/protocol.py | 1178 +- src/common/xmpp/proxy_connectors.py | 54 +- src/common/xmpp/roster_nb.py | 263 +- src/common/xmpp/simplexml.py | 537 +- src/common/xmpp/stringprepare.py | 53 +- src/common/xmpp/tls_nb.py | 90 +- src/common/xmpp/transports_nb.py | 181 +- src/common/zeroconf/client_zeroconf.py | 86 +- src/common/zeroconf/connection_handlers_zeroconf.py | 46 +- src/common/zeroconf/connection_zeroconf.py | 29 +- src/common/zeroconf/roster_zeroconf.py | 7 +- src/common/zeroconf/zeroconf_bonjour.py | 22 +- src/config.py | 1035 +- src/conversation_textview.py | 51 +- src/dataforms_widget.py | 28 +- src/dialogs.py | 1003 +- src/disco.py | 176 +- src/features_window.py | 27 +- src/filetransfers_window.py | 151 +- src/gajim-remote.py | 15 +- src/gajim.py | 158 +- src/gajim_themes_window.py | 44 +- src/groupchat_control.py | 717 +- src/groups.py | 12 +- src/gtkexcepthook.py | 3 +- src/gtkgui_helpers.py | 189 +- src/gui_interface.py | 1332 +- src/gui_menu_builder.py | 79 +- src/history_manager.py | 49 +- src/history_window.py | 116 +- src/htmltextview.py | 51 +- src/ipython_view.py | 149 +- src/message_control.py | 107 +- src/message_textview.py | 105 +- src/message_window.py | 151 +- src/music_track_listener.py | 2 +- src/negotiation.py | 15 +- src/network_manager_listener.py | 14 +- src/notify.py | 280 +- src/profile_window.py | 72 +- src/remote_control.py | 177 +- src/roster_window.py | 2038 +- src/search_window.py | 15 +- src/session.py | 48 +- src/statusicon.py | 92 +- src/tooltips.py | 216 +- src/vcard.py | 131 +- test/integration/test_gui_event_integration.py | 2 +- test/integration/test_roster.py | 2 +- test/lib/__init__.py | 2 +- test/runtests.py | 5 +- test/unit/test_caps.py | 150 - test/unit/test_caps_cache.py | 149 + test/unit/test_contacts.py | 10 +- test/unit/test_gui_interface.py | 5 +- test/unit/test_protocol_caps.py | 73 + 427 files changed, 192604 insertions(+), 149387 deletions(-) diffs (truncated from 527841 to 300 lines): diff -r 1dc7fe252dec -r 9c17bf82e36a AUTHORS --- a/AUTHORS Thu Apr 08 01:20:22 2010 +0200 +++ b/AUTHORS Tue May 25 16:33:40 2010 +0200 @@ -1,13 +1,8 @@ CURRENT DEVELOPERS: Alexander Cherniuk (ts33kr AT gmail.com) -Nikos Kouremenos (kourem 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: @@ -15,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 1dc7fe252dec -r 9c17bf82e36a ChangeLog --- a/ChangeLog Thu Apr 08 01:20:22 2010 +0200 +++ b/ChangeLog Tue May 25 16:33:40 2010 +0200 @@ -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 1dc7fe252dec -r 9c17bf82e36a Makefile.am --- a/Makefile.am Thu Apr 08 01:20:22 2010 +0200 +++ b/Makefile.am Tue May 25 16:33:40 2010 +0200 @@ -1,4 +1,4 @@ -SUBDIRS = src data po +SUBDIRS = src data po icons ACLOCAL_AMFLAGS = -I m4 diff -r 1dc7fe252dec -r 9c17bf82e36a README.html --- a/README.html Thu Apr 08 01:20:22 2010 +0200 +++ b/README.html Tue May 25 16:33:40 2010 +0200 @@ -4,31 +4,26 @@ <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.16 or higher</li> -<li>python-libglade</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> -<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> +<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) (>=0.9) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> <li>python-crypto to enable End to end encryption</li> <li>For idle module, libxss library</li> <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> @@ -37,16 +32,11 @@ <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> @@ -55,10 +45,7 @@ <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> @@ -69,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 >= 1.8 </li> <li>autoconf >= 2.59 </li> @@ -95,51 +79,47 @@ <li>intltool-0.40.1 </li> <li>pkgconfig >= 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 & 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/> <br/> <br/> -(C) 2003-200888888888<br/> +(C) 2003-2010<br/> The Gajim Team<br/> http://gajim.org<br/> <br/> @@ -149,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 1dc7fe252dec -r 9c17bf82e36a README.transifex --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README.transifex Tue May 25 16:33:40 2010 +0200 @@ -0,0 +1,11 @@ +Transifex.net Token Verification +================================= + +The list of tokens bellow guarantee the respective users to be able to enable +submission on components using the following repository url: + +ssh://hg.gajim.org/gajim + +Tokens: + +JzQjKFEfvEhybB3vKxvsNYfusnpxWth3 / asterix diff -r 1dc7fe252dec -r 9c17bf82e36a autogen.sh --- a/autogen.sh Thu Apr 08 01:20:22 2010 +0200 +++ b/autogen.sh Tue May 25 16:33:40 2010 +0200 @@ -8,7 +8,9 @@ fi echo "[encoding: UTF-8]" > po/POTFILES.in \ - && ls -1 data/gajim.desktop.in.in data/glade/*.glade \ + && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ + po/POTFILES.in; done \ + && ls -1 data/gajim.desktop.in.in \ 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 1dc7fe252dec -r 9c17bf82e36a configure.ac --- a/configure.ac Thu Apr 08 01:20:22 2010 +0200 +++ b/configure.ac Tue May 25 16:33:40 2010 +0200 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.13.0.1-dev],[http://trac.gajim.org/],[gajim]) + [0.13.10.2-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) @@ -56,8 +56,21 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) AC_SUBST([PYTHON_INCLUDES]) -AS_AC_EXPAND(DATADIR, "${datadir}") -AS_AC_EXPAND(LIBDIR, "${libdir}") +dnl **** +dnl enable installation in python-2.x/site-packages/gajim +dnl **** +AC_ARG_ENABLE(site-packages, + [AS_HELP_STRING([--enable-site-packages], + [install gajim sources in PYTHONDIR/site-packages/gajim +instead of DATADIR/gajim/src.])] +, +AC_SUBST([gajim_srcdir], [\${pkgpythondir}]) +, +AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src]) +) + +AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}") +AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}") AS_AC_EXPAND(DOCDIR, "${docdir}") AS_AC_EXPAND(LOCALEDIR, "${localedir}") @@ -67,12 +80,13 @@ AC_CONFIG_FILES([ Makefile data/Makefile - data/glade/Makefile + data/gui/Makefile

1 0

gajim: merge
by Yann Leboulanger 25 May '10

25 May '10

changeset 0809f947fd8b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0809f947fd8b description: merge diffstat: src/message_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r bcfc58b1f0ce -r 0809f947fd8b src/message_window.py --- a/src/message_window.py Tue May 25 09:46:12 2010 +0200 +++ b/src/message_window.py Tue May 25 09:47:44 2010 +0200 @@ -144,7 +144,7 @@ self.notebook.set_show_border(gajim.config.get('tabs_border')) self.show_icon() - gobject.idle_add(lambda: self.notebook.grab_focus()) + gobject.idle_add(self.notebook.grab_focus) def change_account_name(self, old_name, new_name): if old_name in self._controls:

1 0

gajim: prevent traceback when atom entry has no title
by Yann Leboulanger 25 May '10

25 May '10

changeset bcfc58b1f0ce in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bcfc58b1f0ce description: prevent traceback when atom entry has no title diffstat: src/atom_window.py | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diffs (26 lines): diff -r df6802e9ac10 -r bcfc58b1f0ce src/atom_window.py --- a/src/atom_window.py Tue May 25 09:36:30 2010 +0200 +++ b/src/atom_window.py Tue May 25 09:46:12 2010 +0200 @@ -94,13 +94,16 @@ u'<small>%s</small>' % \ gobject.markup_escape_text(newentry.feed_tagline)) - if newentry.uri is not None: - self.entry_title_label.set_markup( - u'<span foreground="blue" underline="single">%s</span>' % \ - gobject.markup_escape_text(newentry.title)) + if newentry.title: + if newentry.uri is not None: + self.entry_title_label.set_markup( + u'<span foreground="blue" underline="single">%s</span>' % \ + gobject.markup_escape_text(newentry.title)) + else: + self.entry_title_label.set_markup( + gobject.markup_escape_text(newentry.title)) else: - self.entry_title_label.set_markup( - gobject.markup_escape_text(newentry.title)) + self.entry_title_label.set_markup('') self.last_modified_label.set_text(newentry.updated)

1 0

gajim: fix indentation
by Yann Leboulanger 25 May '10

25 May '10

changeset df6802e9ac10 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=df6802e9ac10 description: fix indentation diffstat: src/atom_window.py | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diffs (73 lines): diff -r ef758321c654 -r df6802e9ac10 src/atom_window.py --- a/src/atom_window.py Tue May 25 09:33:59 2010 +0200 +++ b/src/atom_window.py Tue May 25 09:36:30 2010 +0200 @@ -53,15 +53,16 @@ """ Create new window... only if we have anything to show """ - assert len(self.__class__.entries)>0 + assert len(self.__class__.entries) - self.entry = None # the entry actually displayed + self.entry = None # the entry actually displayed self.xml = gtkgui_helpers.get_gtk_builder('atom_entry_window.ui') self.window = self.xml.get_object('atom_entry_window') - for name in ('new_entry_label', 'feed_title_label', 'feed_title_eventbox', - 'feed_tagline_label', 'entry_title_label', 'entry_title_eventbox', - 'last_modified_label', 'close_button', 'next_button'): + for name in ('new_entry_label', 'feed_title_label', + 'feed_title_eventbox', 'feed_tagline_label', 'entry_title_label', + 'entry_title_eventbox', 'last_modified_label', 'close_button', + 'next_button'): self.__dict__[name] = self.xml.get_object(name) self.displayNextEntry() @@ -83,23 +84,23 @@ # fill the fields if newentry.feed_link is not None: self.feed_title_label.set_markup( - u'<span foreground="blue" underline="single">%s</span>' % \ - gobject.markup_escape_text(newentry.feed_title)) + u'<span foreground="blue" underline="single">%s</span>' % \ + gobject.markup_escape_text(newentry.feed_title)) else: self.feed_title_label.set_markup( - gobject.markup_escape_text(newentry.feed_title)) + gobject.markup_escape_text(newentry.feed_title)) self.feed_tagline_label.set_markup( - u'<small>%s</small>' % \ - gobject.markup_escape_text(newentry.feed_tagline)) + u'<small>%s</small>' % \ + gobject.markup_escape_text(newentry.feed_tagline)) if newentry.uri is not None: self.entry_title_label.set_markup( - u'<span foreground="blue" underline="single">%s</span>' % \ - gobject.markup_escape_text(newentry.title)) + u'<span foreground="blue" underline="single">%s</span>' % \ + gobject.markup_escape_text(newentry.title)) else: self.entry_title_label.set_markup( - gobject.markup_escape_text(newentry.title)) + gobject.markup_escape_text(newentry.title)) self.last_modified_label.set_text(newentry.updated) @@ -114,11 +115,11 @@ changed """ count = len(self.__class__.entries) - if count>0: + if count: self.new_entry_label.set_text(i18n.ngettext( - 'You have received new entries (and %d not displayed):', - 'You have received new entries (and %d not displayed):', count, - count, count)) + 'You have received new entries (and %d not displayed):', + 'You have received new entries (and %d not displayed):', count, + count, count)) self.next_button.set_sensitive(True) else: self.new_entry_label.set_text(_('You have received new entry:'))

1 0

gajim: check that pubsub messages have a Atom namespace before p...
by Yann Leboulanger 25 May '10

25 May '10

changeset ef758321c654 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ef758321c654 description: check that pubsub messages have a Atom namespace before presenting them to the user. Fixes #5757 diffstat: src/common/pep.py | 2 +- src/common/xmpp/protocol.py | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diffs (23 lines): diff -r 75c7b21c6bed -r ef758321c654 src/common/pep.py --- a/src/common/pep.py Tue May 25 09:01:06 2010 +0200 +++ b/src/common/pep.py Tue May 25 09:33:59 2010 +0200 @@ -544,7 +544,7 @@ items = event_tag.getTag('items') if items: for item in items.getTags('item'): - entry = item.getTag('entry') + entry = item.getTag('entry', namespace=xmpp.NS_ATOM) if entry: # for each entry in feed (there shouldn't be more than one, # but to be sure... diff -r 75c7b21c6bed -r ef758321c654 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Tue May 25 09:01:06 2010 +0200 +++ b/src/common/xmpp/protocol.py Tue May 25 09:33:59 2010 +0200 @@ -28,6 +28,7 @@ NS_AGENTS ='jabber:iq:agents' NS_AMP ='http://jabber.org/protocol/amp' NS_AMP_ERRORS =NS_AMP+'#errors' +NS_ATOM ='http://www.w3.org/2005/Atom' NS_AUTH ='jabber:iq:auth' NS_AVATAR ='http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' NS_BIND ='urn:ietf:params:xml:ns:xmpp-bind'

1 0

gajim: Removed an excess lambda
by Alexander Cherniuk 25 May '10

25 May '10

changeset 1bd09f457f40 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1bd09f457f40 description: Removed an excess lambda diffstat: src/message_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 75c7b21c6bed -r 1bd09f457f40 src/message_window.py --- a/src/message_window.py Tue May 25 09:01:06 2010 +0200 +++ b/src/message_window.py Tue May 25 10:26:42 2010 +0300 @@ -144,7 +144,7 @@ self.notebook.set_show_border(gajim.config.get('tabs_border')) self.show_icon() - gobject.idle_add(lambda: self.notebook.grab_focus()) + gobject.idle_add(self.notebook.grab_focus) def change_account_name(self, old_name, new_name): if old_name in self._controls:

1 0

gajim: fix function names in atom window
by Yann Leboulanger 25 May '10

25 May '10

changeset 75c7b21c6bed in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=75c7b21c6bed description: fix function names in atom window diffstat: src/atom_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r f0068736dc8a -r 75c7b21c6bed src/atom_window.py --- a/src/atom_window.py Tue May 25 09:00:42 2010 +0200 +++ b/src/atom_window.py Tue May 25 09:01:06 2010 +0200 @@ -131,7 +131,7 @@ def on_next_button_clicked(self, widget): self.displayNextEntry() - def on_entry_title_button_press_event(self, widget, event): + def on_entry_title_eventbox_button_press_event(self, widget, event): #FIXME: make it using special gtk2.10 widget if event.button == 1: # left click uri = self.entry.uri @@ -139,7 +139,7 @@ helpers.launch_browser_mailer('url', uri) return True - def on_feed_title_button_press_event(self, widget, event): + def on_feed_title_eventbox_button_press_event(self, widget, event): #FIXME: make it using special gtk2.10 widget if event.button == 1: # left click uri = self.entry.feed_uri

1 0

gajim: fix arguments list of a on_cancel function
by Yann Leboulanger 25 May '10

25 May '10

changeset f0068736dc8a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f0068736dc8a description: fix arguments list of a on_cancel function diffstat: src/filetransfers_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r cfb9f5baca40 -r f0068736dc8a src/filetransfers_window.py --- a/src/filetransfers_window.py Tue May 25 09:00:14 2010 +0200 +++ b/src/filetransfers_window.py Tue May 25 09:00:42 2010 +0200 @@ -396,7 +396,7 @@ on_response_ok=(on_response_ok, account, contact, file_props), on_response_cancel=(on_response_cancel, account, file_props)) dialog.connect('delete-event', lambda widget, event: - on_response_cancel(widget, account, file_props)) + on_response_cancel(account, file_props)) dialog.popup() def get_icon(self, ident):

1 0

gajim: give focus to chat window after we open if. Fixes #5740
by Yann Leboulanger 25 May '10

25 May '10

changeset cfb9f5baca40 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cfb9f5baca40 description: give focus to chat window after we open if. Fixes #5740 diffstat: src/message_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r d2883c425849 -r cfb9f5baca40 src/message_window.py --- a/src/message_window.py Fri May 21 09:38:09 2010 +0200 +++ b/src/message_window.py Tue May 25 09:00:14 2010 +0200 @@ -144,6 +144,8 @@ self.notebook.set_show_border(gajim.config.get('tabs_border')) self.show_icon() + gobject.idle_add(lambda: self.notebook.grab_focus()) + def change_account_name(self, old_name, new_name): if old_name in self._controls: self._controls[new_name] = self._controls[old_name]

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2010