Commits October 2010

commits@gajim.org

2 participants
111 discussions

gajim: [Dicson] Add gui extension point when drawing a contact i...
by Yann Leboulanger 20 Oct '10

20 Oct '10

changeset cc570eefd2a4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cc570eefd2a4 description: [Dicson] Add gui extension point when drawing a contact in roster. Fixes #5988 diffstat: src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 965f66718640 -r cc570eefd2a4 src/roster_window.py --- a/src/roster_window.py Wed Oct 20 14:57:50 2010 +0200 +++ b/src/roster_window.py Wed Oct 20 21:53:36 2010 +0200 @@ -1278,6 +1278,9 @@ # it's not self contact self.model[iterG][C_JID] = self.model[iterG][C_JID] + gajim.plugin_manager.gui_extension_point('roster_draw_contact', self, + jid, account, contact) + return False def _is_pep_shown_in_roster(self, pep_type):

1 0

gajim: prevent traceback when opening change status dialog. Fixe...
by Yann Leboulanger 20 Oct '10

20 Oct '10

changeset 0f64fdfb45ce in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0f64fdfb45ce description: prevent traceback when opening change status dialog. Fixes #5985 diffstat: src/dialogs.py | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diffs (36 lines): diff -r b10ba9f938bd -r 0f64fdfb45ce src/dialogs.py --- a/src/dialogs.py Sat Oct 16 23:24:46 2010 +0200 +++ b/src/dialogs.py Tue Oct 19 21:43:09 2010 +0200 @@ -664,15 +664,14 @@ label = self.xml.get_object('activity_button_label') if 'activity' in self.pep_dict and self.pep_dict['activity'] in \ pep.ACTIVITIES: - if 'subactivity' in self.pep_dict and self.pep_dict['subactivity'] in \ - pep.ACTIVITIES[self.pep_dict['activity']]: + if 'subactivity' in self.pep_dict and self.pep_dict['subactivity'] \ + in pep.ACTIVITIES[self.pep_dict['activity']]: img.set_from_pixbuf(gtkgui_helpers.load_activity_icon( - self.pep_dict['activity'], self.pep_dict['subactivity']).\ - get_pixbuf()) + self.pep_dict['activity'], self.pep_dict['subactivity']).\ + get_pixbuf()) else: img.set_from_pixbuf(gtkgui_helpers.load_activity_icon( - self.pep_dict['activity']).get_pixbuf()) -# item.set_tooltip_text(pep.ACTIVITIES[category]['category']) + self.pep_dict['activity']).get_pixbuf()) if self.pep_dict['activity_text']: label.set_text(self.pep_dict['activity_text']) else: @@ -687,9 +686,9 @@ """ img = self.xml.get_object('mood_image') label = self.xml.get_object('mood_button_label') - if self.pep_dict['mood'] in pep.MOODS: + if 'mood' in self.pep_dict and self.pep_dict['mood'] in pep.MOODS: img.set_from_pixbuf(gtkgui_helpers.load_mood_icon( - self.pep_dict['mood']).get_pixbuf()) + self.pep_dict['mood']).get_pixbuf()) if self.pep_dict['mood_text']: label.set_text(self.pep_dict['mood_text']) else:

1 0

gajim: add missing icon
by Yann Leboulanger 20 Oct '10

20 Oct '10

changeset b10ba9f938bd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b10ba9f938bd description: add missing icon diffstat: icons/hicolor/48x48/actions/gajim-warning.png | 0 1 files changed, 0 insertions(+), 0 deletions(-) diffs (2 lines): diff -r e37a9765aa3a -r b10ba9f938bd icons/hicolor/48x48/actions/gajim-warning.png Binary file icons/hicolor/48x48/actions/gajim-warning.png has changed

1 0

gajim: fix traceback when goig offline in the first 30 sec after...
by Yann Leboulanger 20 Oct '10

20 Oct '10

