Commits January 2010

commits@gajim.org

7 participants
107 discussions

gajim: merge from default branch
by Yann Leboulanger 19 Jan '10

19 Jan '10

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/be(a)latin.po | 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/sr(a)Latn.po | 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

1 0

gajim: correct Xfce capitalization (fixes #5562)
by Éric Araujo 18 Jan '10

18 Jan '10

changeset 16666da7cd22 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=16666da7cd22 description: correct Xfce capitalization (fixes #5562) diffstat: ChangeLog | 2 +- README.html | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/eo.po | 2 +- po/es.po | 2 +- po/eu.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/it.po | 2 +- po/pl.po | 2 +- po/ru.po | 2 +- po/sv.po | 2 +- po/uk.po | 2 +- po/zh_CN.po | 2 +- src/gtkgui_helpers.py | 4 ++-- 17 files changed, 18 insertions(+), 18 deletions(-) diffs (206 lines): diff -r f617c9cc8e3a -r 16666da7cd22 ChangeLog --- a/ChangeLog Sun Jan 17 10:39:31 2010 +0100 +++ b/ChangeLog Mon Jan 18 17:16:06 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 f617c9cc8e3a -r 16666da7cd22 README.html --- a/README.html Sun Jan 17 10:39:31 2010 +0100 +++ b/README.html Mon Jan 18 17:16:06 2010 +0100 @@ -68,7 +68,7 @@ </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/> +<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 hg users</h3> diff -r f617c9cc8e3a -r 16666da7cd22 po/cs.po --- a/po/cs.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/cs.po Mon Jan 18 17:16:06 2010 +0100 @@ -1813,7 +1813,7 @@ "Automaticky zjistit při každém startu aplikace\n" "Vždy použít výchozí aplikace z GNOME\n" "Vždy použít výchozí aplikace z KDE\n" -"Vždy použít výchozí aplikace z XFCE4\n" +"Vždy použít výchozí aplikace z Xfce\n" "Vlastní" #: ../data/glade/preferences_window.glade.h:33 diff -r f617c9cc8e3a -r 16666da7cd22 po/da.po --- a/po/da.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/da.po Mon Jan 18 17:16:06 2010 +0100 @@ -1799,7 +1799,7 @@ "Automatisk genkend hvergang Gajim starter\n" "Altid brug GNOME standard programmer\n" "Altid brug KDE standard programmer\n" -"Altid brug XFCE4 standard programmer\n" +"Altid brug Xfce standard programmer\n" "Tilpasset" #: ../data/glade/preferences_window.glade.h:33 diff -r f617c9cc8e3a -r 16666da7cd22 po/de.po --- a/po/de.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/de.po Mon Jan 18 17:16:06 2010 +0100 @@ -1781,7 +1781,7 @@ "Bei jedem Programmstart automatisch erkennen\n" "Immer die GNOME-Standard-Anwendungen verwenden\n" "Immer die KDE-Standard-Anwendungen verwenden\n" -"Immer die XFCE4-Standard-Anwendungen verwenden\n" +"Immer die Xfce-Standard-Anwendungen verwenden\n" "Benutzerdefiniert" #: ../data/glade/preferences_window.glade.h:33 diff -r f617c9cc8e3a -r 16666da7cd22 po/eo.po --- a/po/eo.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/eo.po Mon Jan 18 17:16:06 2010 +0100 @@ -1876,7 +1876,7 @@ "Aŭtodetekti dum ĉiu Gajim lanĉo\n" "Ĉiam uzi defaŭlton de GNOME\n" "Ĉiam uzi defaŭlton de KDE\n" -"Ĉiam uzi defaŭlton de XFCE\n" +"Ĉiam uzi defaŭlton de Xfce\n" "Propraj" #: ../data/glade/preferences_window.glade.h:33 diff -r f617c9cc8e3a -r 16666da7cd22 po/es.po --- a/po/es.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/es.po Mon Jan 18 17:16:06 2010 +0100 @@ -1895,7 +1895,7 @@ "Autodetectar en cada inicio de Gajim\n" "Siempre usar las aplicaciones por defecto de GNOME\n" "Siempre usar las apliacciones por defecto de KDE\n" -"Siempre usar las aplicaciones por defecto de XFCE\n" +"Siempre usar las aplicaciones por defecto de Xfce\n" "Personalizado" #: ../data/glade/preferences_window.glade.h:40 diff -r f617c9cc8e3a -r 16666da7cd22 po/eu.po --- a/po/eu.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/eu.po Mon Jan 18 17:16:06 2010 +0100 @@ -1890,7 +1890,7 @@ "Autodetektatu Gajim abiarazten den bakoitzean\n" "Beti GNOME-ren berezko aplikazioak erabili\n" "Beti KDE-ren berezko aplikazioak erabili\n" -"Beti XFCE4-ren berezko aplikazioak erabili\n" +"Beti Xfce-ren berezko aplikazioak erabili\n" "Bezeroa" #: ../data/glade/preferences_window.glade.h:33 diff -r f617c9cc8e3a -r 16666da7cd22 po/fr.po --- a/po/fr.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/fr.po Mon Jan 18 17:16:06 2010 +0100 @@ -1816,7 +1816,7 @@ "Détection automatique à chaque démarrage\n" "Toujours utiliser les applications par défaut de GNOME\n" "Toujours utiliser les applications par défaut de KDE\n" -"Toujours utiliser les applications par défaut de XFCE4\n" +"Toujours utiliser les applications par défaut de Xfce\n" "Personnalisé" #: ../data/glade/preferences_window.glade.h:33 diff -r f617c9cc8e3a -r 16666da7cd22 po/gl.po --- a/po/gl.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/gl.po Mon Jan 18 17:16:06 2010 +0100 @@ -1984,7 +1984,7 @@ "Detectar automaticamente en cada inicio do Gajim\n" "Usar sempre as aplicacións por defecto do GNOME\n" "Usar sempre as aplicacións por defecto do KDE\n" -"Usar sempre as aplicacións por defecto do XFCE4\n" +"Usar sempre as aplicacións por defecto do Xfce\n" "Personalizado" #: ../data/glade/preferences_window.glade.h:40 diff -r f617c9cc8e3a -r 16666da7cd22 po/it.po --- a/po/it.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/it.po Mon Jan 18 17:16:06 2010 +0100 @@ -1845,7 +1845,7 @@ "Rilevamento automatico ad ogni avvio di Gajim\n" "Usa sempre le applicazioni predefinite di GNOME\n" "Usa sempre le applicazioni predefinite di KDE\n" -"Usa sempre le applicazioni predefinite XFCE4\n" +"Usa sempre le applicazioni predefinite Xfce\n" "Personalizzate" #: ../data/glade/preferences_window.glade.h:33 diff -r f617c9cc8e3a -r 16666da7cd22 po/pl.po --- a/po/pl.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/pl.po Mon Jan 18 17:16:06 2010 +0100 @@ -1774,7 +1774,7 @@ "Automatyczne wykrywanie przy każdym uruchomieniu Gajima\n" "Zawsze używaj domyślnych aplikacji GNOME\n" "Zawsze używaj domyślnych aplikacji KDE\n" -"Zawsze używaj domyślnych aplikacji XFCE\n" +"Zawsze używaj domyślnych aplikacji Xfce\n" "Własne" #: ../data/glade/preferences_window.glade.h:33 diff -r f617c9cc8e3a -r 16666da7cd22 po/ru.po --- a/po/ru.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/ru.po Mon Jan 18 17:16:06 2010 +0100 @@ -1807,7 +1807,7 @@ "Определять автоматически при каждом запуске Gajim\n" "Всегда использовать приложения GNOME по умолчанию\n" "Всегда использовать приложения KDE по умолчанию\n" -"Всегда использовать приложения XFCE4 по умолчанию\n" +"Всегда использовать приложения Xfce по умолчанию\n" "Другое" #: ../data/glade/preferences_window.glade.h:33 diff -r f617c9cc8e3a -r 16666da7cd22 po/sv.po --- a/po/sv.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/sv.po Mon Jan 18 17:16:06 2010 +0100 @@ -1806,7 +1806,7 @@ "Detektera vid varje Gajimstart\n" "Använd alltid GNOMEs standardprogram\n" "Använd alltid KDEs standardprogram\n" -"Använd alltid XFCE4s standardprogram\n" +"Använd alltid Xfces standardprogram\n" "Anpassa" #: ../data/glade/preferences_window.glade.h:33 diff -r f617c9cc8e3a -r 16666da7cd22 po/uk.po --- a/po/uk.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/uk.po Mon Jan 18 17:16:06 2010 +0100 @@ -1811,7 +1811,7 @@ "Автоматично визначати під час запуску Gajim\n" "Завжди використовувати типові програми GNOME\n" "Завжди використовувати типові програми KDE\n" -"Завжди використовувати типові програми XFCE\n" +"Завжди використовувати типові програми Xfce\n" "Власний набір" #: ../data/glade/preferences_window.glade.h:33 diff -r f617c9cc8e3a -r 16666da7cd22 po/zh_CN.po --- a/po/zh_CN.po Sun Jan 17 10:39:31 2010 +0100 +++ b/po/zh_CN.po Mon Jan 18 17:16:06 2010 +0100 @@ -1875,7 +1875,7 @@ "每次 Gajim 启动时自动探测\n" "总是使用 GNOME 默认应用\n" "总是使用 KDE 默认应用\n" -"总是使用 XFCE4 默认应用\n" +"总是使用 Xfce 默认应用\n" "自定义" #: ../data/glade/preferences_window.glade.h:33 diff -r f617c9cc8e3a -r 16666da7cd22 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sun Jan 17 10:39:31 2010 +0100 +++ b/src/gtkgui_helpers.py Mon Jan 18 17:16:06 2010 +0100 @@ -180,8 +180,8 @@ except Exception: pass - # try to get xfce default font - # Xfce 4.2 adopts freedesktop.org's Base Directory Specification + # try to get Xfce default font + # Xfce 4.2 and higher follow freedesktop.org's Base Directory Specification # see http://www.xfce.org/~benny/xfce/file-locations.html # and http://freedesktop.org/Standards/basedir-spec xdg_config_home = os.environ.get('XDG_CONFIG_HOME', '')

1 0

gajim: fix HTML code in README.html. Fixes #5559
by Yann Leboulanger 17 Jan '10

17 Jan '10

changeset f617c9cc8e3a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f617c9cc8e3a description: fix HTML code in README.html. Fixes #5559 diffstat: README.html | 85 +++++++++++++++++++++++------------------------------------- 1 files changed, 33 insertions(+), 52 deletions(-) diffs (164 lines): diff -r d5026853e2e8 -r f617c9cc8e3a README.html --- a/README.html Fri Jan 15 20:20:56 2010 +0100 +++ b/README.html Sun Jan 17 10:39:31 2010 +0100 @@ -4,14 +4,13 @@ <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> @@ -21,10 +20,7 @@ <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> @@ -41,11 +37,7 @@ <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> @@ -54,10 +46,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> @@ -68,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> @@ -94,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/> @@ -148,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>

1 0

gajim: don't set default action fot gtkhexcepthook window. Fixes...
by Yann Leboulanger 15 Jan '10

15 Jan '10

changeset d5026853e2e8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d5026853e2e8 description: don't set default action fot gtkhexcepthook window. Fixes #5556 diffstat: src/gtkexcepthook.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r b9ec78663dfb -r d5026853e2e8 src/gtkexcepthook.py --- a/src/gtkexcepthook.py Fri Jan 15 20:11:54 2010 +0100 +++ b/src/gtkexcepthook.py Fri Jan 15 20:20:56 2010 +0100 @@ -52,7 +52,6 @@ RESPONSE_REPORT_BUG = 42 dialog.add_buttons(gtk.STOCK_CLOSE, gtk.BUTTONS_CLOSE, _('_Report Bug'), RESPONSE_REPORT_BUG) - dialog.set_default_response(RESPONSE_REPORT_BUG) report_button = dialog.action_area.get_children()[0] # right to left report_button.grab_focus()

1 0

gajim: Added tag gajim-0.13.2 for changeset 25f94d09fb93
by Yann Leboulanger 15 Jan '10

15 Jan '10

changeset 7bab6bd269ea in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7bab6bd269ea description: Added tag gajim-0.13.2 for changeset 25f94d09fb93 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 25f94d09fb93 -r 7bab6bd269ea .hgtags --- a/.hgtags Wed Jan 13 22:30:58 2010 +0100 +++ b/.hgtags Fri Jan 15 20:15:59 2010 +0100 @@ -5,3 +5,4 @@ a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 22259190dc0f8edb99345e49ef8f0af95693a64c gajim-0.13 931c9d87d9bc076b1ad940d132b6aaa1f4ba7ee1 gajim-0.13.1 +25f94d09fb937d2ef77627edabdbd8d5076b6712 gajim-0.13.2

1 0

gajim: add needed file for windows
by Yann Leboulanger 15 Jan '10

15 Jan '10

changeset b9ec78663dfb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b9ec78663dfb description: add needed file for windows diffstat: icons/hicolor/index.theme | 1662 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 1662 insertions(+), 0 deletions(-) diffs (truncated from 1666 to 300 lines): diff -r 1eb1facb0e21 -r b9ec78663dfb icons/hicolor/index.theme --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons/hicolor/index.theme Fri Jan 15 20:11:54 2010 +0100 @@ -0,0 +1,1662 @@ +[Icon Theme] +Name=Hicolor +Comment=Fallback icon theme +Hidden=true +Directories=16x16/actions,16x16/animations,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/emotes,16x16/filesystems,16x16/intl,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/form,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/emblems,22x22/emotes,22x22/filesystems,22x22/intl,22x22/mimetypes,22x22/places,22x22/status,22x22/stock/chart,22x22/stock/code,22x22/stock/data,22x22/stock/form,22x22/stock/image,22x22/stock/io,22x22/stock/media,22x22/stock/navigation,22x22/stock/net,22x22/stock/object,22x22/stock/table,22x22/stock/text,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/emotes,24x24/filesystems,24x24/intl,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/form,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/actions,32x32/animations,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/emotes,32x32/filesystems,32x32/intl,32x32/mimetypes,32x32/places,32x32/status,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/form,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/emblems,36x36/emotes,36x36/filesystems,36x36/intl,36x36/mimetypes,36x36/places,36x36/status,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/form,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/emotes,48x48/filesystems,48x48/intl,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/form,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,64x64/actions,64x64/animations,64x64/apps,64x64/categories,64x64/devices,64x64/emblems,64x64/emotes,64x64/filesystems,64x64/intl,64x64/mimetypes,64x64/places,64x64/status,64x64/stock/chart,64x64/stock/code,64x64/stock/data,64x64/stock/form,64x64/stock/image,64x64/stock/io,64x64/stock/media,64x64/stock/navigation,64x64/stock/net,64x64/stock/object,64x64/stock/table,64x64/stock/text,72x72/actions,72x72/animations,72x72/apps,72x72/categories,72x72/devices,72x72/emblems,72x72/emotes,72x72/filesystems,72x72/intl,72x72/mimetypes,72x72/places,72x72/status,72x72/stock/chart,72x72/stock/code,72x72/stock/data,72x72/stock/form,72x72/stock/image,72x72/stock/io,72x72/stock/media,72x72/stock/navigation,72x72/stock/net,72x72/stock/object,72x72/stock/table,72x72/stock/text,96x96/actions,96x96/animations,96x96/apps,96x96/categories,96x96/devices,96x96/emblems,96x96/emotes,96x96/filesystems,96x96/intl,96x96/mimetypes,96x96/places,96x96/status,96x96/stock/chart,96x96/stock/code,96x96/stock/data,96x96/stock/form,96x96/stock/image,96x96/stock/io,96x96/stock/media,96x96/stock/navigation,96x96/stock/net,96x96/stock/object,96x96/stock/table,96x96/stock/text,128x128/actions,128x128/animations,128x128/apps,128x128/categories,128x128/devices,128x128/emblems,128x128/emotes,128x128/filesystems,128x128/intl,128x128/mimetypes,128x128/places,128x128/status,128x128/stock/chart,128x128/stock/code,128x128/stock/data,128x128/stock/form,128x128/stock/image,128x128/stock/io,128x128/stock/media,128x128/stock/navigation,128x128/stock/net,128x128/stock/object,128x128/stock/table,128x128/stock/text,192x192/actions,192x192/animations,192x192/apps,192x192/categories,192x192/devices,192x192/emblems,192x192/emotes,192x192/filesystems,192x192/intl,192x192/mimetypes,192x192/places,192x192/status,192x192/stock/chart,192x192/stock/code,192x192/stock/data,192x192/stock/form,192x192/stock/image,192x192/stock/io,192x192/stock/media,192x192/stock/navigation,192x192/stock/net,192x192/stock/object,192x192/stock/table,192x192/stock/text,256x256/actions,256x256/animations,256x256/apps,256x256/categories,256x256/devices,256x256/emblems,256x256/emotes,256x256/filesystems,256x256/intl,256x256/mimetypes,256x256/places,256x256/status,256x256/stock/chart,256x256/stock/code,256x256/stock/data,256x256/stock/form,256x256/stock/image,256x256/stock/io,256x256/stock/media,256x256/stock/navigation,256x256/stock/net,256x256/stock/object,256x256/stock/table,256x256/stock/text,scalable/actions,scalable/animations,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/filesystems,scalable/intl,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/chart,scalable/stock/code,scalable/stock/data,scalable/stock/form,scalable/stock/image,scalable/stock/io,scalable/stock/media,scalable/stock/navigation,scalable/stock/net,scalable/stock/object,scalable/stock/table,scalable/stock/text + + +[16x16/actions] +Size=16 +Context=Actions +Type=Threshold + +[16x16/animations] +Size=16 +Context=Animations +Type=Threshold + +[16x16/apps] +Size=16 +Context=Applications +Type=Threshold + +[16x16/categories] +Size=16 +Context=Categories +Type=Threshold + +[16x16/devices] +Size=16 +Context=Devices +Type=Threshold + +[16x16/emblems] +Size=16 +Context=Emblems +Type=Threshold + +[16x16/emotes] +Size=16 +Context=Emotes +Type=Threshold + +[16x16/filesystems] +Size=16 +Context=FileSystems +Type=Threshold + +[16x16/intl] +Size=16 +Context=International +Type=Threshold + +[16x16/mimetypes] +Size=16 +Context=MimeTypes +Type=Threshold + +[16x16/places] +Size=16 +Context=Places +Type=Threshold + +[16x16/status] +Size=16 +Context=Status +Type=Threshold + +[16x16/stock/chart] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/code] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/data] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/form] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/image] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/io] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/media] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/navigation] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/net] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/object] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/table] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/text] +Size=16 +Context=Stock +Type=Threshold + +[22x22/actions] +Size=22 +Context=Actions +Type=Threshold + +[22x22/animations] +Size=22 +Context=Animations +Type=Threshold + +[22x22/apps] +Size=22 +Context=Applications +Type=Threshold + +[22x22/categories] +Size=22 +Context=Categories +Type=Threshold + +[22x22/devices] +Size=22 +Context=Devices +Type=Threshold + +[22x22/emblems] +Size=22 +Context=Emblems +Type=Threshold + +[22x22/emotes] +Size=22 +Context=Emotes +Type=Threshold + +[22x22/filesystems] +Size=22 +Context=FileSystems +Type=Threshold + +[22x22/intl] +Size=22 +Context=International +Type=Threshold + +[22x22/mimetypes] +Size=22 +Context=MimeTypes +Type=Threshold + +[22x22/places] +Size=22 +Context=Places +Type=Threshold + +[22x22/status] +Size=22 +Context=Status +Type=Threshold + +[22x22/stock/chart] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/code] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/data] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/form] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/image] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/io] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/media] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/navigation] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/net] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/object] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/table] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/text] +Size=22 +Context=Stock +Type=Threshold + +[24x24/actions] +Size=24 +Context=Actions +Type=Threshold + +[24x24/animations] +Size=24 +Context=Animations +Type=Threshold + +[24x24/apps] +Size=24 +Context=Applications +Type=Threshold + +[24x24/categories] +Size=24 +Context=Categories +Type=Threshold + +[24x24/devices] +Size=24 +Context=Devices +Type=Threshold + +[24x24/emblems] +Size=24 +Context=Emblems +Type=Threshold + +[24x24/emotes] +Size=24 +Context=Emotes +Type=Threshold + +[24x24/filesystems] +Size=24 +Context=FileSystems +Type=Threshold + +[24x24/intl] +Size=24 +Context=International +Type=Threshold + +[24x24/mimetypes] +Size=24 +Context=MimeTypes +Type=Threshold

