Commits April 2012

commits@gajim.org

3 participants
95 discussions

gajim: fix unwanted things from merge from jingleFT branch
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset 134c26060af0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=134c26060af0 description: fix unwanted things from merge from jingleFT branch diffstat: src/common/connection_handlers.py | 42 +++++++++++++++---------------- src/common/connection_handlers_events.py | 22 ++++++++++++++++- 2 files changed, 41 insertions(+), 23 deletions(-) diffs (110 lines): diff -r b15d9e0061a5 -r 134c26060af0 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Apr 20 16:28:10 2012 +0200 +++ b/src/common/connection_handlers.py Sat Apr 21 23:52:24 2012 +0200 @@ -1299,6 +1299,8 @@ ged.POSTGUI, self._nec_unsubscribed_presence_received_end) gajim.ged.register_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) + gajim.ged.register_event_handler('stream-other-host-received', ged.CORE, + self._nec_stream_other_host_received) def cleanup(self): ConnectionHandlersBase.cleanup(self) @@ -1341,6 +1343,8 @@ ged.POSTGUI, self._nec_unsubscribed_presence_received_end) gajim.ged.remove_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) + gajim.ged.remove_event_handler('stream-other-host-received', ged.CORE, + self._nec_stream_other_host_received) def build_http_auth_answer(self, iq_obj, answer): if not self.connection or self.connected < 2: @@ -2010,25 +2014,17 @@ jid_from = helpers.get_full_jid_from_iq(iq_obj) jingle_xtls.handle_new_cert(con, iq_obj, jid_from) + def _nec_stream_other_host_received(self, obj): + if obj.conn.name != self.name: + return + self.redirected = obj.redirected + self.disconnect(on_purpose=True) + self.connect() + def _StreamCB(self, con, obj): - if obj.getTag('conflict'): - # disconnected because of a resource conflict - self.dispatch('RESOURCE_CONFLICT', ()) - other_host = obj.getTag('see-other-host') - if other_host and self.last_connection_type in ('ssl', 'tls'): - host = other_host.getData() - if ':' in host: - host_l = host.split(':', 1) - h = host_l[0] - p = host_l[1] - else: - h = host - p = 5222 - if h.startswith('[') and h.endswith(']'): - h = h[1:-1] - self.redirected = {'host': h, 'port': p} - self.disconnect(on_purpose=True) - self.connect() + log.debug('StreamCB') + gajim.nec.push_incoming_event(StreamReceivedEvent(None, + conn=self, stanza=iq_obj)) def _register_handlers(self, con, con_type): # try to find another way to register handlers in each class @@ -2116,7 +2112,9 @@ con.RegisterHandler('iq', self._ResultCB, 'result') con.RegisterHandler('presence', self._StanzaArrivedCB) con.RegisterHandler('message', self._StanzaArrivedCB) - con.RegisterHandler('unknown', self._StreamCB, 'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams') - con.RegisterHandler('iq', self._PubkeyGetCB, 'get', common.xmpp.NS_PUBKEY_PUBKEY) - con.RegisterHandler('iq', self._PubkeyResultCB, 'result', common.xmpp.NS_PUBKEY_PUBKEY) - + con.RegisterHandler('unknown', self._StreamCB, + common.xmpp.NS_XMPP_STREAMS, xmlns=common.xmpp.NS_STREAMS) + con.RegisterHandler('iq', self._PubkeyGetCB, 'get', + common.xmpp.NS_PUBKEY_PUBKEY) + con.RegisterHandler('iq', self._PubkeyResultCB, 'result', + common.xmpp.NS_PUBKEY_PUBKEY) diff -r b15d9e0061a5 -r 134c26060af0 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Apr 20 16:28:10 2012 +0200 +++ b/src/common/connection_handlers_events.py Sat Apr 21 23:52:24 2012 +0200 @@ -675,6 +675,26 @@ self.conn = self.base_event.conn return True +class StreamOtherHostReceivedEvent(nec.NetworkIncomingEvent): + name = 'stream-other-host-received' + base_network_events = ['stream-received'] + + def generate(self): + other_host = obj.getTag('see-other-host') + if other_host and self.conn.last_connection_type in ('ssl', 'tls'): + host = other_host.getData() + if ':' in host: + host_l = host.split(':', 1) + h = host_l[0] + p = host_l[1] + else: + h = host + p = 5222 + if h.startswith('[') and h.endswith(']'): + h = h[1:-1] + self.redirected = {'host': h, 'port': p} + return True + class PresenceHelperEvent: def _generate_show(self): self.show = self.stanza.getShow() @@ -1393,7 +1413,7 @@ self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) self.sid = self.jingle_session.sid return True - + class JingleTransferCancelledEvent(nec.NetworkIncomingEvent): name = 'jingleFT-cancelled-received' base_network_events = []

1 0

