Commits February 2013

commits@gajim.org

3 participants
86 discussions

gajim: Update services.xml from xmpp.net/services.xml Fixes #7310
by Denis Fomin 28 Feb '13

28 Feb '13

changeset 6540fc19fc76 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6540fc19fc76 description: Update services.xml from xmpp.net/services.xml Fixes #7310 diffstat: data/other/servers.xml | 76 +------------------------------------------------ 1 files changed, 2 insertions(+), 74 deletions(-) diffs (87 lines): diff -r 4e7cd80d50bb -r 6540fc19fc76 data/other/servers.xml --- a/data/other/servers.xml Sat Feb 23 11:41:36 2013 -0400 +++ b/data/other/servers.xml Thu Feb 28 12:05:07 2013 +0400 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?>  -<query> - <item jid="0nl1ne.at"/> - <item jid="binaryfreedom.info"/> - <item jid="boese-ban.de"/> - <item jid="brauchen.info"/> - <item jid="cassilis.net"/> - <item jid="chatmask.com"/> - <item jid="climm.org"/> - <item jid="codingteam.net"/> - <item jid="darkdna.net"/> - <item jid="default.rs"/> - <item jid="deshalbfrei.org"/> - <item jid="draugr.de"/> - <item jid="im.apinc.org"/> - <item jid="im.flosoft.biz"/> - <item jid="internet-exception.de"/> - <item jid="jabber.ccc.de"/> - <item jid="jabber.chaotic.de"/> - <item jid="jabber.co.nz"/> - <item jid="jabber.cz"/> - <item jid="jabber.fourecks.de"/> - <item jid="jabber.fsinf.at"/> - <item jid="jabber.hot-chilli.net"/> - <item jid="jabber.iitsp.com"/> - <item jid="jabber.i-pobox.net"/> - <item jid="jabber.loudas.com"/> - <item jid="jabber.minus273.org"/> - <item jid="jabber.no"/> - <item jid="jabber.org"/> - <item jid="jabber.rootbash.com"/> - <item jid="jabber.rueckgr.at"/> - <item jid="jabber.scha.de"/> - <item jid="jabber.second-home.de"/> - <item jid="jabber.sow.as"/> - <item jid="jabber.tmkis.com"/> - <item jid="jabber.yeahnah.co.nz"/> - <item jid="jabber-br.org"/> - <item jid="jabber-hispano.org"/> - <item jid="jabberbr.com"/> - <item jid="jabberd.eu"/> - <item jid="jabberes.org"/> - <item jid="jabberim.de"/> - <item jid="jabbim.com"/> - <item jid="jabbim.cz"/> - <item jid="jabbim.pl"/> - <item jid="jabbim.sk"/> - <item jid="jabme.de"/> - <item jid="jabster.pl"/> - <item jid="jaim.at"/> - <item jid="lethyro.net"/> - <item jid="limun.org"/> - <item jid="linuxlovers.at"/> - <item jid="macjabber.de"/> - <item jid="na-di.de"/> - <item jid="neko.im"/> - <item jid="netmindz.net"/> - <item jid="njs.netlab.cz"/> - <item jid="pandion.im"/> - <item jid="programmer-art.org"/> - <item jid="richim.org"/> - <item jid="sternenschweif.de"/> - <item jid="swissjabber.ch"/> - <item jid="ubuntu-jabber.de"/> - <item jid="thiessen.im"/> - <item jid="thiessen.it"/> - <item jid="thiessen.org"/> - <item jid="ubuntu-jabber.net"/> - <item jid="verdammung.org"/> - <item jid="xabber.de"/> - <item jid="xmpp.jp"/> - <item jid="xmppnet.de"/> - <item jid="zsim.de"/> -</query> +<query xmlns:reg="urn:xmpp:vcard:registration:1"><item jid="0nl1ne.at"/><item jid="blah.im"/><item jid="boese-ban.de"/><item jid="brauchen.info"/><item jid="chatme.im"/><item jid="chrome.pl"/><item jid="climm.org"/><item jid="coderollers.com"/><item jid="codingteam.net"/><item jid="comm.unicate.me"/><item jid="deshalbfrei.org"/><item jid="draugr.de"/><item jid="einfachjabber.de"/><item jid="forumanalogue.fr"/><item jid="im.apinc.org"/><item jid="im.flosoft.biz"/><item jid="internet-exception.de"/><item jid="jabb3r.net"/><item jid="jabber-br.org"/><item jid="jabber-hosting.de"/><item jid="jabber.at"/><item jid="jabber.ccc.de"/><item jid="jabber.chaotic.de"/><item jid="jabber.co.nz"/><item jid="jabber.cz"/><item jid="jabber.de"/><item jid="jabber.earth.li"/><item jid="jabber.etighichat.com"/><item jid="jabber.fourecks.de"/><item jid="jabber.gate31.net"/><item jid="jabber.hot-chilli.net"/><item jid="jabber.i-pobox.net"/><item jid="jabber.iitsp.com"/><item jid="jabber.loudas.com"/><item jid="jabber.me"/><item jid="jabber.meta.net.nz"/><item jid="jabber.minus273.org"/><item jid="jabber.no-sense.net"/><item jid="jabber.no"/><item jid="jabber.rootbash.com"/><item jid="jabber.rueckgr.at"/><item jid="jabber.scha.de"/><item jid="jabber.schnied.net"/><item jid="jabber.second-home.de"/><item jid="jabber.smash-net.org"/><item jid="jabber.sow.as"/><item jid="jabber.theforest.us"/><item jid="jabber.tmkis.com"/><item jid="jabber.yeahnah.co.nz"/><item jid="jabberd.eu"/><item jid="jabberes.org"/><item jid="jabbim.com"/><item jid="jabbim.cz"/><item jid="jabbim.pl"/><item jid="jabbim.sk"/><item jid="jabin.org"/><item jid="jabme.de"/><item jid="jabster.pl"/><item jid="jaim.at"/><item jid="jappix.com"/><item jid="jisshi.com"/><item jid="labnote.org"/><item jid="lightwitch.org"/><item jid="limun.org"/><item jid="macjabber.de"/><item jid="mayplaces.com"/><item jid="na-di.de"/><item jid="neko.im"/><item jid="netmindz.net"/><item jid="njs.netlab.cz"/><item jid="palita.net"/><item jid="pandion.im"/><item jid="pidgin.su"/><item jid="programmer-art.org"/><item jid="prosody.de"/><item jid="richim.org"/><item jid="rkquery.de"/><item jid="sss.chaoslab.ru"/><item jid="sternenschweif.de"/><item jid="swissjabber.ch"/><item jid="swissjabber.de"/><item jid="swissjabber.eu"/><item jid="swissjabber.li"/><item jid="swissjabber.org"/><item jid="tcweb.org"/><item jid="tekst.me"/><item jid="thiessen.im"/><item jid="thiessen.it"/><item jid="thiessen.org"/><item jid="tigase.im"/><item jid="twattle.net"/><item jid="ubuntu-jabber.de"/><item jid="ubuntu-jabber.net"/><item jid="univers-libre.net"/><item jid="verdammung.org"/><item jid="wtfismyip.com"/><item jid="xabber.de"/><item jid="xmpp-hosting.de"/><item jid="xmpp.jp"/><item jid="xmppnet.de"/><item jid="zauris.ru"/><item jid="zsim.de"/></query>

