Commits June 2009

commits@gajim.org

7 participants
114 discussions

gajim-website: subversion -> mercurial
by Yann Leboulanger 07 Jun '09

07 Jun '09

changeset 8acbea248bda in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=8acbea248bda description: subversion -> mercurial diffstat: Design.php | 2 +- dev.php | 2 +- docs.php | 53 ++++++++++------------------------------------------- downloads.php | 20 ++++++++++---------- 4 files changed, 22 insertions(+), 55 deletions(-) diffs (181 lines): diff -r a34225f2e995 -r 8acbea248bda Design.php --- a/Design.php Sun Jun 07 18:55:51 2009 +0200 +++ b/Design.php Sun Jun 07 19:22:18 2009 +0200 @@ -106,7 +106,7 @@ _("Autopackage") => "downloads.php?lang=$language#autopackage", _("Windows installer") => "downloads.php?lang=$language#windows", _("Source") => "downloads.php?lang=$language#tarball", - _("Subversion") => "downloads.php?lang=$language#subversion", + _("Mercurial") => "downloads.php?lang=$language#mercurial", _("Daily snapshots") => "downloads.php?lang=$language#snaps", _("Old releases") => "downloads.php?lang=$language#old"); diff -r a34225f2e995 -r 8acbea248bda dev.php --- a/dev.php Sun Jun 07 18:55:51 2009 +0200 +++ b/dev.php Sun Jun 07 19:22:18 2009 +0200 @@ -24,7 +24,7 @@ print (" <h1>"); print _(" Repository"); print (" </h1>"); -print _("To checkout svn do")." <em>svn co svn://svn.gajim.org/gajim/trunk gajim</em>"; +print _("To checkout hg do")." <em>hg clone http://hg.gajim.org/gajim gajim</em>"; print (" <br/>"); print _(" You can also")." <a href=\"http://trac.gajim.org/browser/\">"._("browse SVN repository")."</a>."; print (" <br/>"); diff -r a34225f2e995 -r 8acbea248bda docs.php --- a/docs.php Sun Jun 07 18:55:51 2009 +0200 +++ b/docs.php Sun Jun 07 19:22:18 2009 +0200 @@ -12,73 +12,40 @@ print (" </h1></a>\n"); print ("<a name=\"tarball\"></a>\n"); -print ("<a name=\"subversion\"></a>\n"); +print ("<a name=\"mercurial\"></a>\n"); print (" <h2>\n"); -print _(" Tarball and Subversion\n"); +print _(" Tarball and Mercurial\n"); print (" </h2>\n"); $link = "<a href=\"downloads.php?lang=".$_SESSION['lang']."\">"._("download")."</a>"; printf(_(" To get one of these versions, go to the %s page.\n"), $link); print (" <h3>\n"); print _(" Under GNU/Linux\n"); print (" </h3>\n"); -print _(" To run this version, you have to install some packages: python2.3 python2.3-gtk2 and python2.3-glade2.\n"); -print _(" (With Debian, just run:")." <i>apt-get install python2.3 python2.3-gtk2 python2.3-glade2</i>).\n"; -print _(" Note that python2.4 can be used instead of python2.3.\n"); -print (" <br/>\n"); -print (" <br/>\n"); -print _(" To use the idle module, the trayicon one and the gtkspell one, you have to compile them. For idle you may need libxss-dev (if you don't have scrnsaver.h) and for the trayicon and gtkspell you can avoid compiling them, if you have gnome-python-extras."); -print (" <br/>\n"); -print _(" In order to compile them all type")." <i>make</i> "._("in the gajim folder. (python-dev, python-gtk2-dev, libgtkspell-dev and libgtk2.0-dev packages are needed)\n"); -print (" <br/>\n"); -print (" <br/>\n"); -print _(" You can install or run from source. To run from source"); -print (" <i>./launch.sh</i> ")._("in the gajim folder."); -print (" <br/>\n"); -print _(" To install ")." <i>su -c make install</i> "._("in the gajim folder"); -print _(" and then you just have to run")." <i>gajim</i> "._("in order to use Gajim.\n"); +print _(" To run this version, you have to install some packages. \n"); +$link = "<a href=\"http://trac.gajim.org/browser/README.html\">"._("README file")."</a>"; +printf(_(" See %s.\n"), $link); print (" <br/>\n"); print (" <h3>\n"); print _(" Under Microsoft Windows\n"); print (" </h3>\n"); -$link1 = "<a href=\"http://www.python.org\">python</a>"; -$link2 = "<a href=\"http://www.gtk.org\">GTK+</a>"; -$link3 = "<a href=\"http://www.pygtk.org\">pygtk</a>"; -$link4 = "<a href=\"http://starship.python.net/crew/mhammond/win32/\">pywin32</a>"; -printf(_(" In a first time, you have to install %s, %s, %s and %s.\n"), $link1, $link2, $link3, $link4); -print (" <br/>\n"); -print (" <ul>\n"); -print (" <li>\n"); -print _(" To get python, download the latest version")." <a href=\"http://python.org/ftp/python/\">"._("here")." </a>"._("(Gajim works with python-2.4.x)").", "._("and install it.\n"); -print (" </li>\n"); -print (" <li>\n"); -print _(" To get GTK+, download the latest version of the \"Runtime Environment\"")." <a href=\"http://gladewin32.sourceforge.net\">"._("here")."</a>, "._("and install it.\n"); -print (" </li>\n"); -print (" <li>\n"); -print _(" To get pygtk, download latest version ")." <a href=\"http://www.pcpm.ucl.ac.be/~gustin/win32_ports/pygtk.html\">"._("here")."</a> "._(" and install it.\n"); -print (" </li>\n"); -print (" <li>\n"); -print _(" At last, to get pywin32, download latest version ")." <a href=\"http://sourceforge.net/project/showfiles.php?group_id=78018\">"._("here")."</a> "._(" and install it.\n"); -print (" </li>\n"); -print (" </ul>\n"); -print (" <br/>\n"); -$link = "<a href=\"downloads.php?lang=".$_SESSION['lang']."\">"._("download Gajim")."</a>"; -printf(_(" You can now %s and double click on gajim.py in src folder.\n"), $link); +$link = "<a href=\"http://trac.gajim.org/wiki/Win32Env\">"._("this page")."</a>"; +printf(_("See %s to install development versio under windows."), $link); print (" <p>\n"); print ("<a name=\"jabber\"></a>"); print (" <h1>\n"); print (" Jabber\n"); print (" </h1>\n"); -print _(" Please read")." <a href=\"http://trac.gajim.org/wiki/WikiStart#help_quickstart_guides\">"._("here")."</a>.\n"; +print _(" Please read")." <a href=\"http://trac.gajim.org/wiki/GajimHelp#help_quickstart_guides\">"._("here")."</a>.\n"; print ("<a name=\"structure\"></a>"); print (" <h1>\n"); print _(" Structure\n"); print (" </h1>\n"); -print _(" You can understand how Gajim works")." <a href=\"http://trac.gajim.org/wiki/DevInfos\">"._("here")."</a>.\n"; +print _(" You can understand how Gajim works")." <a href=\"http://trac.gajim.org/wiki/DevPages#gajim_architecture\">"._("here")."</a>.\n"; print (" <br/>"); $link = "<a href=\"http://xmpppy.sourceforge.net/\">xmpppy</a>"; -printf(_(" Gajim uses the %s library to do the interface with Jabber network.\n"), $link); +printf(_(" Gajim uses a fork of the %s library to do the interface with Jabber network.\n"), $link); print (" </p>\n"); PiedDePage(); diff -r a34225f2e995 -r 8acbea248bda downloads.php --- a/downloads.php Sun Jun 07 18:55:51 2009 +0200 +++ b/downloads.php Sun Jun 07 19:22:18 2009 +0200 @@ -18,7 +18,7 @@ print ("</a>\n"); print _(" If you use Debian unstable do")." <i>apt-get install gajim</i>\n"; print (" <br/>\n"); -print _(" A daily package from svn is also built. To use it, remove gajim")." (<i>apt-get remove gajim</i>), "._("add this line to your")." /etc/apt/source.list:\n"; +print _(" A daily package from mercurial is also built. To use it, remove gajim")." (<i>apt-get remove gajim</i>), "._("add this line to your")." /etc/apt/source.list:\n"; print (" <br/>\n"); print (" <i>deb ftp://ftp.gajim.org/debian unstable main</i>\n"); print (" <br/>\n"); @@ -145,28 +145,28 @@ print ("</a>\n"); print _(" The tarball version of Gajim is ")."<a href=\"downloads/gajim-0.12.1.tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://trac.gajim.org/browser/tags/gajim-0.12.1/README.html?format=raw\">see the <tt>README</tt></a> ("._("in English").").<br />\n"; //print _(" The tarball version of 0.12 beta-release is ")."<a href=\"downloads/gajim-0.12-beta1.tar.gz\">"._("here")."</a>.<br />\n"; -print _("If you want to use the last unstable development version, then you should checkout the subversion repository.\n"); +print _("If you want to use the last unstable development version, then you should checkout the mercurial repository.\n"); print (" <br/>\n"); -print ("<a name=\"subversion\">\n"); +print ("<a name=\"mercurial\">\n"); print (" <h2>\n"); -print _(" Subversion\n"); +print _(" Mercurial\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" The subversion server is available at this address: ")."svn://svn.gajim.org/gajim "._("and viewable")." <a href=\"http://trac.gajim.org/browser/trunk/\">"._("here")."</a>.\n"; +print _(" The mercurial repository is available at this address: ")."http://hg.gajim.org/gajim "._("and viewable")." <a href=\"http://hg.gajim.org/gajim\">"._("here")."</a>.\n"; print (" <br/>\n"); print (" <h3>\n"); print _(" Under GNU/Linux\n"); print (" </h3>\n"); print _(" In order to download Gajim sources, here is what you have to do:\n"); -print _(" You first have to install subversion (<i>apt-get install subversion</i> under Debian)\n"); +print _(" You first have to install mercurial (<i>apt-get install mercurial</i> under Debian)\n"); print (" <br/>\n"); print _(" Then in a console, enter the following commands:\n"); print (" <br/>\n"); print (" <br/>\n"); print (" <i>\n"); -print (" svn co svn://svn.gajim.org/gajim/trunk gajim\n"); +print (" hg clone http://hg.gajim.org/gajim gajim\n"); print (" </i>\n"); print (" <br/>\n"); print (" <br/>\n"); @@ -181,11 +181,11 @@ print (" </i>\n"); print (" <br/>\n"); print (" <br/>\n"); -print _(" Once you have the repository, you can update it periodicaly so it matches the latest version from the server with the following command:\n"); +print _(" Once you have the repository, you can update it periodicaly so it matches the latest version from the main repository with the following command:\n"); print (" <br/>\n"); print (" <br/>\n"); print (" <i>\n"); -print (" svn update\n"); +print (" hg pull && hg upadte\n"); print (" </i>\n"); print (" <br/>\n"); @@ -206,7 +206,7 @@ print _(" Daily Snapshots\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" Everyday on 01:00 (GMT+1 time) gz tarballs are produced from svn. You can use them if svn is broken for you at the moment.")." <a href=\"downloads/snap/?M=D\">"._("Here to get them")."</a>.\n"; +print _(" Everyday on 01:00 (GMT+1 time) gz tarballs are produced from mercurial. You can use them if svn is broken for you at the moment.")." <a href=\"downloads/snap/?M=D\">"._("Here to get them")."</a>.\n"; print (" </p>\n"); print ("<a name=\"old\">\n");