changeset e37a9765aa3a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e37a9765aa3a description: fix traceback when goig offline in the first 30 sec after authenticating with GPG. Fixes #5970 diffstat: src/gui_interface.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 27d918537a27 -r e37a9765aa3a src/gui_interface.py --- a/src/gui_interface.py Wed Oct 06 21:18:47 2010 +0200 +++ b/src/gui_interface.py Wed Oct 13 22:33:39 2010 +0200 @@ -3594,7 +3594,7 @@ gajim.interface.forget_gpg_passphrase, self.keyid) for (account, cb) in self.callbacks: self.run_callback(account, cb) - del self.callbacks + self.callbacks = [] def create_dialog(self, account): title = _('Passphrase Required')

1 0

gajim: use $PYTHON in launch.sh
by Yann Leboulanger 20 Oct '10

20 Oct '10

changeset 27d918537a27 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=27d918537a27 description: use $PYTHON in launch.sh diffstat: launch.sh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (11 lines): diff -r fd382ac73308 -r 27d918537a27 launch.sh --- a/launch.sh Tue Oct 05 22:16:07 2010 +0200 +++ b/launch.sh Wed Oct 06 21:18:47 2010 +0200 @@ -1,3 +1,6 @@ #!/bin/sh +if [ ! $PYTHON ]; then + PYTHON="python"; +fi cd "$(dirname $0)/src" -exec python -OOt gajim.py "$@" +exec $PYTHON -OOt gajim.py "$@"

1 0

gajim: fix python.m4 file. Fixes #5963
by Yann Leboulanger 20 Oct '10

20 Oct '10

changeset fd382ac73308 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fd382ac73308 description: fix python.m4 file. Fixes #5963 diffstat: m4/python.m4 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 483aa28a464e -r fd382ac73308 m4/python.m4 --- a/m4/python.m4 Tue Oct 05 10:51:15 2010 +0200 +++ b/m4/python.m4 Tue Oct 05 22:16:07 2010 +0200 @@ -43,8 +43,8 @@ [AC_REQUIRE([AM_PATH_PYTHON]) AC_MSG_CHECKING(for headers required to compile python extensions) dnl deduce PYTHON_INCLUDES -py_prefix=`$PYTHON -c "import sys; print sys.prefix"` -py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"` +py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"` PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" if test "$py_prefix" != "$py_exec_prefix"; then PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"

1 0

gajim: update servers.xml from xmpp.org. Fixes #5797
by Yann Leboulanger 20 Oct '10

20 Oct '10