1 0

gajim: Update services.xml from xmpp.net/services.xml Fixes #7310
by Denis Fomin 28 Feb '13

28 Feb '13

changeset a4a874736cfd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a4a874736cfd description: Update services.xml from xmpp.net/services.xml Fixes #7310 diffstat: data/other/servers.xml | 76 +------------------------------------------------ 1 files changed, 2 insertions(+), 74 deletions(-) diffs (87 lines): diff -r 9ab292b23a68 -r a4a874736cfd data/other/servers.xml --- a/data/other/servers.xml Sun Feb 24 12:39:51 2013 +0400 +++ b/data/other/servers.xml Thu Feb 28 12:05:07 2013 +0400 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?>  -<query> - <item jid="0nl1ne.at"/> - <item jid="binaryfreedom.info"/> - <item jid="boese-ban.de"/> - <item jid="brauchen.info"/> - <item jid="cassilis.net"/> - <item jid="chatmask.com"/> - <item jid="climm.org"/> - <item jid="codingteam.net"/> - <item jid="darkdna.net"/> - <item jid="default.rs"/> - <item jid="deshalbfrei.org"/> - <item jid="draugr.de"/> - <item jid="im.apinc.org"/> - <item jid="im.flosoft.biz"/> - <item jid="internet-exception.de"/> - <item jid="jabber.ccc.de"/> - <item jid="jabber.chaotic.de"/> - <item jid="jabber.co.nz"/> - <item jid="jabber.cz"/> - <item jid="jabber.fourecks.de"/> - <item jid="jabber.fsinf.at"/> - <item jid="jabber.hot-chilli.net"/> - <item jid="jabber.iitsp.com"/> - <item jid="jabber.i-pobox.net"/> - <item jid="jabber.loudas.com"/> - <item jid="jabber.minus273.org"/> - <item jid="jabber.no"/> - <item jid="jabber.org"/> - <item jid="jabber.rootbash.com"/> - <item jid="jabber.rueckgr.at"/> - <item jid="jabber.scha.de"/> - <item jid="jabber.second-home.de"/> - <item jid="jabber.sow.as"/> - <item jid="jabber.tmkis.com"/> - <item jid="jabber.yeahnah.co.nz"/> - <item jid="jabber-br.org"/> - <item jid="jabber-hispano.org"/> - <item jid="jabberbr.com"/> - <item jid="jabberd.eu"/> - <item jid="jabberes.org"/> - <item jid="jabberim.de"/> - <item jid="jabbim.com"/> - <item jid="jabbim.cz"/> - <item jid="jabbim.pl"/> - <item jid="jabbim.sk"/> - <item jid="jabme.de"/> - <item jid="jabster.pl"/> - <item jid="jaim.at"/> - <item jid="lethyro.net"/> - <item jid="limun.org"/> - <item jid="linuxlovers.at"/> - <item jid="macjabber.de"/> - <item jid="na-di.de"/> - <item jid="neko.im"/> - <item jid="netmindz.net"/> - <item jid="njs.netlab.cz"/> - <item jid="pandion.im"/> - <item jid="programmer-art.org"/> - <item jid="richim.org"/> - <item jid="sternenschweif.de"/> - <item jid="swissjabber.ch"/> - <item jid="ubuntu-jabber.de"/> - <item jid="thiessen.im"/> - <item jid="thiessen.it"/> - <item jid="thiessen.org"/> - <item jid="ubuntu-jabber.net"/> - <item jid="verdammung.org"/> - <item jid="xabber.de"/> - <item jid="xmpp.jp"/> - <item jid="xmppnet.de"/> - <item jid="zsim.de"/> -</query> +<query xmlns:reg="urn:xmpp:vcard:registration:1"><item jid="0nl1ne.at"/><item jid="blah.im"/><item jid="boese-ban.de"/><item jid="brauchen.info"/><item jid="chatme.im"/><item jid="chrome.pl"/><item jid="climm.org"/><item jid="coderollers.com"/><item jid="codingteam.net"/><item jid="comm.unicate.me"/><item jid="deshalbfrei.org"/><item jid="draugr.de"/><item jid="einfachjabber.de"/><item jid="forumanalogue.fr"/><item jid="im.apinc.org"/><item jid="im.flosoft.biz"/><item jid="internet-exception.de"/><item jid="jabb3r.net"/><item jid="jabber-br.org"/><item jid="jabber-hosting.de"/><item jid="jabber.at"/><item jid="jabber.ccc.de"/><item jid="jabber.chaotic.de"/><item jid="jabber.co.nz"/><item jid="jabber.cz"/><item jid="jabber.de"/><item jid="jabber.earth.li"/><item jid="jabber.etighichat.com"/><item jid="jabber.fourecks.de"/><item jid="jabber.gate31.net"/><item jid="jabber.hot-chilli.net"/><item jid="jabber.i-pobox.net"/><item jid="jabber.iitsp.com"/><item jid="jabber.loudas.com"/><item jid="jabber.me"/><item jid="jabber.meta.net.nz"/><item jid="jabber.minus273.org"/><item jid="jabber.no-sense.net"/><item jid="jabber.no"/><item jid="jabber.rootbash.com"/><item jid="jabber.rueckgr.at"/><item jid="jabber.scha.de"/><item jid="jabber.schnied.net"/><item jid="jabber.second-home.de"/><item jid="jabber.smash-net.org"/><item jid="jabber.sow.as"/><item jid="jabber.theforest.us"/><item jid="jabber.tmkis.com"/><item jid="jabber.yeahnah.co.nz"/><item jid="jabberd.eu"/><item jid="jabberes.org"/><item jid="jabbim.com"/><item jid="jabbim.cz"/><item jid="jabbim.pl"/><item jid="jabbim.sk"/><item jid="jabin.org"/><item jid="jabme.de"/><item jid="jabster.pl"/><item jid="jaim.at"/><item jid="jappix.com"/><item jid="jisshi.com"/><item jid="labnote.org"/><item jid="lightwitch.org"/><item jid="limun.org"/><item jid="macjabber.de"/><item jid="mayplaces.com"/><item jid="na-di.de"/><item jid="neko.im"/><item jid="netmindz.net"/><item jid="njs.netlab.cz"/><item jid="palita.net"/><item jid="pandion.im"/><item jid="pidgin.su"/><item jid="programmer-art.org"/><item jid="prosody.de"/><item jid="richim.org"/><item jid="rkquery.de"/><item jid="sss.chaoslab.ru"/><item jid="sternenschweif.de"/><item jid="swissjabber.ch"/><item jid="swissjabber.de"/><item jid="swissjabber.eu"/><item jid="swissjabber.li"/><item jid="swissjabber.org"/><item jid="tcweb.org"/><item jid="tekst.me"/><item jid="thiessen.im"/><item jid="thiessen.it"/><item jid="thiessen.org"/><item jid="tigase.im"/><item jid="twattle.net"/><item jid="ubuntu-jabber.de"/><item jid="ubuntu-jabber.net"/><item jid="univers-libre.net"/><item jid="verdammung.org"/><item jid="wtfismyip.com"/><item jid="xabber.de"/><item jid="xmpp-hosting.de"/><item jid="xmpp.jp"/><item jid="xmppnet.de"/><item jid="zauris.ru"/><item jid="zsim.de"/></query>

