changeset 4cc397deae6d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4cc397deae6d description: merge from default branch
diffstat: .hgignore | 6 - AUTHORS | 1 + ChangeLog | 2 +- Makefile.am | 3 +- README.html | 93 +- THANKS.artists | 2 +- configure.ac | 43 +- data/Makefile.am | 2 +- data/activities/Makefile.am | 36 +- data/defs.py.in | 2 +- data/emoticons/Makefile.am | 39 +- 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/message_window.glade | 1196 +- data/glade/preferences_window.glade | 334 +- data/glade/xml_console_window.glade | 743 +- data/iconsets/Makefile.am | 43 +- data/iconsets/jabberbulb/32x32/icos/online.ico | 0 data/moods/Makefile.am | 36 +- 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 | 34 + debian/compat | 2 +- debian/control | 16 +- debian/copyright | 8 +- debian/gajim.lintian | 1 - debian/gajim.manpages | 2 + debian/rules | 1 - 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/[email protected] | 4379 +++--- po/bg.po | 4201 +++--- po/br.po | 4400 ++++--- po/cs.po | 4183 +++--- 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/[email protected] | 4775 ++++---- po/sv.po | 4513 ++++--- po/uk.po | 4535 ++++--- po/zh_CN.po | 4357 +++--- scripts/gajim.in | 8 +- src/Makefile.am | 69 +- src/adhoc_commands.py | 105 +- src/advanced_configuration_window.py | 10 +- src/atom_window.py | 18 +- src/chat_control.py | 735 +- src/command_system/__init__.py | 2 +- src/command_system/dispatching.py | 2 +- src/command_system/errors.py | 9 +- src/command_system/framework.py | 2 +- src/command_system/implementation/__init__.py | 2 +- src/command_system/implementation/custom.py | 2 +- src/command_system/implementation/hosts.py | 2 +- src/command_system/implementation/middleware.py | 2 +- src/command_system/implementation/standard.py | 81 +- src/command_system/mapping.py | 2 +- src/common/GnuPG.py | 8 +- src/common/GnuPGInterface.py | 62 +- src/common/account.py | 8 +- src/common/atom.py | 53 +- src/common/caps.py | 436 - src/common/caps_cache.py | 405 + src/common/check_paths.py | 11 +- src/common/commands.py | 42 +- src/common/config.py | 22 +- src/common/configpaths.py | 14 +- src/common/connection.py | 1166 +- src/common/connection_handlers.py | 878 +- src/common/contacts.py | 353 +- src/common/dataforms.py | 132 +- src/common/dbus_support.py | 24 +- src/common/defs.py | 4 +- src/common/dh.py | 7 +- src/common/events.py | 93 +- src/common/exceptions.py | 70 +- src/common/fuzzyclock.py | 6 +- src/common/gajim.py | 87 +- src/common/helpers.py | 290 +- src/common/i18n.py | 11 +- src/common/idle.py | 5 +- src/common/jingle.py | 1117 +- src/common/jingle_content.py | 142 + src/common/jingle_rtp.py | 353 + src/common/jingle_session.py | 656 + src/common/jingle_transport.py | 150 + src/common/kwalletbinding.py | 12 +- src/common/latex.py | 5 +- src/common/location_listener.py | 137 + src/common/logger.py | 210 +- src/common/logging_helpers.py | 6 +- src/common/multimedia_helpers.py | 101 + src/common/optparser.py | 103 +- src/common/passwords.py | 2 + src/common/pep.py | 753 +- src/common/protocol/__init__.py | 3 + src/common/protocol/bytestream.py | 650 + src/common/protocol/caps.py | 111 + src/common/proxy65_manager.py | 63 +- src/common/pubsub.py | 32 +- src/common/resolver.py | 61 +- src/common/rst_xhtml_generator.py | 39 +- src/common/sleepy.py | 8 +- src/common/socks5.py | 190 +- src/common/stanza_session.py | 72 +- src/common/xmpp/auth_nb.py | 106 +- src/common/xmpp/bosh.py | 68 +- src/common/xmpp/c14n.py | 5 +- src/common/xmpp/client_nb.py | 152 +- src/common/xmpp/dispatcher_nb.py | 195 +- src/common/xmpp/features_nb.py | 69 +- src/common/xmpp/idlequeue.py | 172 +- src/common/xmpp/plugin.py | 31 +- src/common/xmpp/protocol.py | 1313 +- src/common/xmpp/proxy_connectors.py | 54 +- src/common/xmpp/roster_nb.py | 314 +- src/common/xmpp/simplexml.py | 567 +- src/common/xmpp/stringprepare.py | 51 +- src/common/xmpp/tls_nb.py | 50 +- src/common/xmpp/transports_nb.py | 195 +- src/common/zeroconf/client_zeroconf.py | 99 +- src/common/zeroconf/connection_handlers_zeroconf.py | 339 +- src/common/zeroconf/connection_zeroconf.py | 504 +- src/common/zeroconf/roster_zeroconf.py | 7 +- src/common/zeroconf/zeroconf_avahi.py | 4 +- src/common/zeroconf/zeroconf_bonjour.py | 22 +- src/config.py | 305 +- src/conversation_textview.py | 99 +- src/dataforms_widget.py | 64 +- src/dialogs.py | 505 +- src/disco.py | 479 +- src/eggtrayicon.c | 584 - src/eggtrayicon.h | 80 - src/features_window.py | 27 +- src/filetransfers_window.py | 210 +- src/gajim-remote.py | 47 +- src/gajim.py | 16 +- src/gajim_themes_window.py | 31 +- src/groupchat_control.py | 329 +- src/groups.py | 13 +- src/gtkexcepthook.py | 1 - src/gtkgui_helpers.py | 285 +- src/gui_interface.py | 301 +- src/gui_menu_builder.py | 32 +- src/history_manager.py | 96 +- src/history_window.py | 73 +- src/htmltextview.py | 85 +- src/ipython_view.py | 147 +- src/message_control.py | 93 +- src/message_textview.py | 96 +- src/message_window.py | 108 +- src/negotiation.py | 5 +- src/network_manager_listener.py | 12 +- src/notify.py | 91 +- src/profile_window.py | 31 +- src/remote_control.py | 175 +- src/roster_window.py | 1253 +- src/search_window.py | 6 +- src/session.py | 16 +- src/statusicon.py | 382 +- src/systray.py | 459 - src/tooltips.py | 202 +- src/trayicon.defs | 59 - src/trayicon.override | 47 - src/trayiconmodule.c | 43 - src/vcard.py | 31 +- test/integration/test_gui_event_integration.py | 2 +- test/integration/test_roster.py | 2 +- test/integration/test_xmpp_transports_nb.py | 8 +- test/lib/gajim_mocks.py | 4 +- test/runtests.py | 5 +- test/unit/test_caps.py | 152 - test/unit/test_caps_cache.py | 151 + test/unit/test_contacts.py | 10 +- test/unit/test_gui_interface.py | 5 +- test/unit/test_protocol_caps.py | 75 + 344 files changed, 87787 insertions(+), 82881 deletions(-) diffs (truncated from 314429 to 300 lines): diff -r bec5c031be24 -r 4cc397deae6d .hgignore --- a/.hgignore Sat Nov 14 23:41:28 2009 +0100 +++ b/.hgignore Tue Jan 19 16:37:14 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 bec5c031be24 -r 4cc397deae6d AUTHORS --- a/AUTHORS Sat Nov 14 23:41:28 2009 +0100 +++ b/AUTHORS Tue Jan 19 16:37:14 2010 +0100 @@ -1,5 +1,6 @@ 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) diff -r bec5c031be24 -r 4cc397deae6d ChangeLog --- a/ChangeLog Sat Nov 14 23:41:28 2009 +0100 +++ b/ChangeLog Tue Jan 19 16:37:14 2010 +0100 @@ -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 bec5c031be24 -r 4cc397deae6d Makefile.am --- a/Makefile.am Sat Nov 14 23:41:28 2009 +0100 +++ b/Makefile.am Tue Jan 19 16:37:14 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 bec5c031be24 -r 4cc397deae6d README.html --- a/README.html Sat Nov 14 23:41:28 2009 +0100 +++ b/README.html Tue Jan 19 16:37:14 2010 +0100 @@ -4,27 +4,23 @@ <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>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> @@ -34,34 +30,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 +57,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> @@ -98,45 +80,41 @@ <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/> @@ -152,6 +130,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 bec5c031be24 -r 4cc397deae6d THANKS.artists --- a/THANKS.artists Sat Nov 14 23:41:28 2009 +0100 +++ b/THANKS.artists Tue Jan 19 16:37:14 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 bec5c031be24 -r 4cc397deae6d configure.ac --- a/configure.ac Sat Nov 14 23:41:28 2009 +0100 +++ b/configure.ac Tue Jan 19 16:37:14 2010 +0100 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.13.0.1-dev],[http://trac.gajim.org/],[gajim]) + [0.13.10.1-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) @@ -39,7 +39,7 @@ dnl **** dnl pygtk and gtk+ dnl **** -PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.12.0 pygtk-2.0 >= 2.12.0]) +PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0]) AC_SUBST(PYGTK_CFLAGS) AC_SUBST(PYGTK_LIBS) PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` @@ -50,23 +50,27 @@ AC_MSG_ERROR([Python not found]) fi -dnl **** -dnl tray icon -dnl **** -AC_ARG_ENABLE(trayicon, - [ --disable-trayicon do not build trayicon module [default yes]], - enable_trayicon=$enableval, enable_trayicon=yes) -test "x$enable_trayicon" = "xyes" && have_trayicon=true || have_trayicon=false -AM_CONDITIONAL(BUILD_TRAYICON, $have_trayicon) - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" AC_SUBST(ACLOCAL_AMFLAGS) 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 _______________________________________________ Commits mailing list [email protected] http://lists.gajim.org/cgi-bin/listinfo/commits