changeset 483aa28a464e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=483aa28a464e description: update servers.xml from xmpp.org. Fixes #5797 diffstat: data/other/servers.xml | 482 ++++++++---------------------------------------- src/config.py | 5 +- src/gtkgui_helpers.py | 31 +-- 3 files changed, 84 insertions(+), 434 deletions(-) diffs (truncated from 544 to 300 lines): diff -r fa4b55a7de20 -r 483aa28a464e data/other/servers.xml --- a/data/other/servers.xml Mon Oct 04 21:46:39 2010 +0200 +++ b/data/other/servers.xml Tue Oct 05 10:51:15 2010 +0200 @@ -1,403 +1,81 @@ - -<query xmlns="http://jabber.org/protocol/disco#items"> - <item jid="12jabber.com" name="Jabber server hosted by Anywise.com"> - <active port="5222"/> - </item> - <item jid="admin-networks.org" name=""> - <active port="5222"/> - </item> - <item jid="akl.lt" name="Jabber server in Lietuva (Lithuania)"> - <active port="5222"/> - </item> - <item jid="amber.org.uk" name=""> - <active port="5222"/> - </item> - <item jid="amessage.at" name="Austrian Jabber server"> - <active port="5222"/> - </item> - <item jid="amessage.be" name="Belgian Jabber server"> - <active port="5222"/> - </item> - <item jid="amessage.ch" name="Swiss Jabber server"> - <active port="5222"/> - </item> - <item jid="amessage.de" name="German Jabber server"> - <active port="5222"/> - </item> - <item jid="amessage.info" name="Jabber server from amessage"> - <active port="5222"/> - <digest algo="sha1" value="69:FA:D6:32:BF:84:CE:01:D9:FC:C5:1A:E3:04:12:FB:A5:28:03:1A"/> - </item> - <item jid="amessage.li" name="Jabber server in Liechtenstein"> - <active port="5222"/> - </item> - <item jid="aszlig.net" name=""> - <active port="5222"/> - </item> - <item jid="blabla.kz" name=""> - <active port="5222"/> - </item> - <item jid="bloodyxml.com" name="Hosted by Chote Networks (http://www.chote.com)"> - <active port="5222"/> - </item> - <item jid="borderlinenormal.com" name="Hosted by Chote Networks (http://www.chote.com)"> - <active port="5222"/> - </item> - <item jid="bulmalug.net" name="Server hosted by the Linux Users Group of the Balearic Islands"> - <active port="5222"/> - </item> - <item jid="chat.mail2web.com" name=""> - <active port="5222"/> - </item> - <item jid="default.co.yu" name="Server in Yugoslavia"> - <active port="5222"/> - </item> - <item jid="deshalbfrei.org" name=""> - <active port="5222"/> - </item> - <item jid="develog.com" name=""> - <active port="5222"/> - </item> - <item jid="dotgeek.org" name="Jabber server in Switzerland"> - <active port="5222"/> - </item> - <item jid="es.tipic.com" name="Spanish Jabber server hosted by Tipic"> - <active port="5222"/> - </item> - <item jid="foxalpha.de" name=""> - <active port="5222"/> - </item> - <item jid="fritalk.org" name="French Jabber Server"> - <active port="5222"/> - </item> - <item jid="gnubox.eu" name=""> - <active port="5222"/> - </item> - <item jid="here.dk" name="Jabber server in Denmark"> - <active port="5222"/> - </item> - <item jid="illx.org" name="Jabber server hosted by illx.org"> - <active port="5222"/> - </item> - <item jid='im.apinc.org' name='French server hosted by APINC'> - <active port='5222'/> - </item> - <item jid="im.flosoft.biz" name=""> - <active port="5222"/> - </item> - <item jid="im.toile-libre.org" name=""> - <active port="5222"/> - </item> - <item jid="ims.kelkoo.net" name="Server hosted by Kelkoo (France)"> - <active port="5222"/> - </item> - <item jid="jabber-fr.net" name="French Jabber server"> - <active port="5222"/> - </item> - <item jid="jabber-hispano.org" name="Servidor Jabber de la comunidad hispana"> - <active port="5222"/> - </item> - <item jid="jabber.3gnt.org" name="Server in Portugal"> - <active port="5222"/> - </item> - <item jid="jabber.ambrero.nl" name=""> - <active port="5222"/> - </item> - <item jid="jabber.anywise.com" name="Jabber server hosted by Anywise.com"> - <active port="5222"/> - </item> - <item jid="jabber.atman.pl" name="Another server in Poland"> - <active port="5222"/> - </item> - <item jid="jabber.autocom.pl" name="Server associated with jabberpl.org"> - <active port="5222"/> - </item> - <item jid="jabber.bettercom.de" name="Public server hosted by BetterCom"> - <active port="5222"/> - </item> - <item jid="jabber.cc" name=""> - <active port="5222"/> - </item> - <item jid="jabber.ccc.de" name="Service of the Chaos Computer Club"> - <active port="5222"/> - </item> - <item jid="jabber.cd.chalmers.se" name=""> - <active port="5222"/> - </item> - <item jid="jabber.cn" name="Jabber server for all of China! :-)"> - <active port="5222"/> - </item> - <item jid="jabber.com" name="Jabber server offered by Jabber, Inc."> - <active port="5222"/> - </item> - <item jid="jabber.com.cn" name="Jabber server in China"> - <active port="5222"/> - </item> - <item jid="jabber.cz" name="Czech Jabber server"> - <active port="5222"/> - </item> - <item jid="jabber.dk" name="Jabber server in Denmark"> - <active port="5222"/> - </item> - <item jid="jabber.earth.li" name="Jabber server hosted by earth.li"> - <active port="5222"/> - </item> - <item jid="jabber.evilrealms.net" name=""> - <active port="5222"/> - </item> - <item jid="jabber.felisberto.net" name="Server in Portugal"> - <active port="5222"/> - </item> - <item jid="jabber.fr" name="French server hosted by APINC"> - <active port="5222"/> - </item> - <item jid="jabber.freenet.de" name="Server in Germany"> - <active port="5222"/> - </item> - <item jid="jabber.hot-chilli.net" name=""> - <active port="5222"/> - </item> - <item jid="jabber.hu" name="Jabber server in Hungary"> - <active port="5222"/> - </item> - <item jid="jabber.i-pobox.net" name="Server in Germany"> - <active port="5222"/> - </item> - <item jid="jabber.kiev.ua" name="Server in Ukrain (Kiev)"> - <active port="5222"/> - </item> - <item jid="jabber.killerbees.org.uk" name=""> - <active port="5222"/> - </item> - <item jid="jabber.linux.it" name="Jabber server in Italy"> - <active port="5222"/> - </item> - <item jid="jabber.lutix.org" name=""> - <active port="5222"/> - </item> - <item jid="jabber.meta.net.nz" name="Jabber server in New Zealand"> - <active port="5222"/> - </item> - <item jid="jabber.minus273.org" name=""> - <active port="5222"/> - </item> - <item jid="jabber.mulasystems.com" name=""> - <active port="5222"/> - </item> - <item jid="jabber.ngnet.it" name="Server in Italy"> - <active port="5222"/> - </item> - <item jid="jabber.no" name=""> - <active port="5222"/> - </item> - <item jid="jabber.noxa.de" name="Server in Germany"> - <active port="5222"/> - </item> - <item jid="jabber.nuxo.net" name="Server in France"> - <active port="5222"/> - </item> - <item jid="jabber.obsidian.co.za" name="Server in South Africa"> - <active port="5222"/> - </item> - <item jid="jabber.od.ua" name=""> - <active port="5222"/> - </item> - <item jid="jabber.or.id" name="Indonesian Jabber server"> - <active port="5222"/> - </item> - <item jid="jabber.org" name="Server hosted by the Jabber Software Foundation"> - <active port="5222"/> - <digest algo="sha1" value="66:9B:DB:4F:85:B7:A2:26:4D:76:01:C1:14:ED:0A:A9:24:15:8C:85"/> - </item> - <item jid="jabber.org.au" name="Server in Australia"> - <active port="5222"/> - </item> - <item jid="jabber.org.nz" name=""> - <active port="5222"/> - </item> - <item jid="jabber.palomine.net" name="Server located in Delray Beach, Florida"> - <active port="5222"/> - </item> - <item jid="jabber.papla.pl" name=""> - <active port="5222"/> - </item> - <item jid="jabber.pilgerer.de" name=""> - <active port="5222"/> - </item> - <item jid="jabber.ru" name="Russian Jabber server"> - <active port="5222"/> - </item> - <item jid="jabber.sim.pl" name=""> - <active port="5222"/> - </item> - <item jid="jabber.sk" name="Slovak Jabber server"> - <active port="5222"/> - <digest algo="sha1" value="EB:2C:ED:CC:FD:C1:F8:8F:58:07:CE:EF:09:0F:72:45:5E:1E:7A:96"/> - </item> - <item jid="jabber.snc.ru" name="Jabber server in Russia"> - <active port="5222"/> - </item> - <item jid="jabber.te.ua" name="Server in Ukraine"> - <active port="5222"/> - </item> - <item jid="jabber.ttn.ru" name=""> - <active port="5222"/> - </item> - <item jid="jabber.turk-php.com" name=""> - <active port="5222"/> - </item> - <item jid="jabber.tuxfamily.org" name=""> - <active port="5222"/> - </item> - <item jid="jabber.typhon.net" name=""> - <active port="5222"/> - </item> - <item jid="jabber.unesco.kz" name="First public server in Kazakhstan"> - <active port="5222"/> - </item> - <item jid="jabber.unixfreunde.net" name=""> - <active port="5222"/> - </item> - <item jid="jabber.unoc.net" name=""> - <active port="5222"/> - </item> - <item jid="jabber.wiretrip.org" name="Jabber server from wiretrip.org"> - <active port="5222"/> - </item> - <item jid="jabber.wp.pl" name="Large Jabber server in Poland"> - <active port="5222"/> - </item> - <item jid="jabber.wroc.pl" name=""> - <active port="5222"/> - </item> - <item jid="jabber.xs4all.nl" name=""> - <active port="5222"/> - </item> - <item jid="jabber80.com" name="Jabber server over port 80 (SSL over port 443)"> - <active port="80"/> - </item> - <item jid="jabberafrica.org" name="Jabber server in Africa"> - <active port="5222"/> - </item> - <item jid="jabberes.org" name="Servidor Jabber de la comunidad hispana"> - <active port="5222"/> - </item> - <item jid="jabberme.de" name=""> - <active port="5222"/> - </item> - <item jid="jabbernet.dk" name="Jabber server in Denmark"> - <active port="5222"/> - </item>