1 0

gajim: fix gtk varnames
by Denis Fomin 24 Feb '13

24 Feb '13

changeset 9ab292b23a68 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9ab292b23a68 description: fix gtk varnames diffstat: src/conversation_textview.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 47df356614cc -r 9ab292b23a68 src/conversation_textview.py --- a/src/conversation_textview.py Wed Feb 20 20:50:33 2013 +0100 +++ b/src/conversation_textview.py Sun Feb 24 12:39:51 2013 +0400 @@ -65,7 +65,8 @@ return False def has_focus(widget): - return widget.flags() & Gtk.HAS_FOCUS == Gtk.HAS_FOCUS + return widget.get_state_flags() & Gtk.StateFlags.FOCUSED == \ + Gtk.StateFlags.FOCUSED class TextViewImage(Gtk.Image):

1 0

python-nbxmpp: Ask for discovery information (and archive) after...
by Jefry Lagrange 23 Feb '13

23 Feb '13

changeset 77e213c484cd in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=77e213c484cd description: Ask for discovery information (and archive) after SM is enabled. Fixes #7299 diffstat: nbxmpp/auth_nb.py | 1 + nbxmpp/smacks.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diffs (52 lines): diff -r f9e1827b7d59 -r 77e213c484cd nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Sun Feb 10 11:28:44 2013 +0100 +++ b/nbxmpp/auth_nb.py Sat Feb 23 11:42:07 2013 -0400 @@ -692,6 +692,7 @@ sm = self._owner._caller.sm if self.supports_sm: # starts negociation + sm.supports_sm = True sm.set_owner(self._owner) sm.negociate() self._owner.Dispatcher.sm = sm diff -r f9e1827b7d59 -r 77e213c484cd nbxmpp/smacks.py --- a/nbxmpp/smacks.py Sun Feb 10 11:28:44 2013 +0100 +++ b/nbxmpp/smacks.py Sat Feb 23 11:42:07 2013 -0400 @@ -25,10 +25,11 @@ self.resuming = False self.enabled = False # If SM is enabled self.location = None + self.failed_resume = False # If last resuming attempt failed + self.supports_sm = False # If server supports sm def set_owner(self, owner): self._owner = owner - # Register handlers owner.Dispatcher.RegisterNamespace(NS_STREAM_MGMT) owner.Dispatcher.RegisterHandler('enabled', self._neg_response, @@ -47,13 +48,14 @@ if r == 'true' or r == 'True' or r == '1': self.resumption = True self.session_id = stanza.getAttr('id') - if r == 'false' or r == 'False' or r == '0': self.negociate(False) - l = stanza.getAttr('location') if l: self.location = l + if self.failed_resume: + self.con._discover_server_at_connection(self.con.connection) + self.failed_resume = False def negociate(self, resume=True): # Every time we attempt to negociate, we must erase all previous info @@ -119,6 +121,7 @@ # we need to bind a resource self._owner.NonBlockingBind.resuming = False self._owner._on_auth_bind(None) + self.failed_resume = True return # Doesn't support resumption