1 0

gajim-website: announce 0.12.2 release
by Yann Leboulanger 07 Jun '09

07 Jun '09

changeset a34225f2e995 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=a34225f2e995 description: announce 0.12.2 release diffstat: index.php | 50 +++++++++++++++++++++++++++++++------------------- 1 files changed, 31 insertions(+), 19 deletions(-) diffs (90 lines): diff -r 43605f3bdf3a -r a34225f2e995 index.php --- a/index.php Wed Mar 11 17:07:49 2009 +0000 +++ b/index.php Sun Jun 07 18:55:51 2009 +0200 @@ -48,39 +48,51 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.12.1"), - 1 => sprintf(_("Gajim %s is here!"), "0.12"), - 2 => sprintf(_("Beta-release of Gajim %s"), "0.12"), - 3 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); + 0 => sprintf(_("Gajim %s is here!"), "0.12.2"), + 1 => sprintf(_("Gajim %s is here!"), "0.12.1"), + 2 => sprintf(_("Gajim %s is here!"), "0.12"), + 3 => sprintf(_("Beta-release of Gajim %s"), "0.12"), + 4 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("21 December 2008"), - 1 => _("17 December 2008"), - 2 => _("12 November 2008"), - 3 => _("12 August 2008")); + 0 => _("7 June 2009"), + 1 => _("21 December 2008"), + 2 => _("17 December 2008"), + 3 => _("12 November 2008"), + 4 => _("12 August 2008")); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.12.1"), - 1 => sprintf(_("Version %s of Gajim has been released."), "0.12"), - 2 => sprintf(_("Version %s will arrive very soon."), "0.12"), - 3 => sprintf(_("Version %s will arrive soon."), "0.12")); + 0 => sprintf(_("Version %s of Gajim has been released."), "0.12.2"), + 1 => sprintf(_("Version %s of Gajim has been released."), "0.12.1"), + 2 => sprintf(_("Version %s of Gajim has been released."), "0.12"), + 3 => sprintf(_("Version %s will arrive very soon."), "0.12"), + 4 => sprintf(_("Version %s will arrive soon."), "0.12")); // 3 => sprintf(_("New Windows Installer with GTK+ included.")), $array_news_whats_new = array( - 0 => sprintf(_("What's new since %s:"), "0.12"), - 1 => sprintf(_("What's new since %s:"), "0.12-beta1"), - 2 => sprintf(_("What's new since %s:"), "0.12-alpha1"), - 3 => sprintf(_("What's new since %s:"), "0.11.4")); + 0 => sprintf(_("What's new since %s:"), "0.12.1"), + 1 => sprintf(_("What's new since %s:"), "0.12"), + 2 => sprintf(_("What's new since %s:"), "0.12-beta1"), + 3 => sprintf(_("What's new since %s:"), "0.12-alpha1"), + 4 => sprintf(_("What's new since %s:"), "0.11.4")); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( + 0 => _("Better keepalive / ping behaviour"), + 1 => _("Handle XFCE notification-daemon"), + 2 => _("Restore old behaviour of click on systray: left click to open events"), + 3 => _("Network manager 0.7 support"), + 4 => _("<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.12.2\">"._("List of fixed bugs")."</a>"), + ); + +$array_news_items[1] = array( 0 => _("Fix filetransfer"), 1 => _("Updated german translation"), 2 => _("Fix click on notifications when text string is empty"), 3 => _("Improve systray popup menu"), ); -$array_news_items[1] = array( +$array_news_items[2] = array( 0 => _("Fix text rendering in notifications"), 1 => _("Fix forward unread messages under Windows"), 2 => _("Better sessions support"), @@ -93,7 +105,7 @@ 9 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.12\">"._("Bugs/Annoyances closed")."</a>", ); -$array_news_items[2] = array( +$array_news_items[3] = array( 0 => _("Security improvements: Kerberos (GSSAPI) SASL Authentication mechanism"), 1 => _("Improve GUI of some windows"), 2 => _("Fix handling of invalid XML"), @@ -104,7 +116,7 @@ 7 => "<a href = \"http://trac.gajim.org/query?status=assigned&status=new&status=reopened&mile…">"._("Known Bugs/Annoyances")."</a>", ); -$array_news_items[3] = array( +$array_news_items[4] = array( 0 => _("Security improvements: End-to-End encryption, SSL certificat verification"), 1 => _("Ability to minimize groupchats in roster"), 2 => _("Chat to groupchat transformation"),