1 0

gajim-website: fix date of 0.13.2 release
by Yann Leboulanger 14 Jan '10

14 Jan '10

changeset a77f73f94f1b in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=a77f73f94f1b description: fix date of 0.13.2 release diffstat: index.php | 2 +- locale/bg_BG/LC_MESSAGES/msg.po | 4 ++-- locale/de_DE/LC_MESSAGES/msg.po | 4 ++-- locale/eo/LC_MESSAGES/msg.po | 4 ++-- locale/es_ES/LC_MESSAGES/msg.po | 4 ++-- locale/fr_FR/LC_MESSAGES/msg.po | 10 ++++++---- locale/it_IT/LC_MESSAGES/msg.po | 4 ++-- locale/pl_PL/LC_MESSAGES/msg.po | 4 ++-- locale/pt_BR/LC_MESSAGES/msg.po | 4 ++-- locale/ru_RU/LC_MESSAGES/msg.po | 4 ++-- msg.pot | 4 ++-- 11 files changed, 25 insertions(+), 23 deletions(-) diffs (235 lines): diff -r aadb66833833 -r a77f73f94f1b index.php --- a/index.php Tue Jan 12 23:02:14 2010 +0100 +++ b/index.php Thu Jan 14 21:17:44 2010 +0100 @@ -59,7 +59,7 @@ // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("13 January 2010"), + 0 => _("14 January 2010"), 1 => _("28 November 2009"), 2 => _("23 November 2009"), 3 => _("7 November 2009"), diff -r aadb66833833 -r a77f73f94f1b locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Tue Jan 12 23:02:14 2010 +0100 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Thu Jan 14 21:17:44 2010 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 22:56+0100\n" +"POT-Creation-Date: 2010-01-14 21:17+0100\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -757,7 +757,7 @@ #: index.php:62 #, fuzzy -msgid "13 January 2010" +msgid "14 January 2010" msgstr "18 февруари 2007 г." #: index.php:63 diff -r aadb66833833 -r a77f73f94f1b locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Tue Jan 12 23:02:14 2010 +0100 +++ b/locale/de_DE/LC_MESSAGES/msg.po Thu Jan 14 21:17:44 2010 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 22:56+0100\n" +"POT-Creation-Date: 2010-01-14 21:17+0100\n" "PO-Revision-Date: 2008-12-22 22:59+0100\n" "Last-Translator: \n" "Language-Team: German <kde-i18n-de(a)lists.kde.org>\n" @@ -783,7 +783,7 @@ #: index.php:62 #, fuzzy -msgid "13 January 2010" +msgid "14 January 2010" msgstr "18. Februar 2007" #: index.php:63 diff -r aadb66833833 -r a77f73f94f1b locale/eo/LC_MESSAGES/msg.po --- a/locale/eo/LC_MESSAGES/msg.po Tue Jan 12 23:02:14 2010 +0100 +++ b/locale/eo/LC_MESSAGES/msg.po Thu Jan 14 21:17:44 2010 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim-website 20061103\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 22:56+0100\n" +"POT-Creation-Date: 2010-01-14 21:17+0100\n" "PO-Revision-Date: 2007-02-19 20:40+0400\n" "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin(a)gmail.com>\n" "Language-Team: Esperanto <translation-team-eo(a)lists.sourceforge.net>\n" @@ -743,7 +743,7 @@ #: index.php:62 #, fuzzy -msgid "13 January 2010" +msgid "14 January 2010" msgstr "la 18-an de februaro 2007" #: index.php:63 diff -r aadb66833833 -r a77f73f94f1b locale/es_ES/LC_MESSAGES/msg.po --- a/locale/es_ES/LC_MESSAGES/msg.po Tue Jan 12 23:02:14 2010 +0100 +++ b/locale/es_ES/LC_MESSAGES/msg.po Thu Jan 14 21:17:44 2010 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 22:56+0100\n" +"POT-Creation-Date: 2010-01-14 21:17+0100\n" "PO-Revision-Date: 2005-06-01 19:05+0300\n" "Last-Translator: <membriskhan(a)gmail.com>\n" "Language-Team: Spanish <es(a)li.org>\n" @@ -756,7 +756,7 @@ msgstr " La versión en archivotar de Gajim está " #: index.php:62 -msgid "13 January 2010" +msgid "14 January 2010" msgstr "" #: index.php:63 diff -r aadb66833833 -r a77f73f94f1b locale/fr_FR/LC_MESSAGES/msg.po --- a/locale/fr_FR/LC_MESSAGES/msg.po Tue Jan 12 23:02:14 2010 +0100 +++ b/locale/fr_FR/LC_MESSAGES/msg.po Thu Jan 14 21:17:44 2010 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 22:56+0100\n" +"POT-Creation-Date: 2010-01-14 21:17+0100\n" "PO-Revision-Date: 2005-08-18 13:21+0100\n" "Last-Translator: Yann Le Boulanger <asterix(a)lagaule.org>\n" "Language-Team: none\n" @@ -748,8 +748,8 @@ msgstr "Pré-sortie 1 de Gajim %s" #: index.php:62 -msgid "13 January 2010" -msgstr "13 Janvier 2010" +msgid "14 January 2010" +msgstr "14 Janvier 2010" #: index.php:63 msgid "28 November 2009" @@ -797,7 +797,9 @@ #: index.php:94 msgid "Fix string comparison according to locales" -msgstr "Corrige la comparaison des chaines de caractères suivant les paramètres régionaux" +msgstr "" +"Corrige la comparaison des chaines de caractères suivant les paramètres " +"régionaux" #: index.php:95 msgid "Fix some gnomekeyring glitches" diff -r aadb66833833 -r a77f73f94f1b locale/it_IT/LC_MESSAGES/msg.po --- a/locale/it_IT/LC_MESSAGES/msg.po Tue Jan 12 23:02:14 2010 +0100 +++ b/locale/it_IT/LC_MESSAGES/msg.po Thu Jan 14 21:17:44 2010 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 22:56+0100\n" +"POT-Creation-Date: 2010-01-14 21:17+0100\n" "PO-Revision-Date: 2007-09-23 00:39+0100\n" "Last-Translator: neoex <neoex.dc(a)gmail.com>\n" "Language-Team: Italian\n" @@ -756,7 +756,7 @@ #: index.php:62 #, fuzzy -msgid "13 January 2010" +msgid "14 January 2010" msgstr "18 Febbraio 2007" #: index.php:63 diff -r aadb66833833 -r a77f73f94f1b locale/pl_PL/LC_MESSAGES/msg.po --- a/locale/pl_PL/LC_MESSAGES/msg.po Tue Jan 12 23:02:14 2010 +0100 +++ b/locale/pl_PL/LC_MESSAGES/msg.po Thu Jan 14 21:17:44 2010 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Gajim-0.12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 22:56+0100\n" +"POT-Creation-Date: 2010-01-14 21:17+0100\n" "PO-Revision-Date: 2008-10-19 20:18+0100\n" "Last-Translator: Tadzik Sośnierz <tadzikes(a)gmail.com>\n" "Language-Team: Polish\n" @@ -756,7 +756,7 @@ #: index.php:62 #, fuzzy -msgid "13 January 2010" +msgid "14 January 2010" msgstr "18 Lutego 2007" #: index.php:63 diff -r aadb66833833 -r a77f73f94f1b locale/pt_BR/LC_MESSAGES/msg.po --- a/locale/pt_BR/LC_MESSAGES/msg.po Tue Jan 12 23:02:14 2010 +0100 +++ b/locale/pt_BR/LC_MESSAGES/msg.po Thu Jan 14 21:17:44 2010 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 22:56+0100\n" +"POT-Creation-Date: 2010-01-14 21:17+0100\n" "PO-Revision-Date: 2009-03-11 10:53-0300\n" "Last-Translator: Davidson Paulo <davidsonpaulo(a)gmail.com>\n" "Language-Team: \n" @@ -779,7 +779,7 @@ #: index.php:62 #, fuzzy -msgid "13 January 2010" +msgid "14 January 2010" msgstr "18 de Fevereiro de 2007" #: index.php:63 diff -r aadb66833833 -r a77f73f94f1b locale/ru_RU/LC_MESSAGES/msg.po --- a/locale/ru_RU/LC_MESSAGES/msg.po Tue Jan 12 23:02:14 2010 +0100 +++ b/locale/ru_RU/LC_MESSAGES/msg.po Thu Jan 14 21:17:44 2010 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim-website 20061103\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 22:56+0100\n" +"POT-Creation-Date: 2010-01-14 21:17+0100\n" "PO-Revision-Date: 2009-06-12 15:51+0300\n" "Last-Translator: Grigory Sarnitskiy <sargrigory(a)ya.ru>\n" "Language-Team: Russian <ru(a)li.org>\n" @@ -747,7 +747,7 @@ #: index.php:62 #, fuzzy -msgid "13 January 2010" +msgid "14 January 2010" msgstr "18 февраля 2007" #: index.php:63 diff -r aadb66833833 -r a77f73f94f1b msg.pot --- a/msg.pot Tue Jan 12 23:02:14 2010 +0100 +++ b/msg.pot Thu Jan 14 21:17:44 2010 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 22:56+0100\n" +"POT-Creation-Date: 2010-01-14 21:17+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -697,7 +697,7 @@ msgstr "" #: index.php:62 -msgid "13 January 2010" +msgid "14 January 2010" msgstr "" #: index.php:63