gajim: add missing event class
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset 53b548422fc3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=53b548422fc3 description: add missing event class diffstat: src/common/connection_handlers_events.py | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diffs (29 lines): diff -r 208480b55406 -r 53b548422fc3 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Apr 19 16:57:43 2012 +0200 +++ b/src/common/connection_handlers_events.py Sat Apr 21 23:49:42 2012 +0200 @@ -684,6 +684,25 @@ if self.base_event.stanza.getTag('conflict'): self.conn = self.base_event.conn return True +class StreamOtherHostReceivedEvent(nec.NetworkIncomingEvent): + name = 'stream-other-host-received' + base_network_events = ['stream-received'] + + def generate(self): + other_host = obj.getTag('see-other-host') + if other_host and self.conn.last_connection_type in ('ssl', 'tls'): + host = other_host.getData() + if ':' in host: + host_l = host.split(':', 1) + h = host_l[0] + p = host_l[1] + else: + h = host + p = 5222 + if h.startswith('[') and h.endswith(']'): + h = h[1:-1] + self.redirected = {'host': h, 'port': p} + return True class PresenceHelperEvent: def _generate_show(self):

1 0

gajim: catch SIGTERM so that on_exit func is executed at this ti...
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset 208480b55406 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=208480b55406 description: catch SIGTERM so that on_exit func is executed at this time too. diffstat: src/gajim.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 4ba50f5ba8cd -r 208480b55406 src/gajim.py --- a/src/gajim.py Thu Apr 19 14:01:42 2012 +0200 +++ b/src/gajim.py Thu Apr 19 16:57:43 2012 +0200 @@ -413,6 +413,7 @@ sys.exit(5) # ^C exits the application normally to delete pid file signal.signal(signal.SIGINT, sigint_cb) + signal.signal(signal.SIGTERM, sigint_cb) log.info("Encodings: d:%s, fs:%s, p:%s", sys.getdefaultencoding(), \ sys.getfilesystemencoding(), locale.getpreferredencoding())

1 0