1 0

gajim: don't close all GPG passphrase request dialogs when an ac...
by Yann Leboulanger 20 Oct '10

20 Oct '10

changeset fa4b55a7de20 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fa4b55a7de20 description: don't close all GPG passphrase request dialogs when an account goes offline. Fixes #5938 diffstat: src/gui_interface.py | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diffs (31 lines): diff -r 573786240249 -r fa4b55a7de20 src/gui_interface.py --- a/src/gui_interface.py Mon Oct 04 15:07:53 2010 +0200 +++ b/src/gui_interface.py Mon Oct 04 21:46:39 2010 +0200 @@ -229,7 +229,7 @@ del self.instances[account]['online_dialog'][name] for request in self.gpg_passphrase.values(): if request: - request.interrupt() + request.interrupt(account=account) if account in self.pass_dialog: self.pass_dialog[account].window.destroy() if show == 'offline': @@ -3564,9 +3564,15 @@ self.passphrase = None self.completed = False - def interrupt(self): - self.dialog.window.destroy() - self.callbacks = [] + def interrupt(self, account=None): + if account: + for (acct, cb) in self.callbacks: + if acct == account: + self.callbacks.remove((acct, cb)) + else: + self.callbacks = [] + if not len(self.callbacks): + self.dialog.window.destroy() def run_callback(self, account, callback): gajim.connections[account].gpg_passphrase(self.passphrase)