1 0

gajim: fix release date
by Yann Leboulanger 07 Jun '09

07 Jun '09

changeset 8af9d0f68948 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8af9d0f68948 description: fix release date diffstat: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (9 lines): diff -r 331afed8d0ed -r 8af9d0f68948 ChangeLog --- a/ChangeLog Sun Jun 07 17:34:48 2009 +0200 +++ b/ChangeLog Sun Jun 07 18:03:30 2009 +0200 @@ -1,4 +1,4 @@ -Gajim 0.12.2 (XX June 2009) +Gajim 0.12.2 (07 June 2009) * Better keepalive / ping behaviour * Fix custom port handling

1 0

gajim: fix missing import. Fixes #5078
by Yann Leboulanger 07 Jun '09

07 Jun '09

changeset 331afed8d0ed in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=331afed8d0ed description: fix missing import. Fixes #5078 diffstat: src/chat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 22b67d3eba1c -r 331afed8d0ed src/chat_control.py --- a/src/chat_control.py Fri Jun 05 21:26:23 2009 +0200 +++ b/src/chat_control.py Sun Jun 07 17:34:48 2009 +0200 @@ -2400,6 +2400,7 @@ rows = gajim.logger.get_last_conversation_lines(jid, restore_how_many, pending_how_many, timeout, self.account) except exceptions.DatabaseMalformed: + import common.logger dialogs.ErrorDialog(_('Database Error'), _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH) rows = []