1 0

gajim: Ask for discovery information (and archive) after SM is e...
by Jefry Lagrange 23 Feb '13

23 Feb '13

changeset 4e7cd80d50bb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4e7cd80d50bb description: Ask for discovery information (and archive) after SM is enabled. Fixes #7299 diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4672a8d732f5 -r 4e7cd80d50bb src/common/connection.py --- a/src/common/connection.py Thu Feb 21 19:47:30 2013 +0100 +++ b/src/common/connection.py Sat Feb 23 11:41:36 2013 -0400 @@ -1660,7 +1660,7 @@ # If we are not resuming, we ask for discovery info # and archiving preferences - if not self.sm.resuming: + if not self.sm.supports_sm or (not self.sm.resuming and self.sm.enabled): self.request_message_archiving_preferences() self.discoverInfo(gajim.config.get_per('accounts', self.name, 'hostname'), id_prefix='Gajim_')

1 0

gajim: ability to hide / show status changes in history window. ...
by Yann Leboulanger 21 Feb '13

21 Feb '13

changeset 4672a8d732f5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4672a8d732f5 description: ability to hide / show status changes in history window. Fixes #7255 diffstat: data/gui/history_window.ui | 16 +++++++++++++++- src/history_window.py | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diffs (94 lines): diff -r fc11dd77ce99 -r 4672a8d732f5 data/gui/history_window.ui --- a/data/gui/history_window.ui Thu Feb 21 19:20:41 2013 +0100 +++ b/data/gui/history_window.ui Thu Feb 21 19:47:30 2013 +0100 @@ -211,7 +211,21 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkCheckButton" id="show_status_checkbutton"> + <property name="label" translatable="yes">_Show status changes</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_show_status_checkbutton_toggled"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> </child> </object> <packing> diff -r fc11dd77ce99 -r 4672a8d732f5 src/history_window.py --- a/src/history_window.py Thu Feb 21 19:20:41 2013 +0100 +++ b/src/history_window.py Thu Feb 21 19:47:30 2013 +0100 @@ -76,6 +76,7 @@ self.checkbutton = xml.get_object('log_history_checkbutton') self.checkbutton.connect('toggled', self.on_log_history_checkbutton_toggled) + self.show_status_checkbutton = xml.get_object('show_status_checkbutton') self.query_entry = xml.get_object('query_entry') self.query_combobox = xml.get_object('query_combobox') self.jid_entry = self.query_combobox.child @@ -328,7 +329,7 @@ def on_calendar_day_selected(self, widget): if not self.jid: return - year, month, day = widget.get_date() # integers + year, month, day = self.calendar.get_date() # integers month = gtkgui_helpers.make_gtk_month_python_month(month) self._add_lines_for_date(year, month, day) @@ -381,6 +382,7 @@ """ self.history_buffer.set_text('') # clear the buffer first self.last_time_printout = 0 + show_status = self.show_status_checkbutton.get_active() lines = gajim.logger.get_conversation_for_date(self.jid, year, month, day, self.account) @@ -389,6 +391,9 @@ for line in lines: # line[0] is contact_name, line[1] is time of message # line[2] is kind, line[3] is show, line[4] is message + if not show_status and line[2] in (constants.KIND_GCSTATUS, + constants.KIND_STATUS): + continue self._add_new_line(line[0], line[1], line[2], line[3], line[4], line[5]) @@ -520,6 +525,8 @@ year, month, day = self.calendar.get_date() # integers month = gtkgui_helpers.make_gtk_month_python_month(month) + show_status = self.show_status_checkbutton.get_active() + # contact_name, time, kind, show, message, subject results = gajim.logger.get_search_results_for_query(jid, text, account, year, month, day) @@ -527,6 +534,9 @@ # add "subject: | message: " in message column if kind is single # also do we need show at all? (we do not search on subject) for row in results: + if not show_status and row[2] in (constants.KIND_GCSTATUS, + constants.KIND_STATUS): + continue contact_name = row[0] if not contact_name: kind = row[2] @@ -638,6 +648,10 @@ gajim.config.set_per('accounts', self.account, 'no_log_for', ' '.join(no_log_for)) + def on_show_status_checkbutton_toggled(self, widget): + # reload logs + self.on_calendar_day_selected(None) + def open_history(self, jid, account): """ Load chat history of the specified jid

