changeset 168a8e2f1826 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=168a8e2f1826 description: Merged default branch with plugin-system branch. Not all elements are fully functional. This should be considered as sync commit.X-Hg-Repo: gajim Subject: gajim: Merge with latest rev at default branch. From: vardo
changeset ade272936a47 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=ade272936a47 description: Merge with latest rev at default branch. diffstat:
.hgtags | 4 + AUTHORS | 11 +- ChangeLog | 98 +- Makefile.am | 10 +- README.html | 18 +- README.osx | 94 - THANKS.artists | 1 + TODO.pep | 5 - autogen.sh | 2 + autopackage/default.apspec | 2 +- config.h.in | 95 - configure.ac | 102 +- data/Makefile.am | 2 +- data/activities/Makefile.am | 38 + data/activities/default/doing_chores/buying_groceries.png | data/activities/default/doing_chores/category.png | data/activities/default/doing_chores/cleaning.png | data/activities/default/doing_chores/cooking.png | data/activities/default/doing_chores/doing_maintenance.png | data/activities/default/doing_chores/doing_the_dishes.png | data/activities/default/doing_chores/doing_the_laundry.png | data/activities/default/doing_chores/gardening.png | data/activities/default/doing_chores/running_an_errand.png | data/activities/default/doing_chores/walking_the_dog.png | data/activities/default/drinking/category.png | data/activities/default/drinking/having_a_beer.png | data/activities/default/drinking/having_coffee.png | data/activities/default/drinking/having_tea.png | data/activities/default/eating/category.png | data/activities/default/eating/having_a_snack.png | data/activities/default/eating/having_breakfast.png | data/activities/default/eating/having_dinner.png | data/activities/default/eating/having_lunch.png | data/activities/default/exercising/category.png | data/activities/default/exercising/cycling.png | data/activities/default/exercising/dancing.png | data/activities/default/exercising/hiking.png | data/activities/default/exercising/jogging.png | data/activities/default/exercising/playing_sports.png | data/activities/default/exercising/running.png | data/activities/default/exercising/skiing.png | data/activities/default/exercising/swimming.png | data/activities/default/exercising/working_out.png | data/activities/default/grooming/at_the_spa.png | data/activities/default/grooming/brushing_teeth.png | data/activities/default/grooming/category.png | data/activities/default/grooming/getting_a_haircut.png | data/activities/default/grooming/shaving.png | data/activities/default/grooming/taking_a_bath.png | data/activities/default/grooming/taking_a_shower.png | data/activities/default/having_appointment/category.png | data/activities/default/inactive/category.png | data/activities/default/inactive/day_off.png | data/activities/default/inactive/hanging_out.png | data/activities/default/inactive/hiding.png | data/activities/default/inactive/on_vacation.png | data/activities/default/inactive/praying.png | data/activities/default/inactive/scheduled_holiday.png | data/activities/default/inactive/sleeping.png | data/activities/default/inactive/thinking.png | data/activities/default/relaxing/category.png | data/activities/default/relaxing/fishing.png | data/activities/default/relaxing/gaming.png | data/activities/default/relaxing/going_out.png | data/activities/default/relaxing/partying.png | data/activities/default/relaxing/reading.png | data/activities/default/relaxing/rehearsing.png | data/activities/default/relaxing/shopping.png | data/activities/default/relaxing/smoking.png | data/activities/default/relaxing/socializing.png | data/activities/default/relaxing/sunbathing.png | data/activities/default/relaxing/watching_a_movie.png | data/activities/default/relaxing/watching_tv.png | data/activities/default/talking/category.png | data/activities/default/talking/in_real_life.png | data/activities/default/talking/on_the_phone.png | data/activities/default/talking/on_video_phone.png | data/activities/default/traveling/category.png | data/activities/default/traveling/commuting.png | data/activities/default/traveling/cycling.png | data/activities/default/traveling/driving.png | data/activities/default/traveling/in_a_car.png | data/activities/default/traveling/on_a_bus.png | data/activities/default/traveling/on_a_plane.png | data/activities/default/traveling/on_a_train.png | data/activities/default/traveling/on_a_trip.png | data/activities/default/traveling/walking.png | data/activities/default/unknown/category.png | data/activities/default/working/category.png | data/activities/default/working/coding.png | data/activities/default/working/in_a_meeting.png | data/activities/default/working/studying.png | data/activities/default/working/writing.png | data/defs.py.in | 2 + data/emoticons/animated/emoticons.py | 40 +- data/emoticons/animated/puke.gif | data/emoticons/static-big/emoticons.py | 41 +- data/emoticons/static-big/puke.png | data/emoticons/static/emoticons.py | 41 +- data/emoticons/static/puke.png | data/glade/account_creation_wizard_window.glade | 107 +- data/glade/accounts_window.glade | 518 +- data/glade/change_activity_dialog.glade | 294 +- data/glade/change_mood_dialog.glade | 245 +- data/glade/change_status_message_dialog.glade | 604 +- data/glade/chat_control_popup_menu.glade | 45 - data/glade/chat_to_muc_window.glade | 2 +- data/glade/contact_otr_window.glade | 322 - data/glade/esession_info_window.glade | 200 + data/glade/gc_control_popup_menu.glade | 2 +- data/glade/invitation_received_dialog.glade | 221 - data/glade/manage_bookmarks_window.glade | 8 + data/glade/manage_proxies_window.glade | 1055 +- data/glade/manage_sounds_window.glade | 106 + data/glade/message_window.glade | 153 +- data/glade/popup_notification_window.glade | 2 +- data/glade/preferences_window.glade | 271 +- data/glade/roster_contact_context_menu.glade | 39 +- data/glade/roster_window.glade | 13 +- data/glade/service_registration_window.glade | 342 +- data/glade/vcard_information_window.glade | 1768 +- data/glade/zeroconf_properties_window.glade | 683 - data/iconsets/crystal/32x32/muc_active.png | data/iconsets/crystal/32x32/muc_inactive.png | data/iconsets/gossip/32x32/muc_active.png | data/iconsets/gossip/32x32/muc_inactive.png | data/iconsets/nuvola/32x32/muc_active.png | data/iconsets/nuvola/32x32/muc_inactive.png | data/iconsets/simplebulb/32x32/muc_active.png | data/iconsets/simplebulb/32x32/muc_inactive.png | data/iconsets/stellar/32x32/muc_active.png | data/iconsets/stellar/32x32/muc_inactive.png | data/iconsets/transports/mrim/16x16/away.png | data/iconsets/transports/mrim/16x16/chat.png | data/iconsets/transports/mrim/16x16/dnd.png | data/iconsets/transports/mrim/16x16/not_in_roster.png | data/iconsets/transports/mrim/16x16/offline.png | data/iconsets/transports/mrim/16x16/online.png | data/iconsets/transports/mrim/16x16/xa.png | data/iconsets/transports/mrim/32x32/away.png | data/iconsets/transports/mrim/32x32/chat.png | data/iconsets/transports/mrim/32x32/dnd.png | data/iconsets/transports/mrim/32x32/not_in_roster.png | data/iconsets/transports/mrim/32x32/offline.png | data/iconsets/transports/mrim/32x32/online.png | data/iconsets/transports/mrim/32x32/xa.png | data/iconsets/transports/mrim/48x48/offline.png | data/iconsets/transports/mrim/48x48/online.png | data/moods/Makefile.am | 38 + data/moods/default/afraid.png | data/moods/default/amazed.png | data/moods/default/amorous.png | data/moods/default/angry.png | data/moods/default/annoyed.png | data/moods/default/anxious.png | data/moods/default/aroused.png | data/moods/default/ashamed.png | data/moods/default/bored.png | data/moods/default/brave.png | data/moods/default/calm.png | data/moods/default/cautious.png | data/moods/default/cold.png | data/moods/default/confident.png | data/moods/default/confused.png | data/moods/default/contemplative.png | data/moods/default/contented.png | data/moods/default/cranky.png | data/moods/default/crazy.png | data/moods/default/creative.png | data/moods/default/curious.png | data/moods/default/dejected.png | data/moods/default/depressed.png | data/moods/default/disappointed.png | data/moods/default/disgusted.png | data/moods/default/dismayed.png | data/moods/default/distracted.png | data/moods/default/embarrassed.png | data/moods/default/envious.png | data/moods/default/excited.png | data/moods/default/flirtatious.png | data/moods/default/frustrated.png | data/moods/default/grateful.png | data/moods/default/grieving.png | data/moods/default/grumpy.png | data/moods/default/guilty.png | data/moods/default/happy.png | data/moods/default/hopeful.png | data/moods/default/hot.png | data/moods/default/humbled.png | data/moods/default/humiliated.png | data/moods/default/hungry.png | data/moods/default/hurt.png | data/moods/default/impressed.png | data/moods/default/in_awe.png | data/moods/default/in_love.png | data/moods/default/indignant.png | data/moods/default/interested.png | data/moods/default/intoxicated.png | data/moods/default/invincible.png | data/moods/default/jealous.png | data/moods/default/lonely.png | data/moods/default/lost.png | data/moods/default/lucky.png | data/moods/default/mean.png | data/moods/default/moody.png | data/moods/default/nervous.png | data/moods/default/neutral.png | data/moods/default/offended.png | data/moods/default/outraged.png | data/moods/default/playful.png | data/moods/default/proud.png | data/moods/default/relaxed.png | data/moods/default/relieved.png | data/moods/default/remorseful.png | data/moods/default/restless.png | data/moods/default/sad.png | data/moods/default/sarcastic.png | data/moods/default/satisfied.png | data/moods/default/serious.png | data/moods/default/shocked.png | data/moods/default/shy.png | data/moods/default/sick.png | data/moods/default/sleepy.png | data/moods/default/spontaneous.png | data/moods/default/stressed.png | data/moods/default/strong.png | data/moods/default/surprised.png | data/moods/default/thankful.png | data/moods/default/thirsty.png | data/moods/default/tired.png | data/moods/default/undefined.png | data/moods/default/unknown.png | data/moods/default/weak.png | data/moods/default/worried.png | data/other/servers.xml | 8 +- data/pixmaps/agents/mrim.png | data/pixmaps/events/subscription_request.png | data/pixmaps/events/unsubscribed.png | data/pixmaps/gajim.ico | data/pixmaps/nsis_header.bmp | data/pixmaps/nsis_wizard.bmp | data/pixmaps/receipt_missing.png | data/pixmaps/security-high-big.png | data/pixmaps/security-high.png | data/pixmaps/security-low-big.png | data/pixmaps/security-low.png | data/pixmaps/upload.png | debian/changelog | 19 + debian/control | 8 +- debian/copyright | 7 +- debian/rules | 2 +- epydoc.conf | 5 +- gajim.iss | 89 - gajim.nsi | 844 + launch.sh | 21 +- m4/acinclude.m4 | 17 +- plugins/banner_tweaks/plugin.py | 6 +- plugins/dbus_plugin/plugin.py | 5 +- plugins/events_dump/plugin.py | 3 +- plugins/google_translation/plugin.py | 4 +- plugins/new_events_example/plugin.py | 8 +- plugins/snarl_notifications/plugin.py | 3 + po/LINGUAS | 1 + po/be.po | 11071 +++++++--- po/be@latin.po | 11693 +++++++---- po/bg.po | 10519 ++++++--- po/br.po | 10370 ++++++--- po/cs.po | 10799 ++++++---- po/da.po | 8790 +++++--- po/de.po | 14948 +++++++------- po/el.po | 10958 +++++++--- po/en_GB.po | 10731 ++++++--- po/eo.po | 11865 +++++++---- po/es.po | 10975 +++++++--- po/eu.po | 11967 +++++++---- po/fr.po | 11252 +++++----- po/gl.po | 11144 +++++++--- po/hr.po | 10864 ++++++---- po/it.po | 11407 ++++++---- po/lt.po | 11117 ++++++---- po/nb.po | 11741 +++++++---- po/nl.po | 10782 +++++++--- po/no.po | 11741 +++++++---- po/pl.po | 12220 ++++++----- po/pt.po | 10452 ++++++--- po/pt_BR.po | 10493 ++++++---- po/ru.po | 7442 ++++--- po/sk.po | 6914 +++--- po/sr.po | 10680 ++++++--- po/sr@Latn.po | 9566 +++++--- po/sv.po | 12872 +++++++---- po/uk.po | 9829 +++++++++ po/zh_CN.po | 9992 ++++++--- scripts/dev/run-pychecker.py | 4 +- scripts/gajim-remote.in | 36 - scripts/gajim.in | 46 +- setup_osx.py | 37 +- setup_win32.py | 50 +- src/Makefile.am | 20 +- src/adhoc_commands.py | 67 +- src/advanced.py | 173 +- src/atom_window.py | 21 +- src/cell_renderer_image.py | 49 +- src/chat_control.py | 1353 +- src/common/GnuPG.py | 82 +- src/common/GnuPGInterface.py | 252 +- src/common/Makefile.am | 22 - src/common/__init__.py | 2 + src/common/atom.py | 37 +- src/common/caps.py | 205 +- src/common/check_paths.py | 34 +- src/common/commands.py | 59 +- src/common/config.py | 297 +- src/common/configpaths.py | 47 +- src/common/connection.py | 796 +- src/common/connection_handlers.py | 1169 +- src/common/contacts.py | 276 +- src/common/crypto.py | 27 +- src/common/dataforms.py | 207 +- src/common/dbus_support.py | 64 +- src/common/defs.py | 33 +- src/common/dh.py | 36 +- src/common/events.py | 69 +- src/common/exceptions.py | 24 +- src/common/fuzzyclock.py | 21 +- src/common/gajim.py | 94 +- src/common/helpers.py | 1159 +- src/common/i18n.py | 35 +- src/common/idle.c | 85 - src/common/idle.py | 96 + src/common/latex.py | 158 + src/common/logger.py | 163 +- src/common/logging_helpers.py | 184 + src/common/nslookup.py | 325 - src/common/optparser.py | 211 +- src/common/passwords.py | 67 +- src/common/pep.py | 413 +- src/common/proxy65_manager.py | 275 +- src/common/pubsub.py | 73 +- src/common/resolver.py | 332 + src/common/rst_xhtml_generator.py | 20 +- src/common/sleepy.py | 31 +- src/common/socks5.py | 430 +- src/common/stanza_session.py | 527 +- src/common/xmpp/__init__.py | 35 +- src/common/xmpp/auth.py | 306 - src/common/xmpp/auth_nb.py | 632 +- src/common/xmpp/bosh.py | 565 + src/common/xmpp/browser.py | 216 - src/common/xmpp/c14n.py | 29 +- src/common/xmpp/client.py | 322 - src/common/xmpp/client_nb.py | 845 +- src/common/xmpp/commands.py | 330 - src/common/xmpp/debug.py | 420 - src/common/xmpp/dispatcher.py | 383 - src/common/xmpp/dispatcher_nb.py | 690 +- src/common/xmpp/features.py | 184 - src/common/xmpp/features_nb.py | 229 +- src/common/xmpp/filetransfer.py | 199 - src/common/xmpp/idlequeue.py | 475 +- src/common/xmpp/plugin.py | 97 + src/common/xmpp/protocol.py | 1315 +- src/common/xmpp/proxy_connectors.py | 236 + src/common/xmpp/roster.py | 195 - src/common/xmpp/roster_nb.py | 190 +- src/common/xmpp/session.py | 350 - src/common/xmpp/simplexml.py | 342 +- src/common/xmpp/tls_nb.py | 406 + src/common/xmpp/transports.py | 289 - src/common/xmpp/transports_nb.py | 1670 +- src/common/xmpp_stringprep.py | 27 +- src/common/zeroconf/__init__.py | 2 + src/common/zeroconf/client_zeroconf.py | 138 +- src/common/zeroconf/connection_handlers_zeroconf.py | 84 +- src/common/zeroconf/connection_zeroconf.py | 82 +- src/common/zeroconf/roster_zeroconf.py | 71 +- src/common/zeroconf/zeroconf.py | 6 +- src/common/zeroconf/zeroconf_avahi.py | 68 +- src/common/zeroconf/zeroconf_bonjour.py | 73 +- src/config.py | 1546 +- src/conversation_textview.py | 653 +- src/dataforms_widget.py | 63 +- src/dialogs.py | 1515 +- src/disco.py | 491 +- src/eggtrayicon.c | 49 +- src/features_window.py | 150 +- src/filetransfers_window.py | 315 +- src/gajim-remote.py | 138 +- src/gajim.py | 2072 +- src/gajim_themes_window.py | 134 +- src/groupchat_control.py | 1106 +- src/groups.py | 29 +- src/gtkexcepthook.py | 51 +- src/gtkgui_helpers.py | 293 +- src/gtkspell.py | 100 + src/gtkspellmodule.c | 207 - src/history_manager.py | 158 +- src/history_window.py | 238 +- src/htmltextview.py | 420 +- src/ipython_view.py | 171 +- src/lastfm.py | 217 - src/lastfm_track_listener.py | 103 - src/message_control.py | 134 +- src/message_textview.py | 276 +- src/message_window.py | 614 +- src/music_track_listener.py | 247 +- src/negotiation.py | 46 +- src/network_manager_listener.py | 70 +- src/notify.py | 259 +- src/osx/Makefile.am | 4 +- src/osx/__init__.py | 10 +- src/osx/dbus.py | 10 +- src/osx/growl/Growl.py | 28 +- src/osx/growl/Makefile.am | 4 +- src/osx/growl/__init__.py | 2 + src/osx/growl/setup.py | 4 +- src/osx/growler.py | 11 +- src/osx/prep_py2app.py | 2 + src/osx/setup.py | 4 +- src/osx/syncmenu/Makefile.am | 2 +- src/osx/syncmenu/setup.py | 3 + src/osx/syncmenu/test-menu.py | 3 +- src/otr_windows.py | 352 - src/plugins/helpers.py | 2 +- src/profile_window.py | 43 +- src/remote_control.py | 64 +- src/roster_window.py | 3957 ++- src/search_window.py | 40 +- src/secrets.py | 145 +- src/session.py | 318 +- src/statusicon.py | 40 +- src/systray.py | 220 +- src/tictactoe.py | 427 - src/tooltips.py | 308 +- src/trayicon.override | 20 +- src/trayiconmodule.c | 20 +- src/vcard.py | 160 +- test/lib/__init__.py | 52 + test/lib/data.py | 79 + test/lib/gajim_mocks.py | 147 + test/lib/mock.py | 468 + test/lib/notify.py | 17 + test/lib/xmpp_mocks.py | 98 + test/runtests.py | 63 + test/test_caps.py | 63 + test/test_misc_interface.py | 224 + test/test_resolver.py | 102 + test/test_roster.py | 210 + 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 | 325 + 452 files changed, 231946 insertions(+), 144132 deletions(-)
diffs (truncated from 476596 to 300 lines):
diff -r c8fdb3474fb9 -r ade272936a47 .hgtags --- a/.hgtags Tue Jun 02 19:59:33 2009 +0200 +++ b/.hgtags Sun Jun 07 02:08:42 2009 +0200 @@ -1,1 +1,5 @@ 22273fe2d51e4b7a942fb33b2fd81cdea9ace4aa gajim-0.11.4 +4e744ce18d49e62976a8ae9645c296a4264fdadf gajim-0.12.1 +604c5de0dfe72dfa76b3014c410a50daae381cbe gajim-0.12 +7752eadd1f8c31a3dc282c15d87767a7ba1bd217 gajim-0.12-alpha1 +a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 diff -r c8fdb3474fb9 -r ade272936a47 AUTHORS --- a/AUTHORS Tue Jun 02 19:59:33 2009 +0200 +++ b/AUTHORS Sun Jun 07 02:08:42 2009 +0200 @@ -1,15 +1,16 @@ CURRENT DEVELOPERS:
+Nikos Kouremenos (kourem AT gmail.com) Yann Leboulanger (asterix AT lagaule.org) -Nikos Kouremenos (kourem AT gmail.com) -Travis Shirk (travis AT pobox.com) -Stephan Erb (steve-e AT h3c.de) 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:
-Jean-Marie Traissard (jim AT lapin.org) Stefan Bethge (stefan AT lanpartei.de) +Stephan Erb (steve-e AT h3c.de) +Vincent Hanquez (tab AT snarc.org) Dimitur Kirov (dkirov AT gmail.com) -Vincent Hanquez (tab AT snarc.org) diff -r c8fdb3474fb9 -r ade272936a47 ChangeLog --- a/ChangeLog Tue Jun 02 19:59:33 2009 +0200 +++ b/ChangeLog Sun Jun 07 02:08:42 2009 +0200 @@ -1,7 +1,101 @@ -Gajim 0.XX.X (svn) +Gajim 0.12.1 (21 December 2008)
+ * Fix filetransfer + * Updated german translation + * Fix click on notifications when text string is empty + * Improve systray popup menu + +Gajim 0.12 (17 December 2008) + + * Fix text rendering in notifications + * Fix forward unread messages under Windows + * Better sessions support + * Better auto-away support + * Fix banshee support + * Quodlibet support + * Fix GSSAPI authentification + * Fix IPV4 filetransfer on Windows Vista when IPV6 is used too + * Fix caps usage + * Fix end to end encryption autonegotiation + +Gajim 0.12-beta1 (11 November 2008) + + * SECURITY + * Implement Kerberos (GSSAPI) SASL Authentication mechanism + * Prevent affiliation spoofing in groupchats + * Improve GPG and E2E support + + * GUI + * Highlight all valid IANA schemes + * Improved E2E, Mood and Activity dialogs + * Show number of participants in groupchats + + * Connection + * Correctly parse IDNA names in SRV records + * Disable proxy resolution (#4299) + * Fix handling of namespace invalid XML + * Do not freeze on connection failures (#4366, #4107) + + * OTHERS + * Do not crash on fluxbox restarts + * Update several hotkeys and make them work on non-latin keyboards + * Prevent a user from sending invalid XML chars + * Do not try to save a file with a too long filename when a nick is long + * Implement XEP-0203 (Delayed Delivery) + * Improved windows installer + * Latex support for windows + +Gajim 0.12-alpha1 (12 August 2008) + + * Change licence from GPLv2 to GPLv3 + + * SECURITY + * Support for End-To-End encryption (XEP-0116) + * SSL certificate verification + * Improve GPG support (#2390, #2783) + * Ability to disable message previews in notify popups + + * GROUP CHATS + * Support for sending files over group chats + * List of bookmarked rooms is now sorted alphabetically + * Support for transforming a one-to-one chat into a groupchat + * Send invitation by drag-and-dropping a contact from roster + * Send messages to conference using gajim-remote + * Ability to destroy a room when we are owner, give a reason and alternative room jid + * Ability to minimize group chats in roster + + * USABILITY + * Files transfers using drag and drop + * Ability to select and interact with status messages in chat windows (using libsexy) + * Ability to set a custom avatar for a contact + * Better handling of resource collisions + * Option to Sign On as a Certain Status (#3314) + * Block/Unblock contact directly from roster using privacy lists + + * GUI + * Single window mode + * Close change status windows after 15 seconds of inactivity + * Simplified "Accounts" dialog + * Preferences window redesign + * New GUI for chat window + * Roster treeview now uses modelfilter (way way much faster) + + * OTHER + * Support of PEP (Personal Eventing Protocol) (XEP-0163) + * User Mood (XEP-0107) + * User Activity (XEP-0108) + * User Tune (XEP-0118) + * User Nickname (XEP-0172) + * Support for Google Talk accounts with non gmail.com domain (+ GMail notifications) * Modified the format of emoticons list file, so we can choose the default code (#3696) - * List of bookmarked rooms is now sorted alphabetically + * New Remote Controlling Option (XEP-0146): forward unread messages + * Support for User Search (XEP-0055) + * Support for jabber:x:data in message elements (Part of XEP-0004) + * Added a «supported features» window + * Latex support (#2796) + * Link-local messaging with Windows (#2883) + * Ability to send a custom status to a group, a contact or a transport + * Support of Message Receipts (XEP-0184)
Gajim 0.11.4 (06 December 2007)
diff -r c8fdb3474fb9 -r ade272936a47 Makefile.am --- a/Makefile.am Tue Jun 02 19:59:33 2009 +0200 +++ b/Makefile.am Sun Jun 07 02:08:42 2009 +0200 @@ -8,7 +8,7 @@ OPTIONAL_BIN = endif
-bin_SCRIPTS = scripts/gajim $(OPTIONAL_BIN) +bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager $(OPTIONAL_BIN)
docfilesdir = $(docdir) @@ -26,15 +26,17 @@ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ - scripts/gajim.in \ - scripts/gajim-remote.in + gajim.nsi \ + setup_win32.py \ + scripts/gajim.in DISTCLEANFILES = \ intltool-extract \ intltool-merge \ intltool-update \ scripts/gajim \ - scripts/gajim-remote + scripts/gajim-remote \ + scripts/gajim-histrory-manager
MAINTAINERCLEANFILES = \ configure \ diff -r c8fdb3474fb9 -r ade272936a47 README.html --- a/README.html Tue Jun 02 19:59:33 2009 +0200 +++ b/README.html Sun Jun 07 02:08:42 2009 +0200 @@ -15,8 +15,8 @@
<h2>Runtime Requirements</h2> <ul> -<li>python2.4 or higher</li> -<li>pygtk2.8 or higher</li> +<li>python2.5 or higher</li> +<li>pygtk2.12 or higher</li> <li>python-libglade</li> <li>pysqlite2 (if you have python 2.5, you already have this)</li> </ul> @@ -30,15 +30,17 @@ <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>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> -<li>dnsutils (or whatever package provides the nslookup binary) for SRV support; if you don't know what that is, you don't need it</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</li> +<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim.</li> <li>python-dbus bindings</li> <li>python-sexy to have clickable URLs in chat windows</li> +<li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li> </ul>
<p> @@ -52,9 +54,9 @@ <li>python-dev</li> <li>python-gtk2-dev</li> <li>libgtk2.0-dev aka. gtk2-devel</li> -<li>libxss-dev (for idle detection module; some distributions such as Debian split xscreensaver)</li> <li>libgtkspell-dev (for the gtkspell module)</li> -<li>intltool</li> +<li>libdbus-1-dev (for the remote control module)</li> +<li>intltool (>= 0.40.1)</li> </ul>
<p> @@ -94,7 +96,7 @@ <li>automake >= 1.8 </li> <li>autoconf >= 2.59 </li> <li>libtool</li> -<li>intltool-0.35.0 </li> +<li>intltool-0.40.1 </li> <li>pkgconfig >= 0.19</li> </ul> </p> @@ -141,7 +143,7 @@ <br/> <br/> <br/> -(C) 2003-2006<br/> +(C) 2003-200888888888<br/> The Gajim Team<br/> http://gajim.org<br/> <br/> diff -r c8fdb3474fb9 -r ade272936a47 README.osx --- a/README.osx Tue Jun 02 19:59:33 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,100 +0,0 @@ -Introduction ------------- - -This is an alpha release of Gajim for OS/X using native GTK+. It is not finished -nor is it relatively stable. The native port of GTK+ is alpha and not stable -yet, though it has proven to be usable for Gajim. Having said that it is usable, -basic functionality works. See the TODO file for a list of what is and is not -working. - - - -Installing ----------- - -Install the GTK+ framework into your /Library/Frameworks directory. It can be -found at http://codepunks.org/gajim. -NOTE: If you're able to make it work with official GTK release, we are VERY interested !! - -Copy the Gajim.app into the /Applications directory or any other directory. - - -Installing language dictionaries --------------------------------- - -The codepunks.org build of the GTK+ framework comes with the US English -dictionary pre-installed. If you wish to install a different dictionary download -the appropriate dictionary from here: - -http://ftp.gnu.org/gnu/aspell/dict/ - -Then follow these instructions: - -source /Library/Frameworks/GTK+.framework/Versions/Current/bin/env -tar -jxf aspell-<lang>-<version>.tbz2 -cd aspell-<lang>-<version> -./configure -make -make install - - -Compiling Requirements ----------------------- -These instructions were gathered for building a universal binary on a PPC. The -steps for building on an i386 should be essentially the same. - -Requirements: -- OS/X 10.4, i386 or ppc -- Universal MacPython 2.5 - http://www.pythonmac.org/packages/py25-fat/index.html -- Latest XCode (2.4.0 or greater) -- py2app - http://svn.pythonmac.org/py2app/py2app/trunk/doc/index.html - -Install all of the requirements. Make sure that the universal MacPython is -installed before py2app. Then ensure that this is the first python in your -PATH. - - export PATH=/Library/Frameworks/Python.framework/Versions/2.5/bin:$PATH
-
vardo＠lagaule.org