1 0

gajim: add ossplay to the list of tested soundplayer. Fixes #5061
by Yann Leboulanger 07 Jun '09

07 Jun '09

changeset 823f3461f8c3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=823f3461f8c3 description: add ossplay to the list of tested soundplayer. Fixes #5061 X-Hg-Repo: gajim Subject: gajim: mark groupchat messages as read when we scroll at the end in groupchat window From: Yann Leboulanger <asterix(a)lagaule.org> changeset 16fbbe884fde in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=16fbbe884fde description: mark groupchat messages as read when we scroll at the end in groupchat window X-Hg-Repo: gajim Subject: gajim: really execute ad hoc command when clicking on Execute command in disco window From: Yann Leboulanger <asterix(a)lagaule.org> changeset 22b67d3eba1c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=22b67d3eba1c description: really execute ad hoc command when clicking on Execute command in disco window diffstat: src/adhoc_commands.py | 12 ++++++++---- src/chat_control.py | 6 +++++- src/disco.py | 5 +++-- src/gajim.py | 2 +- 4 files changed, 17 insertions(+), 8 deletions(-) diffs (85 lines): diff -r 18fd2007aade -r 22b67d3eba1c src/adhoc_commands.py --- a/src/adhoc_commands.py Sat Jun 06 18:01:37 2009 +0200 +++ b/src/adhoc_commands.py Fri Jun 05 21:26:23 2009 +0200 @@ -44,7 +44,7 @@ TODO: gtk 2.10 has a special wizard-widget, consider using it...''' - def __init__(self, account, jid): + def __init__(self, account, jid, commandnode=None): '''Create new window.''' # an account object @@ -55,7 +55,7 @@ self.commandlist=None # a list of (commandname, commanddescription) # command's data - self.commandnode = None + self.commandnode = commandnode self.sessionid = None self.dataform = None self.allow_stage3_close = False @@ -78,8 +78,12 @@ self.data_form_widget.show() self.sending_form_stage_vbox.pack_start(self.data_form_widget) - # setting initial stage - self.stage1() + if self.commandnode: + # Execute command + self.stage3() + else: + # setting initial stage + self.stage1() # displaying the window self.xml.signal_autoconnect(self) diff -r 18fd2007aade -r 22b67d3eba1c src/chat_control.py --- a/src/chat_control.py Sat Jun 06 18:01:37 2009 +0200 +++ b/src/chat_control.py Fri Jun 05 21:26:23 2009 +0200 @@ -922,7 +922,11 @@ self.parent_win.get_active_control() == self and \ self.parent_win.window.is_active(): # we are at the end - if self.session and self.session.remove_events(types_list): + if self.type_id == message_control.TYPE_GC: + if not gajim.events.remove_events(self.account, jid, + types=types_list): + self.redraw_after_event_removed(jid) + elif self.session and self.session.remove_events(types_list): # There were events to remove self.redraw_after_event_removed(jid) diff -r 18fd2007aade -r 22b67d3eba1c src/disco.py --- a/src/disco.py Sat Jun 06 18:01:37 2009 +0200 +++ b/src/disco.py Fri Jun 05 21:26:23 2009 +0200 @@ -1259,14 +1259,15 @@ self._renderer.set_property('cell-background', bgcolor) self.window.services_treeview.queue_draw() - def on_execute_button_clicked(self, widget = None): + def on_execute_button_clicked(self, widget=None): '''When we want to execute a command: open adhoc command window''' model, iter = self.window.services_treeview.get_selection().get_selected() if not iter: return service = model[iter][0].decode('utf-8') - adhoc_commands.CommandWindow(self.account, service) + node = model[iter][1].decode('utf-8') + adhoc_commands.CommandWindow(self.account, service, commandnode=node) def on_register_button_clicked(self, widget = None): '''When we want to register an agent: diff -r 18fd2007aade -r 22b67d3eba1c src/gajim.py --- a/src/gajim.py Sat Jun 06 18:01:37 2009 +0200 +++ b/src/gajim.py Fri Jun 05 21:26:23 2009 +0200 @@ -3476,7 +3476,7 @@ if gajim.config.get('soundplayer') == '': # only on first time Gajim starts - commands = ('aplay', 'play', 'esdplay', 'artsplay') + commands = ('aplay', 'play', 'esdplay', 'artsplay', 'ossplay') for command in commands: if helpers.is_in_path(command): if command == 'aplay':