1 0

gajim: fix indentation
by Yann Leboulanger 21 Feb '13

21 Feb '13

changeset fc11dd77ce99 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fc11dd77ce99 description: fix indentation diffstat: src/history_window.py | 76 ++++++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 36 deletions(-) diffs (229 lines): diff -r b7435d300a78 -r fc11dd77ce99 src/history_window.py --- a/src/history_window.py Thu Feb 21 19:03:20 2013 +0100 +++ b/src/history_window.py Thu Feb 21 19:20:41 2013 +0100 @@ -69,13 +69,13 @@ self.calendar = xml.get_object('calendar') scrolledwindow = xml.get_object('scrolledwindow') self.history_textview = conversation_textview.ConversationTextview( - account, used_in_history_window = True) + account, used_in_history_window = True) scrolledwindow.add(self.history_textview.tv) self.history_buffer = self.history_textview.tv.get_buffer() self.history_buffer.create_tag('highlight', background = 'yellow') self.checkbutton = xml.get_object('log_history_checkbutton') self.checkbutton.connect('toggled', - self.on_log_history_checkbutton_toggled) + self.on_log_history_checkbutton_toggled) self.query_entry = xml.get_object('query_entry') self.query_combobox = xml.get_object('query_combobox') self.jid_entry = self.query_combobox.child @@ -126,11 +126,11 @@ self._load_history(None) gtkgui_helpers.resize_window(self.window, - gajim.config.get('history_window_width'), - gajim.config.get('history_window_height')) + gajim.config.get('history_window_width'), + gajim.config.get('history_window_height')) gtkgui_helpers.move_window(self.window, - gajim.config.get('history_window_x-position'), - gajim.config.get('history_window_y-position')) + gajim.config.get('history_window_x-position'), + gajim.config.get('history_window_y-position')) xml.connect_signals(self) self.window.show_all() @@ -202,9 +202,9 @@ liststore.append((pix, completed)) self.completion_dict[key] = (info_jid, info_acc, info_name, - info_completion) + info_completion) self.completion_dict[completed] = (info_jid, info_acc, - info_name, info_completion) + info_name, info_completion) if key == actual_jid: self._load_history(info_jid, info_acc) yield True @@ -258,7 +258,8 @@ """ if jid_or_name and jid_or_name in self.completion_dict: # a full qualified jid or a contact name was entered - info_jid, info_account, info_name, info_completion = self.completion_dict[jid_or_name] + info_jid, info_account, info_name, info_completion = \ + self.completion_dict[jid_or_name] self.jids_to_search = [info_jid] self.jid = info_jid @@ -274,14 +275,14 @@ else: # Are log disabled for account ? if self.account in gajim.config.get_per('accounts', self.account, - 'no_log_for').split(' '): + 'no_log_for').split(' '): self.checkbutton.set_active(False) self.checkbutton.set_sensitive(False) else: # Are log disabled for jid ? log = True if self.jid in gajim.config.get_per('accounts', self.account, - 'no_log_for').split(' '): + 'no_log_for').split(' '): log = False self.checkbutton.set_active(log) self.checkbutton.set_sensitive(True) @@ -290,8 +291,8 @@ # select logs for last date we have logs with contact self.calendar.set_sensitive(True) - last_log = \ - gajim.logger.get_last_date_that_has_logs(self.jid, self.account) + last_log = gajim.logger.get_last_date_that_has_logs(self.jid, + self.account) date = time.localtime(last_log) @@ -381,7 +382,8 @@ self.history_buffer.set_text('') # clear the buffer first self.last_time_printout = 0 - lines = gajim.logger.get_conversation_for_date(self.jid, year, month, day, self.account) + lines = gajim.logger.get_conversation_for_date(self.jid, year, month, + day, self.account) # lines holds list with tupples that have: # contact_name, time, kind, show, message for line in lines: @@ -395,7 +397,7 @@ Add a new line in textbuffer """ if not message and kind not in (constants.KIND_STATUS, - constants.KIND_GCSTATUS): + constants.KIND_GCSTATUS): return buf = self.history_buffer end_iter = buf.get_end_iter() @@ -407,13 +409,13 @@ buf.insert(end_iter, tim) # add time elif gajim.config.get('print_time') == 'sometimes': every_foo_seconds = 60 * gajim.config.get( - 'print_ichat_every_foo_minutes') + 'print_ichat_every_foo_minutes') seconds_passed = tim - self.last_time_printout if seconds_passed > every_foo_seconds: self.last_time_printout = tim tim = time.strftime('%X ', time.localtime(float(tim))) buf.insert_with_tags_by_name(end_iter, tim + '\n', - 'time_sometimes') + 'time_sometimes') tag_name = '' tag_msg = '' @@ -442,11 +444,11 @@ # message here (if not None) is status message if message: message = _('%(nick)s is now %(status)s: %(status_msg)s') %\ - {'nick': contact_name, 'status': helpers.get_uf_show(show), - 'status_msg': message } + {'nick': contact_name, 'status': helpers.get_uf_show(show), + 'status_msg': message } else: - message = _('%(nick)s is now %(status)s') % {'nick': contact_name, - 'status': helpers.get_uf_show(show) } + message = _('%(nick)s is now %(status)s') % { + 'nick': contact_name, 'status': helpers.get_uf_show(show) } tag_msg = 'status' else: # 'status' # message here (if not None) is status message @@ -457,10 +459,10 @@ message = _('Error') elif message: message = _('Status is now: %(status)s: %(status_msg)s') % \ - {'status': helpers.get_uf_show(show), 'status_msg': message} + {'status': helpers.get_uf_show(show), 'status_msg': message} else: message = _('Status is now: %(status)s') % { 'status': - helpers.get_uf_show(show) } + helpers.get_uf_show(show) } tag_msg = 'status' if message.startswith('/me ') or message.startswith('/me\n'): @@ -485,7 +487,7 @@ if tag_msg: self.history_textview.print_real_text(message, [tag_msg], - name=contact_name, xhtml=xhtml) + name=contact_name, xhtml=xhtml) else: self.history_textview.print_real_text(message, name=contact_name, xhtml=xhtml) @@ -506,10 +508,11 @@ for jid in self.jids_to_search: account = self.completion_dict[jid][C_INFO_ACCOUNT] if account is None: - # We do not know an account. This can only happen if the contact is offine, - # or if we browse a groupchat history. The account is not needed, a dummy can - # be set. - # This may leed to wrong self nick in the displayed history (Uggh!) + # We do not know an account. This can only happen if the contact + # is offine, or if we browse a groupchat history. The account is + # not needed, a dummy can be set. + # This may leed to wrong self nick in the displayed history + # (Uggh!) account = gajim.contacts.get_accounts()[0] year, month, day = False, False, False @@ -518,8 +521,8 @@ month = gtkgui_helpers.make_gtk_month_python_month(month) # contact_name, time, kind, show, message, subject - results = gajim.logger.get_search_results_for_query( - jid, text, account, year, month, day) + results = gajim.logger.get_search_results_for_query(jid, text, + account, year, month, day) #FIXME: # add "subject: | message: " in message column if kind is single # also do we need show at all? (we do not search on subject) @@ -557,7 +560,7 @@ self.query_entry.set_sensitive(True) self.query_entry.grab_focus() self.jids_to_search = (jid for jid in gajim.logger.get_jids_in_db() - if gajim.logger.jid_is_room_jid(jid)) + if gajim.logger.jid_is_room_jid(jid)) if self.query_combobox.get_active() == 2: # All Chat Histories self.query_entry.set_sensitive(True) @@ -609,20 +612,21 @@ None) if result is not None: match_start_iter, match_end_iter = result - match_start_iter.backward_char() # include '[' or other character before time + # include '[' or other character before time + match_start_iter.backward_char() match_end_iter.forward_line() # highlight all message not just time self.history_buffer.apply_tag_by_name('highlight', match_start_iter, - match_end_iter) + match_end_iter) match_start_mark = self.history_buffer.create_mark('match_start', - match_start_iter, True) + match_start_iter, True) self.history_textview.tv.scroll_to_mark(match_start_mark, 0, True) def on_log_history_checkbutton_toggled(self, widget): # log conversation history? oldlog = True no_log_for = gajim.config.get_per('accounts', self.account, - 'no_log_for').split() + 'no_log_for').split() if self.jid in no_log_for: oldlog = False log = widget.get_active() @@ -632,7 +636,7 @@ no_log_for.remove(self.jid) if oldlog != log: gajim.config.set_per('accounts', self.account, 'no_log_for', - ' '.join(no_log_for)) + ' '.join(no_log_for)) def open_history(self, jid, account): """