1 0

gajim: small precision in README.html. fixes #5961
by Yann Leboulanger 20 Oct '10

20 Oct '10

changeset 573786240249 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=573786240249 description: small precision in README.html. fixes #5961 diffstat: README.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e3bb40b23a60 -r 573786240249 README.html --- a/README.html Sun Oct 03 20:09:42 2010 +0200 +++ b/README.html Mon Oct 04 15:07:53 2010 +0200 @@ -68,7 +68,7 @@ <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> +or if you use hg version and 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> <p>You will need GNU autotools in order to install Gajim from svn. This includes:</p>

1 0

gajim: select a default activity when enable "choose an activity...
by Yann Leboulanger 20 Oct '10

20 Oct '10

changeset e3bb40b23a60 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e3bb40b23a60 description: select a default activity when enable "choose an activity". Fixes #5960 diffstat: src/dialogs.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (31 lines): diff -r 2b1cce2bc4c0 -r e3bb40b23a60 src/dialogs.py --- a/src/dialogs.py Fri Oct 01 10:31:26 2010 +0200 +++ b/src/dialogs.py Sun Oct 03 20:09:42 2010 +0200 @@ -343,8 +343,7 @@ self.activity = activity self.subactivity = subactivity self.text = text - self.xml = gtkgui_helpers.get_gtk_builder( - 'change_activity_dialog.ui') + self.xml = gtkgui_helpers.get_gtk_builder('change_activity_dialog.ui') self.window = self.xml.get_object('change_activity_dialog') self.window.set_transient_for(gajim.interface.roster.window) @@ -410,6 +409,8 @@ vbox.pack_start(rbtns[act], False, False, 0) + self.default_radio = rbtns['doing_chores_other'] + if self.activity in pep.ACTIVITIES: if not self.subactivity in pep.ACTIVITIES[self.activity]: self.subactivity = 'other' @@ -435,6 +436,8 @@ def on_enable_checkbutton_toggled(self, widget): self.notebook.set_sensitive(widget.get_active()) self.entry.set_sensitive(widget.get_active()) + if not self.activity: + self.default_radio.set_active(True) def on_rbtn_toggled(self, widget, data): if widget.get_active():

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2010