1 0

[commit-gajim] r11283 - trunk/src
by vardo＠gajim.org 07 Jun '09

07 Jun '09

Author: vardo Date: 2009-06-07 10:42:42 +0200 (Sun, 07 Jun 2009) New Revision: 11283 Modified: trunk/src/gajim.py Log: Added WarningDialog popup when Gajim starts with info that SVN repo is not used anymore. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2009-05-12 11:37:37 UTC (rev 11282) +++ trunk/src/gajim.py 2009-06-07 08:42:42 UTC (rev 11283) @@ -3482,6 +3482,9 @@ except Exception: pass gobject.timeout_add_seconds(5, remote_init) + + dialogs.WarningDialog(_('SVN repository is not used anymore'), + _('Subversion repository svn://svn.gajim.org is not updated anymore. Gajim project migrated to Mercurial DVCS. More info can be found at wiki page: http://trac.gajim.org/wiki/DevHG')) if __name__ == '__main__': def sigint_cb(num, stack):

1 0

gajim: Merged default branch with plugin-system branch. Not all ...
by vardo＠lagaule.org 07 Jun '09

07 Jun '09

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(a)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(a)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

1 0

gajim: put latest filetransfer on top
by Yann Leboulanger 06 Jun '09

06 Jun '09

changeset 7bfcc5454643 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7bfcc5454643 description: put latest filetransfer on top diffstat: src/filetransfers_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fd021f7d2795 -r 7bfcc5454643 src/filetransfers_window.py --- a/src/filetransfers_window.py Fri Jun 05 21:26:23 2009 +0200 +++ b/src/filetransfers_window.py Sat Jun 06 19:05:49 2009 +0200 @@ -589,7 +589,7 @@ return file_props['elapsed-time'] = 0 self.files_props[file_props['type']][file_props['sid']] = file_props - iter_ = self.model.append() + iter_ = self.model.prepend() text_labels = '<b>' + _('Name: ') + '</b>\n' if file_props['type'] == 'r': text_labels += '<b>' + _('Sender: ') + '</b>'

1 0

gajim: [Pavol Klačanský] updated Slovak translation
by Yann Leboulanger 06 Jun '09

06 Jun '09