1 0

gajim: compare rfilter string in unicode rather that in str. Fix...
by Yann Leboulanger 21 Feb '13

21 Feb '13

changeset b7435d300a78 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b7435d300a78 description: compare rfilter string in unicode rather that in str. Fixes #7300 diffstat: src/roster_window.py | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diffs (56 lines): diff -r 2b95710f7c4f -r b7435d300a78 src/roster_window.py --- a/src/roster_window.py Tue Feb 19 13:22:49 2013 +0100 +++ b/src/roster_window.py Thu Feb 21 19:03:20 2013 +0100 @@ -1653,10 +1653,12 @@ if model.iter_has_child(titer): iter_c = model.iter_children(titer) while iter_c: - if self.rfilter_string in model[iter_c][C_NAME].lower(): + if self.rfilter_string in model[iter_c][C_NAME].decode( + 'utf-8').lower(): return True iter_c = model.iter_next(iter_c) - return self.rfilter_string in model[titer][C_NAME].lower() + return self.rfilter_string in model[titer][C_NAME].decode( + 'utf-8').lower() if gajim.config.get('showoffline'): return True bb_jid = None @@ -1681,7 +1683,8 @@ return self.contact_is_visible(contact, account) if type_ == 'agent': if self.rfilter_enabled: - return self.rfilter_string in model[titer][C_NAME].lower() + return self.rfilter_string in model[titer][C_NAME].decode( + 'utf-8').lower() contact = gajim.contacts.get_contact_with_highest_priority(account, jid) return self.contact_has_pending_roster_events(contact, account) or \ @@ -1689,7 +1692,8 @@ (gajim.account_is_connected(account) or \ gajim.config.get('showoffline'))) if type_ == 'groupchat' and self.rfilter_enabled: - return self.rfilter_string in model[titer][C_NAME].lower() + return self.rfilter_string in model[titer][C_NAME].decode('utf-8').\ + lower() return True def _compareIters(self, model, iter1, iter2, data=None): @@ -4416,7 +4420,7 @@ def on_rfilter_entry_changed(self, widget): """ When we update the content of the filter """ - self.rfilter_string = widget.get_text().lower() + self.rfilter_string = widget.get_text().decode('utf-8').lower() if self.rfilter_string == '': self.disable_rfilter() self.refilter_shown_roster_items() @@ -4424,7 +4428,7 @@ self.tree.get_selection().unselect_all() def _func(model, path, iter_): if model[iter_][C_TYPE] == 'contact' and self.rfilter_string in \ - model[iter_][C_NAME].lower(): + model[iter_][C_NAME].decode('utf-8').lower(): col = self.tree.get_column(0) self.tree.set_cursor_on_cell(path, col) return True