gajim: move an import to prevent an import loop
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset 61982f5009f8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=61982f5009f8 description: move an import to prevent an import loop diffstat: src/common/config.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (20 lines): diff -r 79a48ba20d90 -r 61982f5009f8 src/common/config.py --- a/src/common/config.py Thu Apr 19 12:32:31 2012 +0200 +++ b/src/common/config.py Thu Apr 19 14:00:54 2012 +0200 @@ -38,8 +38,6 @@ import defs import gobject -from common import gajim - ( OPT_TYPE, OPT_VAL, @@ -742,6 +740,7 @@ return (account not in no_log_for) and (jid not in no_log_for) def _really_save(self): + from common import gajim if gajim.interface: gajim.interface.save_config() self.save_timeout_id = None

1 0

gajim: improve Gajim startup
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset 4ba50f5ba8cd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4ba50f5ba8cd description: improve Gajim startup diffstat: src/roster_window.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diffs (25 lines): diff -r 61982f5009f8 -r 4ba50f5ba8cd src/roster_window.py --- a/src/roster_window.py Thu Apr 19 14:00:54 2012 +0200 +++ b/src/roster_window.py Thu Apr 19 14:01:42 2012 +0200 @@ -1374,8 +1374,21 @@ self.tree.set_model(None) # disable sorting self.model.set_sort_column_id(-2, gtk.SORT_ASCENDING) + self.starting = True def _after_fill(self): + self.starting = False + for account in gajim.connections: + + jids = gajim.contacts.get_jid_list(account) + for jid in jids: + self.draw_completely(jid, account) + + # Draw all known groups + for group in gajim.groups[account]: + self.draw_group(group, account) + self.draw_account(account) + self.model.set_sort_column_id(1, gtk.SORT_ASCENDING) self.tree.set_model(self.modelfilter) self.tree.thaw_child_notify()

1 0

gajim: prevent a traceback
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset 79a48ba20d90 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=79a48ba20d90 description: prevent a traceback diffstat: src/common/config.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r c26c1c1e5186 -r 79a48ba20d90 src/common/config.py --- a/src/common/config.py Wed Apr 18 14:00:16 2012 +0200 +++ b/src/common/config.py Thu Apr 19 12:32:31 2012 +0200 @@ -742,7 +742,8 @@ return (account not in no_log_for) and (jid not in no_log_for) def _really_save(self): - gajim.interface.save_config() + if gajim.interface: + gajim.interface.save_config() self.save_timeout_id = None return False

1 0

gajim: don't make preferences window too wide because of long au...
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset c26c1c1e5186 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c26c1c1e5186 description: don't make preferences window too wide because of long audio / video strings diffstat: data/gui/preferences_window.ui | 18 +++++++++++++++++- src/config.py | 3 +++ 2 files changed, 20 insertions(+), 1 deletions(-) diffs (167 lines): diff -r a1a9f54de046 -r c26c1c1e5186 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Wed Apr 18 11:34:57 2012 +0200 +++ b/data/gui/preferences_window.ui Wed Apr 18 14:00:16 2012 +0200 @@ -159,6 +159,7 @@ <child> <object class="GtkVBox" id="vbox13"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkNotebook" id="preferences_notebook"> @@ -169,6 +170,7 @@ <object class="GtkVBox" id="vbox41"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame1"> @@ -186,6 +188,7 @@ <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="show_avatars_in_roster_checkbutton"> @@ -559,6 +562,7 @@ <object class="GtkVBox" id="vbox42"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame29"> @@ -573,6 +577,7 @@ <child> <object class="GtkVBox" id="vbox67"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox1"> @@ -675,6 +680,7 @@ <child> <object class="GtkVBox" id="vbox_gmail"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="notify_gmail_checkbutton"> @@ -755,7 +761,6 @@ </child> </object> <packing> - <property name="expand">False</property> <property name="position">1</property> </packing> </child> @@ -797,6 +802,7 @@ <child> <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox4"> @@ -888,6 +894,7 @@ <object class="GtkVBox" id="vbox11"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame13"> @@ -1019,6 +1026,7 @@ <object class="GtkVBox" id="status_vbox"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame81"> @@ -1212,6 +1220,7 @@ <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox2934"> @@ -1450,6 +1459,7 @@ <object class="GtkVBox" id="vbox58"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame9"> @@ -2072,6 +2082,7 @@ <object class="GtkVBox" id="vbox4"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="audio_frame"> @@ -2219,6 +2230,7 @@ <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> @@ -2230,6 +2242,7 @@ <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> @@ -2374,6 +2387,7 @@ <object class="GtkVBox" id="vbox45"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="applications_frame"> @@ -2388,6 +2402,7 @@ <child> <object class="GtkVBox" id="vbox50"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkComboBox" id="applications_combobox"> @@ -2716,6 +2731,7 @@ <child> <object class="GtkVBox" id="vbox66"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="log_show_changes_checkbutton"> diff -r a1a9f54de046 -r c26c1c1e5186 src/config.py --- a/src/config.py Wed Apr 18 11:34:57 2012 +0200 +++ b/src/config.py Wed Apr 18 14:00:16 2012 +0200 @@ -32,6 +32,7 @@ ## import gtk +import pango import gobject import os, sys import common.config @@ -443,6 +444,8 @@ key=None): combobox = self.xml.get_object(opt_name + '_combobox') cell = gtk.CellRendererText() + cell.set_property('ellipsize', pango.ELLIPSIZE_END) + cell.set_property('ellipsize-set', True) combobox.pack_start(cell, True) combobox.add_attribute(cell, 'text', 0) model = gtk.ListStore(str, str)

1 0

gajim: correctly select result row in history window. Fixes #3939
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset 6165d2c2eadf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6165d2c2eadf description: correctly select result row in history window. Fixes #3939 diffstat: src/history_window.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 18d3ba8b8fe1 -r 6165d2c2eadf src/history_window.py --- a/src/history_window.py Wed Apr 18 10:33:42 2012 +0200 +++ b/src/history_window.py Wed Apr 18 10:36:39 2012 +0200 @@ -596,7 +596,9 @@ """ start_iter = self.history_buffer.get_start_iter() local_time = time.localtime(float(unix_time)) - tim = time.strftime('%X', local_time) + timestamp_str = gajim.config.get('time_stamp') + timestamp_str = helpers.from_one_line(timestamp_str) + tim = time.strftime(timestamp_str, local_time) result = start_iter.forward_search(tim, gtk.TEXT_SEARCH_VISIBLE_ONLY, None) if result is not None:

1 0

gajim: better handling of several phone numbers in vcard. Fixes ...
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset a1a9f54de046 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a1a9f54de046 description: better handling of several phone numbers in vcard. Fixes #5439 diffstat: src/profile_window.py | 6 +++++- src/vcard.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diffs (32 lines): diff -r 6165d2c2eadf -r a1a9f54de046 src/profile_window.py --- a/src/profile_window.py Wed Apr 18 10:36:39 2012 +0200 +++ b/src/profile_window.py Wed Apr 18 11:34:57 2012 +0200 @@ -234,7 +234,11 @@ def set_value(self, entry_name, value): try: - self.xml.get_object(entry_name).set_text(value) + widget = self.xml.get_object(entry_name) + val = widget.get_text() + if val: + value = val + ' / ' + value + widget.set_text(value) except AttributeError: pass diff -r 6165d2c2eadf -r a1a9f54de046 src/vcard.py --- a/src/vcard.py Wed Apr 18 10:36:39 2012 +0200 +++ b/src/vcard.py Wed Apr 18 11:34:57 2012 +0200 @@ -198,7 +198,11 @@ table = self.xml.get_object('personal_info_table') table.attach(widget, 1, 4, 3, 4, yoptions = 0) else: - self.xml.get_object(entry_name).set_text(value) + widget = self.xml.get_object(entry_name) + val = widget.get_text() + if val: + value = val + ' / ' + value + widget.set_text(value) except AttributeError: pass

1 0

gajim: reset correctly timeout_id variable
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset 18d3ba8b8fe1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=18d3ba8b8fe1 description: reset correctly timeout_id variable diffstat: src/common/config.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 72f01ef7b6e2 -r 18d3ba8b8fe1 src/common/config.py --- a/src/common/config.py Wed Apr 18 10:15:53 2012 +0200 +++ b/src/common/config.py Wed Apr 18 10:33:42 2012 +0200 @@ -743,6 +743,7 @@ def _really_save(self): gajim.interface.save_config() + self.save_timeout_id = None return False def _timeout_save(self):

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2012