changeset 18fd2007aade in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=18fd2007aade description: [Pavol Klačanský] updated Slovak translation diffstat: po/sk.po | 1038 ++++++++++++++++++++++++++++++---------------------------------- 1 files changed, 494 insertions(+), 544 deletions(-) diffs (truncated from 2953 to 300 lines): diff -r 2fb08580caf7 -r 18fd2007aade po/sk.po --- a/po/sk.po Thu Jun 04 17:34:38 2009 +0200 +++ b/po/sk.po Sat Jun 06 18:01:37 2009 +0200 @@ -1,21 +1,21 @@ # Slovak translation for gajim -# Copyright (c) (c) 2005 Canonical Ltd, and Rosetta Contributors 2005 +# Copyright (c) 2005, 2008, 2009 Canonical Ltd, and Rosetta Contributors # This file is distributed under the same license as the gajim package. # Juraj Michalek <juraj.michalek(a)asinus.org>, 2005. -# Pavol Klačanský <pavolzetor(a)gmail.com>, 2008. +# Pavol Klačanský <pavol(a)klacansky.com>, 2008, 2009. # msgid "" msgstr "" "Project-Id-Version: gajim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-21 22:39+0200\n" -"PO-Revision-Date: 2008-08-20 12:08+0200\n" -"Last-Translator: Pavol Klačanský <pavolzetor(a)gmail.com>\n" +"POT-Creation-Date: 2009-06-05 20:16+0200\n" +"PO-Revision-Date: 2009-06-06 17:48+0200\n" +"Last-Translator: Pavol Klačanský <pavol(a)klacansky.com>\n" "Language-Team: Slovak <sk-i18n(a)lists.linux.sk>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" #: ../data/gajim.desktop.in.in.h:1 msgid "A GTK+ Jabber client" @@ -23,7 +23,7 @@ #: ../data/gajim.desktop.in.in.h:2 msgid "Gajim Instant Messenger" -msgstr "Internetový komunikátor Gajim" +msgstr "Gajim - internetový komunikátor" #: ../data/gajim.desktop.in.in.h:3 msgid "Jabber IM Client" @@ -75,7 +75,7 @@ "\n" "Please wait..." msgstr "" -"<b>Pripájam k serveru</b>\n" +"<b>Pripája sa k serveru</b>\n" "\n" "Prosím počkajte..." @@ -96,6 +96,8 @@ "Add this certificate to the list of trusted certificates.\n" "SHA1 fingerprint of the certificate:\n" msgstr "" +"Pridať tento certifikát do zoznamu dôverných certifikátov.SHA1 odtlačok " +"certifikátu:\n" #: ../data/glade/account_creation_wizard_window.glade.h:10 msgid "Connect when I press Finish" @@ -344,7 +346,7 @@ #: ../data/glade/account_modification_window.glade.h:27 #: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1605 -#: ../src/config.py:2108 +#: ../src/config.py:2110 msgid "No key selected" msgstr "Žiadny kľúč nie je vybraný" @@ -353,8 +355,8 @@ #: ../data/glade/accounts_window.glade.h:36 #: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1192 #: ../src/config.py:1263 ../src/config.py:1510 ../src/config.py:1515 -#: ../src/config.py:2016 ../src/config.py:2094 ../src/config.py:2107 -#: ../src/config.py:3200 ../src/config.py:3268 ../src/dialogs.py:293 +#: ../src/config.py:2018 ../src/config.py:2096 ../src/config.py:2109 +#: ../src/config.py:3202 ../src/config.py:3270 ../src/dialogs.py:293 #: ../src/dialogs.py:295 ../src/dialogs.py:524 ../src/roster_window.py:2753 #: ../src/roster_window.py:2759 ../src/roster_window.py:2764 msgid "None" @@ -466,9 +468,8 @@ msgstr "<b>Proxy</b>" #: ../data/glade/accounts_window.glade.h:5 -#, fuzzy msgid "A_djust to status" -msgstr "_Upraviť stav" +msgstr "_Upraviť na stav" #: ../data/glade/accounts_window.glade.h:7 msgid "Accounts" @@ -483,7 +484,6 @@ "nezabezpečené spojenie." #: ../data/glade/accounts_window.glade.h:16 -#, fuzzy msgid "Co_nnect on Gajim startup" msgstr "Prip_ojiť sa pri štarte programu Gajim" @@ -533,63 +533,52 @@ msgstr "Preme_novať" #: ../data/glade/accounts_window.glade.h:46 -#, fuzzy msgid "Send _keep-alive packets" -msgstr "Poslať pakety na udržiavanie spojenia" +msgstr "Poslať pa_kety na udržiavanie spojenia" #: ../data/glade/accounts_window.glade.h:48 -#, fuzzy msgid "Synchroni_ze account status with global status" -msgstr "Synch_ronizovať stav účtu s globálnym stavom" +msgstr "Synchroni_zovať stav účtu s globálnym stavom" #: ../data/glade/accounts_window.glade.h:50 -#, fuzzy msgid "Use G_PG Agent" -msgstr "Použit GPG _agenta" +msgstr "Použit G_PG agenta" #: ../data/glade/accounts_window.glade.h:51 -#, fuzzy msgid "Use cust_om hostname/port" -msgstr "Použiť vlastný názov hostiteľa/portu" +msgstr "Použiť vlastný názov h_ostiteľa/portu" #: ../data/glade/accounts_window.glade.h:52 -#, fuzzy msgid "Use cust_om port:" -msgstr "Použiť vlastný port:" +msgstr "Použiť vlastný p_ort:" #: ../data/glade/accounts_window.glade.h:54 -#, fuzzy msgid "_Edit Personal Information..." -msgstr "Upraviť osobné informácie..." +msgstr "_Upraviť osobné informácie..." #: ../data/glade/accounts_window.glade.h:55 -#, fuzzy msgid "_Enable" -msgstr "Povoliť" +msgstr "_Povoliť" #: ../data/glade/accounts_window.glade.h:56 -#, fuzzy msgid "_Hostname: " -msgstr "Názov _hostiteľa:" +msgstr "Názov _hostiteľa: " #: ../data/glade/accounts_window.glade.h:58 -#, fuzzy msgid "_Manage..." -msgstr "Spravovať..." +msgstr "_Spravovať..." #: ../data/glade/accounts_window.glade.h:60 -#, fuzzy msgid "_Port: " -msgstr "_Port:" +msgstr "_Port: " #: ../data/glade/accounts_window.glade.h:61 msgid "_Warn before using an insecure connection" msgstr "V_arovať pred použitím nezabezpečeného spojenia" #: ../data/glade/accounts_window.glade.h:62 -#, fuzzy msgid "_use HTTP__PROXY environment variable" -msgstr "Použiť HTTP_PROXY premenu prostredia" +msgstr "po_užiť HTTP_PROXY premennú prostredia" #: ../data/glade/accounts_window.glade.h:63 msgid "gtk-add" @@ -627,6 +616,9 @@ "protocol. Click on register button to\n" "proceed." msgstr "" +"Musíte sa registrovať pomocou tohto transportu\n" +"aby ste mohli pridať kontakt z tohto protokolu. \n" +"Pre pokračocanie kliknite na tlačidlo registrovať." #: ../data/glade/add_new_contact_window.glade.h:9 msgid "" @@ -776,7 +768,7 @@ #: ../data/glade/advanced_notifications_window.glade.h:6 msgid "Advanced Notifications Control" -msgstr "Pokročilé nastavenie upozornení" +msgstr "Pokročilé nastavenie oznámení" #: ../data/glade/advanced_notifications_window.glade.h:7 msgid "All statuses" @@ -996,7 +988,7 @@ #: ../data/glade/chat_context_menu.glade.h:4 msgid "_Copy Link Location" -msgstr "_Kopírovať adresu odkazu" +msgstr "_Kopírovať umiestnenie odkazu" #: ../data/glade/chat_context_menu.glade.h:5 msgid "_Open Email Composer" @@ -1129,7 +1121,7 @@ #: ../data/glade/filetransfers.glade.h:9 msgid "Removes completed, cancelled and failed file transfers from the list" -msgstr "" +msgstr "Odstráni dokončené, zrušené a zlyhané prenosy súborov zo zoznamu" #: ../data/glade/filetransfers.glade.h:10 msgid "Shows a list of file transfers between you and others" @@ -1145,7 +1137,7 @@ #: ../data/glade/filetransfers.glade.h:12 msgid "When a file transfer is complete show a popup notification" -msgstr "Keď je prenos súboru dokončený zobraziť vyskakovacie upozornenie" +msgstr "Keď je prenos súboru dokončený zobraziť vyskakovacie oznámenie" #: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:794 msgid "_Continue" @@ -1316,8 +1308,8 @@ msgstr "Od" #. holds subject -#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:170 -#: ../src/history_manager.py:201 +#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195 +#: ../src/history_manager.py:226 msgid "Subject" msgstr "Predmet" @@ -1417,7 +1409,7 @@ msgstr "Miestnosť:" #: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1200 -#: ../src/disco.py:1621 +#: ../src/disco.py:1622 msgid "_Join" msgstr "_Pripojiť" @@ -1518,9 +1510,8 @@ msgstr "Prehliadať históriu rozhovoru (Ctrl+H)" #: ../data/glade/message_window.glade.h:4 -#, fuzzy msgid "Change the room's subject (Alt+T)" -msgstr "Zmeniť predmet miestnosti (Ctrl+T)" +msgstr "Zmeniť predmet v miestnosti (Alt+T)" #: ../data/glade/message_window.glade.h:5 msgid "Change your nickname (Ctrl+N)" @@ -1579,7 +1570,7 @@ #: ../data/glade/preferences_window.glade.h:6 msgid "<b>Chat state notifications</b>" -msgstr "<b>Upozornenia stavu rozhovoru</b>" +msgstr "<b>Oznámenia stavu rozhovoru</b>" #. a header for custom browser/client/file manager. so translate sth like: Custom Settings #: ../data/glade/preferences_window.glade.h:8 @@ -1616,7 +1607,7 @@ #: ../data/glade/preferences_window.glade.h:18 msgid "<b>Visual Notifications</b>" -msgstr "<b>Vizuálne upozornenie</b>" +msgstr "<b>Vizuálne oznámenie</b>" #: ../data/glade/preferences_window.glade.h:19 msgid "Advanced" @@ -1643,7 +1634,7 @@ #: ../data/glade/preferences_window.glade.h:25 msgid "Allow popup/notifications when I'm _away/na/busy/invisible" msgstr "" -"Povoliť vyskakovacie okná/upozornenia v stavoch _preč/nedostupný/zamestnaný/" +"Povoliť vyskakovacie okná/oznámenia v stavoch _preč/nedostupný/zamestnaný/" "neviditeľný" #: ../data/glade/preferences_window.glade.h:26 @@ -1845,8 +1836,8 @@ "If checked, Gajim will show a notification when a new e-mail is received via " "GMail" msgstr "" -"Ak je zaškrtnuté, Gajim zobrazí upozornenie, keď bude prijatý nový e-mail " -"cez GMail" +"Ak je zaškrtnuté, Gajim zobrazí oznámenie, keď bude prijatý nový e-mail cez " +"GMail" #: ../data/glade/preferences_window.glade.h:64 msgid "" @@ -1888,7 +1879,7 @@ #: ../data/glade/preferences_window.glade.h:70 msgid "Notifications" -msgstr "Upozornenia" +msgstr "Oznámenia" #: ../data/glade/preferences_window.glade.h:71 msgid "Notify me about contacts that sign _in" @@ -1918,7 +1909,7 @@ msgstr "" "Vyskakovacie okno\n" "Upozorniť ma o tom\n"