1 0

gajim: fix date of 0.13.2 release
by Yann Leboulanger 14 Jan '10

14 Jan '10

changeset 25f94d09fb93 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=25f94d09fb93 description: fix date of 0.13.2 release diffstat: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (9 lines): diff -r a7734a229bc3 -r 25f94d09fb93 ChangeLog --- a/ChangeLog Tue Jan 12 07:01:16 2010 +0100 +++ b/ChangeLog Wed Jan 13 22:30:58 2010 +0100 @@ -1,4 +1,4 @@ -Gajim 0.13.2 ((04 January 2010) +Gajim 0.13.2 ((14 January 2010) * Fix some translations * Fix string comparison according to locales

1 0

gajim: allow to not specify status in gajim-remote change_status...
by Yann Leboulanger 14 Jan '10

14 Jan '10

changeset 1eb1facb0e21 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1eb1facb0e21 description: allow to not specify status in gajim-remote change_status to change only status message. Fixes #5039 diffstat: src/gajim-remote.py | 2 +- src/remote_control.py | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diffs (47 lines): diff -r 50c1a5f0a005 -r 1eb1facb0e21 src/gajim-remote.py --- a/src/gajim-remote.py Thu Jan 14 15:50:21 2010 +0100 +++ b/src/gajim-remote.py Thu Jan 14 21:16:13 2010 +0100 @@ -106,7 +106,7 @@ _('Changes the status of account or accounts'), [ #offline, online, chat, away, xa, dnd, invisible should not be translated - (_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible '), True), + (_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible. If not set, use accoun\'t previous status'), False), (_('message'), _('status message'), False), (_('account'), _('change status of account "account". ' 'If not specified, try to change status of all accounts that have ' diff -r 50c1a5f0a005 -r 1eb1facb0e21 src/remote_control.py --- a/src/remote_control.py Thu Jan 14 15:50:21 2010 +0100 +++ b/src/remote_control.py Thu Jan 14 21:16:13 2010 +0100 @@ -416,9 +416,13 @@ specified status is changed for all accounts """ if status not in ('offline', 'online', 'chat', - 'away', 'xa', 'dnd', 'invisible'): - return DBUS_BOOLEAN(False) + 'away', 'xa', 'dnd', 'invisible'): + status = '' if account: + if not status: + if account not in gajim.connections: + return DBUS_BOOLEAN(False) + status = gajim.SHOW_LIST[gajim.connections[account].connected] gobject.idle_add(gajim.interface.roster.send_status, account, status, message) else: @@ -427,8 +431,14 @@ if not gajim.config.get_per('accounts', acc, 'sync_with_global_status'): continue + if status: + status_ = status + else: + if acc not in gajim.connections: + continue + status_ = gajim.SHOW_LIST[gajim.connections[acc].connected] gobject.idle_add(gajim.interface.roster.send_status, acc, - status, message) + status_, message) return DBUS_BOOLEAN(False) @dbus.service.method(INTERFACE, in_signature='ss', out_signature='')

1 0

gajim: [Jingle] Fix a bug when user didn't provide a stun server
by Thibaut GIRKA 14 Jan '10

14 Jan '10

changeset 50c1a5f0a005 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=50c1a5f0a005 description: [Jingle] Fix a bug when user didn't provide a stun server diffstat: src/common/jingle_rtp.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2468aa6e0f6d -r 50c1a5f0a005 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Wed Jan 13 18:40:48 2010 +0100 +++ b/src/common/jingle_rtp.py Thu Jan 14 15:50:21 2010 +0100 @@ -75,7 +75,7 @@ if gajim.config.get('use_stun_server'): stun_server = gajim.config.get('stun_server') if not stun_server and self.session.connection._stun_servers: - stun_server = self._stun_servers[0]['host'] + stun_server = self.session.connection._stun_servers[0]['host'] if stun_server: try: ip = socket.getaddrinfo(stun_server, 0, socket.AF_UNSPEC,

1 0

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2010