1 0

gajim: add a minimum height to status message textbox
by Yann Leboulanger 20 Feb '13

20 Feb '13

changeset 47df356614cc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=47df356614cc description: add a minimum height to status message textbox diffstat: data/gui/preferences_window.ui | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diffs (59 lines): diff -r 6add9f5e161f -r 47df356614cc data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Wed Feb 20 20:37:52 2013 +0100 +++ b/data/gui/preferences_window.ui Wed Feb 20 20:50:33 2013 +0100 @@ -148,24 +148,6 @@ </row> </data> </object> - <object class="GtkListStore" id="status_message_liststore"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> - </columns> - </object> <object class="GtkWindow" id="preferences_window"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -1615,6 +1597,7 @@ <property name="shadow_type">in</property> <child> <object class="GtkTextView" id="msg_textview"> + <property name="height_request">21</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">3</property> @@ -3316,4 +3299,22 @@ </object> </child> </object> + <object class="GtkListStore" id="status_message_liststore"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> </interface>

1 0

gajim: nicer change status message window
by Yann Leboulanger 20 Feb '13

20 Feb '13

changeset 6add9f5e161f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6add9f5e161f description: nicer change status message window diffstat: data/gui/change_status_message_dialog.ui | 160 +++++++++++++++++++----------- 1 files changed, 103 insertions(+), 57 deletions(-) diffs (truncated from 383 to 300 lines): diff -r 4a8b3a6a0731 -r 6add9f5e161f data/gui/change_status_message_dialog.ui --- a/data/gui/change_status_message_dialog.ui Wed Feb 20 20:13:08 2013 +0100 +++ b/data/gui/change_status_message_dialog.ui Wed Feb 20 20:37:52 2013 +0100 @@ -1,39 +1,88 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  <object class="GtkDialog" id="change_status_message_dialog"> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="default_width">270</property> - <property name="default_height">175</property> + <property name="default_height">330</property> <property name="type_hint">dialog</property> - <signal name="key_press_event" handler="on_change_status_message_dialog_key_press_event"/> + <signal name="key-press-event" handler="on_change_status_message_dialog_key_press_event" swapped="no"/> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox5"> + <object class="GtkBox" id="dialog-vbox5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="ok_button"> + <property name="label">gtk-ok</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkFrame" id="frame38"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment107"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="left_padding">12</property> <child> <object class="GtkVBox" id="vbox112"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow24"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTextView" id="message_textview"> @@ -45,33 +94,41 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHButtonBox" id="hbuttonbox33"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="save_as_preset_button"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <signal name="clicked" handler="on_save_as_preset_button_clicked"/> + <property name="use_action_appearance">False</property> + <signal name="clicked" handler="on_save_as_preset_button_clicked" swapped="no"/> <child> <object class="GtkAlignment" id="alignment106"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> <object class="GtkHBox" id="hbox3021"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">2</property> <child> <object class="GtkImage" id="image1369"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-save-as</property> </object> <packing> @@ -83,6 +140,7 @@ <child> <object class="GtkLabel" id="label380"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Save as Preset...</property> <property name="use_underline">True</property> </object> @@ -106,44 +164,53 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkTable" id="under_table"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> <object class="GtkButton" id="mood_button"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <signal name="clicked" handler="on_mood_button_clicked"/> + <property name="use_action_appearance">False</property> + <signal name="clicked" handler="on_mood_button_clicked" swapped="no"/> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkImage" id="mood_image"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-missing-image</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="mood_button_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="wrap">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -155,35 +222,44 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> <object class="GtkButton" id="activity_button"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <signal name="clicked" handler="on_activity_button_clicked"/> + <property name="use_action_appearance">False</property> + <signal name="clicked" handler="on_activity_button_clicked" swapped="no"/> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkImage" id="activity_image"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-missing-image</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="activity_button_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="wrap">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -195,11 +271,13 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> <object class="GtkLabel" id="mood_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Mood:</property> </object> @@ -207,11 +285,13 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> <object class="GtkLabel" id="activity_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Activity:</property> </object> @@ -219,31 +299,37 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> <object class="GtkComboBox" id="message_combobox"> <property name="visible">True</property> - <signal name="changed" handler="on_message_combobox_changed"/> + <property name="can_focus">False</property> + <signal name="changed" handler="on_message_combobox_changed" swapped="no"/> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="y_options">GTK_FILL</property>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2013