1 0

gajim: Merge default branch into osx_newbuildsys.
by Jonathan Schleifer 05 Jun '09

05 Jun '09

changeset 7de5f685aca6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7de5f685aca6 description: Merge default branch into osx_newbuildsys. diffstat: src/adhoc_commands.py | 12 ++++++++---- src/chat_control.py | 6 +++++- src/disco.py | 8 +++++--- src/gajim.py | 2 +- src/groupchat_control.py | 8 ++++++++ src/history_manager.py | 2 +- src/vcard.py | 15 +++++++-------- 7 files changed, 35 insertions(+), 18 deletions(-) diffs (178 lines): diff -r 054e282ed59c -r 7de5f685aca6 src/adhoc_commands.py --- a/src/adhoc_commands.py Mon Jun 01 15:41:00 2009 +0200 +++ b/src/adhoc_commands.py Fri Jun 05 22:07:58 2009 +0200 @@ -44,7 +44,7 @@ TODO: gtk 2.10 has a special wizard-widget, consider using it...''' - def __init__(self, account, jid): + def __init__(self, account, jid, commandnode=None): '''Create new window.''' # an account object @@ -55,7 +55,7 @@ self.commandlist=None # a list of (commandname, commanddescription) # command's data - self.commandnode = None + self.commandnode = commandnode self.sessionid = None self.dataform = None self.allow_stage3_close = False @@ -78,8 +78,12 @@ self.data_form_widget.show() self.sending_form_stage_vbox.pack_start(self.data_form_widget) - # setting initial stage - self.stage1() + if self.commandnode: + # Execute command + self.stage3() + else: + # setting initial stage + self.stage1() # displaying the window self.xml.signal_autoconnect(self) diff -r 054e282ed59c -r 7de5f685aca6 src/chat_control.py --- a/src/chat_control.py Mon Jun 01 15:41:00 2009 +0200 +++ b/src/chat_control.py Fri Jun 05 22:07:58 2009 +0200 @@ -1022,7 +1022,11 @@ self.parent_win.get_active_control() == self and \ self.parent_win.window.is_active(): # we are at the end - if self.session and self.session.remove_events(types_list): + if self.type_id == message_control.TYPE_GC: + if not gajim.events.remove_events(self.account, jid, + types=types_list): + self.redraw_after_event_removed(jid) + elif self.session and self.session.remove_events(types_list): # There were events to remove self.redraw_after_event_removed(jid) diff -r 054e282ed59c -r 7de5f685aca6 src/disco.py --- a/src/disco.py Mon Jun 01 15:41:00 2009 +0200 +++ b/src/disco.py Fri Jun 05 22:07:58 2009 +0200 @@ -1241,7 +1241,8 @@ return service = model[iter_][0].decode('utf-8') if service in gajim.interface.instances[self.account]['search']: - gajim.interface.instances[self.account]['search'][service].present() + gajim.interface.instances[self.account]['search'][service].window.\ + present() else: gajim.interface.instances[self.account]['search'][service] = \ search_window.SearchWindow(self.account, service) @@ -1257,14 +1258,15 @@ self._renderer.set_property('cell-background', bgcolor) self.window.services_treeview.queue_draw() - def on_execute_button_clicked(self, widget = None): + def on_execute_button_clicked(self, widget=None): '''When we want to execute a command: open adhoc command window''' model, iter_ = self.window.services_treeview.get_selection().get_selected() if not iter_: return service = model[iter_][0].decode('utf-8') - adhoc_commands.CommandWindow(self.account, service) + node = model[iter_][1].decode('utf-8') + adhoc_commands.CommandWindow(self.account, service, commandnode=node) def on_register_button_clicked(self, widget = None): '''When we want to register an agent: diff -r 054e282ed59c -r 7de5f685aca6 src/gajim.py --- a/src/gajim.py Mon Jun 01 15:41:00 2009 +0200 +++ b/src/gajim.py Fri Jun 05 22:07:58 2009 +0200 @@ -3478,7 +3478,7 @@ if gajim.config.get('soundplayer') == '': # only on first time Gajim starts - commands = ('aplay', 'play', 'esdplay', 'artsplay') + commands = ('aplay', 'play', 'esdplay', 'artsplay', 'ossplay') for command in commands: if helpers.is_in_path(command): if command == 'aplay': diff -r 054e282ed59c -r 7de5f685aca6 src/groupchat_control.py --- a/src/groupchat_control.py Mon Jun 01 15:41:00 2009 +0200 +++ b/src/groupchat_control.py Fri Jun 05 22:07:58 2009 +0200 @@ -1238,6 +1238,11 @@ else: iter_ = self.get_contact_iter(nick) if not iter_: + if '210' in statusCode: + # Server changed our nick + self.nick = nick + s = _('You are now known as %s') % nick + self.print_conversation(s, 'info', tim=tim) iter_ = self.add_contact_to_roster(nick, show, role, affiliation, status, jid) newly_created = True @@ -1247,6 +1252,9 @@ else: gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) + if not gc_c: + log.error('%s has an iter, but no gc_contact instance') + return # Re-get vcard if avatar has changed # We do that here because we may request it to the real JID if we # knows it. connections.py doesn't know it. diff -r 054e282ed59c -r 7de5f685aca6 src/history_manager.py --- a/src/history_manager.py Mon Jun 01 15:41:00 2009 +0200 +++ b/src/history_manager.py Fri Jun 05 22:07:58 2009 +0200 @@ -525,7 +525,7 @@ continue try: - time_ = time.strftime('%x', time.localtime(float(time_))).decode( + time_ = time.strftime('%c', time.localtime(float(time_))).decode( locale.getpreferredencoding()) except ValueError: pass diff -r 054e282ed59c -r 7de5f685aca6 src/vcard.py --- a/src/vcard.py Mon Jun 01 15:41:00 2009 +0200 +++ b/src/vcard.py Fri Jun 05 22:07:58 2009 +0200 @@ -90,12 +90,16 @@ gc_contact.room_jid, account) if gc_contact.jid and not gc_control.is_anonymous: self.real_jid = gc_contact.jid + self.real_jid_for_vcard = gc_contact.jid if gc_contact.resource: self.real_jid += '/' + gc_contact.resource else: self.real_jid = gc_contact.get_full_jid() + self.real_jid_for_vcard = self.real_jid + self.real_resource = gc_contact.name else: self.real_jid = contact.get_full_jid() + self.real_resource = contact.resource puny_jid = helpers.sanitize_filename(contact.jid) local_avatar_basepath = os.path.join(gajim.AVATAR_PATH, puny_jid) + \ @@ -395,10 +399,9 @@ gobject.idle_add(gajim.connections[self.account].\ request_entity_time, self.contact.jid, self.contact.resource) - - self.os_info = {0: {'resource': self.contact.resource, 'client': '', + self.os_info = {0: {'resource': self.real_resource, 'client': '', 'os': ''}} - self.time_info = {0: {'resource': self.contact.resource, 'time': ''}} + self.time_info = {0: {'resource': self.real_resource, 'time': ''}} i = 1 contact_list = gajim.contacts.get_contacts(self.account, self.contact.jid) if contact_list: @@ -430,11 +433,7 @@ if self.gc_contact: # If we know the real jid, remove the resource from vcard request - if self.gc_contact.jid: - jid = self.gc_contact.jid - else: - jid = self.real_jid - gajim.connections[self.account].request_vcard(jid, + gajim.connections[self.account].request_vcard(self.real_jid_for_vcard, self.gc_contact.get_full_jid()) else: gajim.connections[self.account].request_vcard(self.contact.jid)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2009