Commits June 2012

commits@gajim.org

4 participants
49 discussions

gajim: improve roster drawing when we get many presences. Fixes ...
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset bc8af06950aa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bc8af06950aa description: improve roster drawing when we get many presences. Fixes #7125 diffstat: src/roster_window.py | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diffs (71 lines): diff -r 2ecc3bab9323 -r bc8af06950aa src/roster_window.py --- a/src/roster_window.py Sat Apr 28 22:45:17 2012 +0200 +++ b/src/roster_window.py Sat Apr 28 22:45:53 2012 +0200 @@ -1009,7 +1009,7 @@ ### Methods for adding and removing roster window items ################################################################################ - def draw_account(self, account): + def _really_draw_account(self, account): child_iter = self._get_account_iter(account, self.model) if not child_iter: assert False, 'Account iter of %s could not be found.' % account @@ -1073,9 +1073,21 @@ asPixbufIcon() else: self.model[child_iter][C_LOCATION_PIXBUF] = None + + def _really_draw_accounts(self): + for acct in self.accounts_to_draw: + self._really_draw_account(acct) + self.accounts_to_draw = [] return False - def draw_group(self, group, account): + def draw_account(self, account): + if account in self.accounts_to_draw: + return + self.accounts_to_draw.append(account) + if len(self.accounts_to_draw) == 1: + gobject.timeout_add(200, self._really_draw_accounts) + + def _really_draw_group(self, group, account): child_iter = self._get_group_iter(group, account, model=self.model) if not child_iter: # Eg. We redraw groups after we removed a entitiy @@ -1094,8 +1106,23 @@ text += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) self.model[child_iter][C_NAME] = text + + def _really_draw_groups(self): + for ag in self.groups_to_draw.values(): + acct = ag['account'] + grp = ag['group'] + self._really_draw_group(grp, acct) + self.groups_to_draw = {} return False + def draw_group(self, group, account): + ag = account + group + if ag in self.groups_to_draw: + return + self.groups_to_draw[ag] = {'group': group, 'account': account} + if len(self.groups_to_draw) == 1: + gobject.timeout_add(200, self._really_draw_groups) + def draw_parent_contact(self, jid, account): child_iters = self._get_contact_iter(jid, account, model=self.model) if not child_iters: @@ -6362,6 +6389,11 @@ # it means we are waiting for this number of accounts to disconnect # before quitting self.quit_on_next_offline = -1 + + # groups to draw next time we draw groups. + self.groups_to_draw = {} + # accounts to draw next time we draw accounts. + self.accounts_to_draw = [] # uf_show, img, show, sensitive liststore = gtk.ListStore(str, gtk.Image, str, bool)

1 0

gajim: remove big time consuming and unused function pformat. se...
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 2ecc3bab9323 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2ecc3bab9323 description: remove big time consuming and unused function pformat. see #7125 diffstat: src/common/nec.py | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diffs (32 lines): diff -r 8dc22ed1fdae -r 2ecc3bab9323 src/common/nec.py --- a/src/common/nec.py Sat Apr 28 21:39:32 2012 +0200 +++ b/src/common/nec.py Sat Apr 28 22:45:17 2012 +0200 @@ -25,8 +25,6 @@ :license: GPL ''' -from pprint import pformat - #from plugins.helpers import log from common import gajim @@ -158,12 +156,6 @@ for k, v in kwargs.iteritems(): setattr(self, k, v) - def __str__(self): - return '<NetworkEvent object> Attributes: %s'%(pformat(self.__dict__)) - - def __repr__(self): - return '<NetworkEvent object> Attributes: %s'%(pformat(self.__dict__)) - class NetworkIncomingEvent(NetworkEvent): base_network_events = [] @@ -176,4 +168,4 @@ base_network_events = [] ''' Names of base network events that new event is going to be generated on. - ''' \ No newline at end of file + '''

1 0

gajim: [Aleksey Rybalkin] improve popup notification behaviour
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 3823069dea90 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3823069dea90 description: [Aleksey Rybalkin] improve popup notification behaviour diffstat: src/dialogs.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (29 lines): diff -r 53b548422fc3 -r 3823069dea90 src/dialogs.py --- a/src/dialogs.py Sat Apr 21 23:49:42 2012 +0200 +++ b/src/dialogs.py Mon Apr 23 23:22:12 2012 +0200 @@ -2748,6 +2748,7 @@ self.account = account self.jid = jid self.msg_type = msg_type + self.index = len(gajim.interface.roster.popup_notification_windows) xml = gtkgui_helpers.get_gtk_builder('popup_notification_window.ui') self.window = xml.get_object('popup_notification_window') @@ -2832,12 +2833,15 @@ self.window.destroy() if len(gajim.interface.roster.popup_notification_windows) > 0: - # we want to remove the first window added in the list - gajim.interface.roster.popup_notification_windows.pop(0) + # we want to remove the destroyed window from the list + gajim.interface.roster.popup_notification_windows.pop(self.index) # move the rest of popup windows gajim.interface.roster.popups_notification_height = 0 + current_index = 0 for window_instance in gajim.interface.roster.popup_notification_windows: + window_instance.index = current_index + current_index += 1 window_width, window_height = window_instance.window.get_size() gajim.interface.roster.popups_notification_height += window_height window_instance.window.move(gtk.gdk.screen_width() - window_width,

1 0

gajim: improve Gajim startup. see #7125
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 8dc22ed1fdae in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8dc22ed1fdae description: improve Gajim startup. see #7125 diffstat: src/roster_window.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (38 lines): diff -r 3823069dea90 -r 8dc22ed1fdae src/roster_window.py --- a/src/roster_window.py Mon Apr 23 23:22:12 2012 +0200 +++ b/src/roster_window.py Sat Apr 28 21:39:32 2012 +0200 @@ -1375,6 +1375,7 @@ # disable sorting self.model.set_sort_column_id(-2, gtk.SORT_ASCENDING) self.starting = True + self.starting_filtering = True def _after_fill(self): self.starting = False @@ -1392,6 +1393,8 @@ self.model.set_sort_column_id(1, gtk.SORT_ASCENDING) self.tree.set_model(self.modelfilter) self.tree.thaw_child_notify() + self.starting_filtering = False + self.refilter_shown_roster_items() def setup_and_draw_roster(self): """ @@ -1548,6 +1551,8 @@ """ Determine whether iter should be visible in the treeview """ + if self.starting_filtering: + return False type_ = model[titer][C_TYPE] if not type_: return False @@ -6288,6 +6293,8 @@ def __init__(self): self.filtering = False + self.starting = False + self.starting_filtering = False # Number of renderers plugins added self.nb_ext_renderers = 0 # [icon, name, type, jid, account, editable, mood_pixbuf,

1 0

gajim: correctly handle see-other-host (earlier in the connectio...
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset dd85d8b743c2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dd85d8b743c2 description: correctly handle see-other-host (earlier in the connection process). Fixes #7179 diffstat: src/common/connection.py | 5 +++++ src/common/connection_handlers.py | 3 +-- src/common/connection_handlers_events.py | 6 ++++-- src/common/resolver.py | 2 ++ src/common/xmpp/client_nb.py | 11 ++++++++--- src/common/xmpp/dispatcher_nb.py | 3 +++ 6 files changed, 23 insertions(+), 7 deletions(-) diffs (132 lines): diff -r c10af231f45f -r dd85d8b743c2 src/common/connection.py --- a/src/common/connection.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/connection.py Tue Jun 19 19:19:24 2012 +0200 @@ -1134,6 +1134,10 @@ self._disconnectedReconnCB() def connect_to_next_type(self, retry=False): + if self.redirected: + self.disconnect(on_purpose=True) + self.connect() + return if len(self._connection_types): self._current_type = self._connection_types.pop(0) if self.last_connection: @@ -1194,6 +1198,7 @@ on_connect=self.on_connect_success, on_proxy_failure=self.on_proxy_failure, on_connect_failure=self.connect_to_next_type, + on_stream_error_cb=self._StreamCB, proxy=self._proxy, secure_tuple = secure_tuple) diff -r c10af231f45f -r dd85d8b743c2 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/connection_handlers.py Tue Jun 19 19:19:24 2012 +0200 @@ -1257,6 +1257,7 @@ PrivateStorageRosternotesReceivedEvent) gajim.nec.register_incoming_event(RosternotesReceivedEvent) gajim.nec.register_incoming_event(StreamConflictReceivedEvent) + gajim.nec.register_incoming_event(StreamOtherHostReceivedEvent) gajim.nec.register_incoming_event(MessageReceivedEvent) gajim.nec.register_incoming_event(ArchivingErrorReceivedEvent) gajim.nec.register_incoming_event( @@ -2018,8 +2019,6 @@ if obj.conn.name != self.name: return self.redirected = obj.redirected - self.disconnect(on_purpose=True) - self.connect() def _StreamCB(self, con, obj): log.debug('StreamCB') diff -r c10af231f45f -r dd85d8b743c2 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/connection_handlers_events.py Tue Jun 19 19:19:24 2012 +0200 @@ -680,8 +680,10 @@ 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'): + self.conn = self.base_event.conn + self.stanza = self.base_event.stanza + other_host = self.stanza.getTag('see-other-host') + if other_host and self.conn._current_type in ('ssl', 'tls'): host = other_host.getData() if ':' in host: host_l = host.split(':', 1) diff -r c10af231f45f -r dd85d8b743c2 src/common/resolver.py --- a/src/common/resolver.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/resolver.py Tue Jun 19 19:19:24 2012 +0200 @@ -63,6 +63,7 @@ self.handlers = {} def resolve(self, host, on_ready, type='srv'): + host = host.lower() log.debug('resolve %s type=%s' % (host, type)) assert(type in ['srv', 'txt']) if not host: @@ -88,6 +89,7 @@ def _on_ready(self, host, type, result_list): # practically it is impossible to be the opposite, but who knows :) + host = host.lower() log.debug('Resolving result for %s: %s' % (host, result_list)) if not self.resolved_hosts.has_key(host+type): self.resolved_hosts[host+type] = result_list diff -r c10af231f45f -r dd85d8b743c2 src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/xmpp/client_nb.py Tue Jun 19 19:19:24 2012 +0200 @@ -67,6 +67,7 @@ self.on_connect_failure = None self.proxy = None self.got_features = False + self.got_see_other_host = None self.stream_started = False self.disconnecting = False self.protocol_type = 'XMPP' @@ -138,8 +139,8 @@ self.disconnecting = False def connect(self, on_connect, on_connect_failure, hostname=None, port=5222, - on_proxy_failure=None, proxy=None, secure_tuple=('plain', None, - None)): + on_proxy_failure=None, on_stream_error_cb=None, proxy=None, + secure_tuple=('plain', None, None)): """ Open XMPP connection (open XML streams in both directions) @@ -161,6 +162,7 @@ self.on_connect = on_connect self.on_connect_failure=on_connect_failure self.on_proxy_failure = on_proxy_failure + self.on_stream_error_cb = on_stream_error_cb self.desired_security, self.cacerts, self.mycerts = secure_tuple self.Connection = None self.Port = port @@ -350,7 +352,10 @@ # sometimes <features> are received together with document # attributes and sometimes on next receive... self.Dispatcher.ProcessNonBlocking(data) - if not self.got_features: + if self.got_see_other_host: + log.info('got see-other-host') + self.on_stream_error_cb(self, self.got_see_other_host) + elif not self.got_features: self._xmpp_connect_machine( mode='FAILURE', data='Missing <features> in 1.0 stream') diff -r c10af231f45f -r dd85d8b743c2 src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/xmpp/dispatcher_nb.py Tue Jun 19 19:19:24 2012 +0200 @@ -415,6 +415,9 @@ if name == 'features': self._owner.got_features = True session.Stream.features = stanza + if name == 'error': + if stanza.getTag('see-other-host'): + self._owner.got_see_other_host = stanza xmlns = stanza.getNamespace()

1 0

gajim: current version is 0.15.0.1
by Yann Leboulanger 17 Jun '12

17 Jun '12

changeset c10af231f45f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c10af231f45f description: current version is 0.15.0.1 diffstat: autogen.sh | 7 +------ src/common/defs.py | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diffs (34 lines): diff -r 0f13f6f2b647 -r c10af231f45f autogen.sh --- a/autogen.sh Sat Jun 16 18:46:21 2012 -0400 +++ b/autogen.sh Sun Jun 17 22:11:17 2012 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15" + gajimversion="0.15.0.1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" @@ -10,11 +10,6 @@ AM_ARGS="--add-missing --gnu --copy -Wno-portability" CONF_ARGS="" - if test x`uname -s 2>/dev/null` = 'xDarwin' -a -f /Library/Frameworks/GTK+.framework/Versions/Current/env; then - . /Library/Frameworks/GTK+.framework/Versions/Current/env - AM_ARGS="${AM_ARGS} --ignore-deps" - CONF_ARGS="${CONF_ARGS} --disable-idle --without-x" - fi echo "[encoding: UTF-8]" > po/POTFILES.in \ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ diff -r 0f13f6f2b647 -r c10af231f45f src/common/defs.py --- a/src/common/defs.py Sat Jun 16 18:46:21 2012 -0400 +++ b/src/common/defs.py Sun Jun 17 22:11:17 2012 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15' +version = '0.15.0.1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: merge
by Jefry Lagrange 16 Jun '12

16 Jun '12

changeset 0f13f6f2b647 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0f13f6f2b647 description: merge diffstat: src/common/config.py | 12 ++++++++++++ src/common/connection_handlers.py | 2 +- src/tooltips.py | 39 ++++++++++++++++++++++++--------------- 3 files changed, 37 insertions(+), 16 deletions(-) diffs (121 lines): diff -r 61f42e72a6fc -r 0f13f6f2b647 src/common/config.py --- a/src/common/config.py Sat Jun 16 18:41:33 2012 -0400 +++ b/src/common/config.py Sat Jun 16 18:46:21 2012 -0400 @@ -222,6 +222,18 @@ 'roster_avatar_height': [opt_int, 32], 'tooltip_avatar_width': [opt_int, 125], 'tooltip_avatar_height': [opt_int, 125], + 'tooltip_status_online_color': [opt_color, '#73D216'], + 'tooltip_status_free_for_chat_color': [opt_color, '#3465A4'], + 'tooltip_status_away_color': [opt_color, '#EDD400'], + 'tooltip_status_busy_color': [opt_color, '#F57900'], + 'tooltip_status_na_color': [opt_color, '#CC0000'], + 'tooltip_status_offline_color': [opt_color, '#555753'], + 'tooltip_affiliation_none_color': [opt_color, '#555753'], + 'tooltip_affiliation_member_color': [opt_color, '#73D216'], + 'tooltip_affiliation_administrator_color': [opt_color, '#F57900'], + 'tooltip_affiliation_owner_color': [opt_color, '#CC0000'], + 'tooltip_account_name_color': [opt_color, '#888A85'], + 'tooltip_idle_color': [opt_color, '#888A85'], 'vcard_avatar_width': [opt_int, 200], 'vcard_avatar_height': [opt_int, 200], 'notification_preview_message': [opt_bool, True, _('Preview new messages in notification popup?')], diff -r 61f42e72a6fc -r 0f13f6f2b647 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Jun 16 18:41:33 2012 -0400 +++ b/src/common/connection_handlers.py Sat Jun 16 18:46:21 2012 -0400 @@ -2024,7 +2024,7 @@ def _StreamCB(self, con, obj): log.debug('StreamCB') gajim.nec.push_incoming_event(StreamReceivedEvent(None, - conn=self, stanza=iq_obj)) + conn=self, stanza=obj)) def _register_handlers(self, con, con_type): # try to find another way to register handlers in each class diff -r 61f42e72a6fc -r 0f13f6f2b647 src/tooltips.py --- a/src/tooltips.py Sat Jun 16 18:41:33 2012 -0400 +++ b/src/tooltips.py Sat Jun 16 18:46:21 2012 -0400 @@ -181,18 +181,21 @@ semantics. Color palette is the Tango. """ formatted = "%s" + color = None if status.startswith(Q_("?user status:Available")): - status = formatted % ('#73D216', status) + color = gajim.config.get('tooltip_status_online_color') elif status.startswith(_("Free for Chat")): - status = formatted % ('#3465A4', status) + color = gajim.config.get('tooltip_status_free_for_chat_color') elif status.startswith(_("Away")): - status = formatted % ('#EDD400', status) + color = gajim.config.get('tooltip_status_away_color') elif status.startswith(_("Busy")): - status = formatted % ('#F57900', status) + color = gajim.config.get('tooltip_status_busy_color') elif status.startswith(_("Not Available")): - status = formatted % ('#CC0000', status) + color = gajim.config.get('tooltip_status_na_color') elif status.startswith(_("Offline")): - status = formatted % ('#555753', status) + color = gajim.config.get('tooltip_status_offline_color') + if color: + status = formatted % (color, status) return status @staticmethod @@ -202,14 +205,17 @@ it's semantics. Color palette is the Tango. """ formatted = "%s" + color = None if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")): - affiliation = formatted % ('#555753', affiliation) + color = gajim.conig.get('tooltip_affiliation_none_color') elif affiliation.startswith(_("Member")): - affiliation = formatted % ('#73D216', affiliation) + color = gajim.conig.get('tooltip_affiliation_member_color') elif affiliation.startswith(_("Administrator")): - affiliation = formatted % ('#F57900', affiliation) + color = gajim.conig.get('tooltip_affiliation_administrator_color') elif affiliation.startswith(_("Owner")): - affiliation = formatted % ('#CC0000', affiliation) + color = gajim.conig.get('tooltip_affiliation_owner_color') + if color: + affiliation = formatted % (color, affiliation) return affiliation class StatusTable: @@ -493,9 +499,9 @@ gobject.markup_escape_text(prim_contact.get_shown_name())\ + '' if gajim.config.get('mergeaccounts'): - name_markup += u" (" + \ - gobject.markup_escape_text(prim_contact.account.name) \ - + ')' + name_markup += u" (%s)" % ( + gajim.config.get('tooltip_account_name_color'), + gobject.markup_escape_text(prim_contact.account.name)) if self.account and helpers.jid_is_blocked(self.account, prim_contact.jid): @@ -528,7 +534,8 @@ iconset = gajim.config.get('iconset') if not iconset: iconset = 'dcraven' - file_path = os.path.join(helpers.get_iconset_path(iconset), '16x16') + file_path = os.path.join(helpers.get_iconset_path(iconset), + '16x16') contact_keys = sorted(contacts_dict.keys()) contact_keys.reverse() @@ -641,7 +648,9 @@ # is no meaningful difference between last activity time and # current time. if diff.days > 0 or diff.seconds > 0: - cs = "%s" + cs = "" % gajim.config.get( + 'tooltip_idle_color') + cs += '%s' properties.append((str(), None)) properties.append(((cs % _("Idle since %s")) % formatted, None)) properties.append(((cs % _("Idle for %s")) % str(diff), None))

1 0

gajim: send files to gc peer. Fixes #7171
by Jefry Lagrange 16 Jun '12

16 Jun '12

changeset 61f42e72a6fc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=61f42e72a6fc description: send files to gc peer. Fixes #7171 diffstat: src/chat_control.py | 5 +++-- src/common/contacts.py | 34 ++++++++++++++++++++++++++++++---- src/common/jingle.py | 4 ++++ src/common/jingle_ft.py | 9 ++++++++- src/common/jingle_transport.py | 2 ++ 5 files changed, 47 insertions(+), 7 deletions(-) diffs (129 lines): diff -r 8c3223cea458 -r 61f42e72a6fc src/chat_control.py --- a/src/chat_control.py Wed Jun 13 17:17:45 2012 +0400 +++ b/src/chat_control.py Sat Jun 16 18:41:33 2012 -0400 @@ -1722,8 +1722,9 @@ self._video_button.set_sensitive(self.video_available) # Send file - if (self.contact.supports(NS_FILE) or self.contact.supports(NS_JINGLE_FILE_TRANSFER)) and (self.type_id == 'chat' or \ - self.gc_contact.resource): + if (self.contact.supports(NS_FILE) or \ + self.contact.supports(NS_JINGLE_FILE_TRANSFER)) or \ + self.type_id == 'chat' or self.gc_contact.resource: self._send_file_button.set_sensitive(True) self._send_file_button.set_tooltip_text('') else: diff -r 8c3223cea458 -r 61f42e72a6fc src/common/contacts.py --- a/src/common/contacts.py Wed Jun 13 17:17:45 2012 +0400 +++ b/src/common/contacts.py Sat Jun 16 18:41:33 2012 -0400 @@ -28,10 +28,13 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## - -from common import caps_cache -from common.account import Account -import common.gajim +try: + from common import caps_cache + from common.account import Account + import common.gajim +except ImportError, e: + if __name__ != "__main__": + raise ImportError(e) class XMPPEntity(object): """ @@ -411,6 +414,9 @@ def get_gc_contact(self, account, room_jid, nick): return self._accounts[account].gc_contacts.get_gc_contact(room_jid, nick) + def is_gc_contact(self, account, jid): + return self._accounts[account].gc_contacts.is_gc_contact(jid) + def get_nb_role_total_gc_contacts(self, account, room_jid, role): return self._accounts[account].gc_contacts.get_nb_role_total_gc_contacts(room_jid, role) @@ -564,6 +570,21 @@ return None return self._rooms[room_jid][nick] + def is_gc_contact(self, jid): + """ + >>> gc = GC_Contacts() + >>> gc._rooms = {'gajim(a)conference.gajim.org' : {'test' : True}} + >>> gc.is_gc_contact('gajim(a)conference.gajim.org/test') + True + >>> gc.is_gc_contact('test(a)jabbim.com') + False + """ + jid = jid.split('/') + if len(jid) != 2: + return False + gcc = self.get_gc_contact(jid[0], jid[1]) + return gcc != None + def get_nb_role_total_gc_contacts(self, room_jid, role): """ Return the number of group chat contacts for the given role and the total @@ -827,3 +848,8 @@ """ family.sort(cmp=self._compare_metacontacts) return family[-1] + + +if __name__ == "__main__": + import doctest + doctest.testmod() diff -r 8c3223cea458 -r 61f42e72a6fc src/common/jingle.py --- a/src/common/jingle.py Wed Jun 13 17:17:45 2012 +0400 +++ b/src/common/jingle.py Sat Jun 16 18:41:33 2012 -0400 @@ -145,6 +145,10 @@ logger.info("start file transfer with file: %s" % file_props) contact = gajim.contacts.get_contact_with_highest_priority(self.name, gajim.get_jid_without_resource(jid)) + if gajim.contacts.is_gc_contact(self.name,jid): + gcc = jid.split('/') + if len(gcc) == 2: + contact = gajim.contacts.get_gc_contact(self.name, gcc[0], gcc[1]) if contact is None: return use_security = contact.supports(xmpp.NS_JINGLE_XTLS) diff -r 8c3223cea458 -r 61f42e72a6fc src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Jun 13 17:17:45 2012 +0400 +++ b/src/common/jingle_ft.py Sat Jun 16 18:41:33 2012 -0400 @@ -19,6 +19,7 @@ Handles Jingle File Transfer (XEP 0234) """ +import hashlib import gajim import xmpp from jingle_content import contents, JingleContent @@ -97,7 +98,13 @@ self.session = session self.media = 'file' self.nominated_cand = {} - + if gajim.contacts.is_gc_contact(session.connection.name, + session.peerjid): + roomjid = session.peerjid.split('/')[0] + dstaddr = hashlib.sha1('%s%s%s' % (self.file_props['sid'], + session.ourjid, + roomjid)).hexdigest() + self.file_props['dstaddr'] = dstaddr self.state = STATE_NOT_STARTED self.states = {STATE_INITIALIZED : StateInitialized(self), STATE_CAND_SENT : StateCandSent(self), diff -r 8c3223cea458 -r 61f42e72a6fc src/common/jingle_transport.py --- a/src/common/jingle_transport.py Wed Jun 13 17:17:45 2012 +0400 +++ b/src/common/jingle_transport.py Sat Jun 16 18:41:33 2012 -0400 @@ -132,6 +132,8 @@ transport = xmpp.Node('transport') transport.setNamespace(xmpp.NS_JINGLE_BYTESTREAM) transport.setAttr('sid', self.sid) + if 'dstaddr' in self.file_props: + transport.setAttr('dstaddr', self.file_props['dstaddr']) return transport def parse_transport_stanza(self, transport):

1 0

gajim: make tooltip colors configurable. Fixes #7165
by Yann Leboulanger 16 Jun '12

16 Jun '12

changeset 31c837c4e8c9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=31c837c4e8c9 description: make tooltip colors configurable. Fixes #7165 diffstat: src/common/config.py | 12 ++++++++++++ src/tooltips.py | 39 ++++++++++++++++++++++++--------------- 2 files changed, 36 insertions(+), 15 deletions(-) diffs (109 lines): diff -r 4b8e79f6938c -r 31c837c4e8c9 src/common/config.py --- a/src/common/config.py Sat Jun 16 13:51:54 2012 +0200 +++ b/src/common/config.py Sat Jun 16 22:58:46 2012 +0200 @@ -222,6 +222,18 @@ 'roster_avatar_height': [opt_int, 32], 'tooltip_avatar_width': [opt_int, 125], 'tooltip_avatar_height': [opt_int, 125], + 'tooltip_status_online_color': [opt_color, '#73D216'], + 'tooltip_status_free_for_chat_color': [opt_color, '#3465A4'], + 'tooltip_status_away_color': [opt_color, '#EDD400'], + 'tooltip_status_busy_color': [opt_color, '#F57900'], + 'tooltip_status_na_color': [opt_color, '#CC0000'], + 'tooltip_status_offline_color': [opt_color, '#555753'], + 'tooltip_affiliation_none_color': [opt_color, '#555753'], + 'tooltip_affiliation_member_color': [opt_color, '#73D216'], + 'tooltip_affiliation_administrator_color': [opt_color, '#F57900'], + 'tooltip_affiliation_owner_color': [opt_color, '#CC0000'], + 'tooltip_account_name_color': [opt_color, '#888A85'], + 'tooltip_idle_color': [opt_color, '#888A85'], 'vcard_avatar_width': [opt_int, 200], 'vcard_avatar_height': [opt_int, 200], 'notification_preview_message': [opt_bool, True, _('Preview new messages in notification popup?')], diff -r 4b8e79f6938c -r 31c837c4e8c9 src/tooltips.py --- a/src/tooltips.py Sat Jun 16 13:51:54 2012 +0200 +++ b/src/tooltips.py Sat Jun 16 22:58:46 2012 +0200 @@ -181,18 +181,21 @@ semantics. Color palette is the Tango. """ formatted = "%s" + color = None if status.startswith(Q_("?user status:Available")): - status = formatted % ('#73D216', status) + color = gajim.config.get('tooltip_status_online_color') elif status.startswith(_("Free for Chat")): - status = formatted % ('#3465A4', status) + color = gajim.config.get('tooltip_status_free_for_chat_color') elif status.startswith(_("Away")): - status = formatted % ('#EDD400', status) + color = gajim.config.get('tooltip_status_away_color') elif status.startswith(_("Busy")): - status = formatted % ('#F57900', status) + color = gajim.config.get('tooltip_status_busy_color') elif status.startswith(_("Not Available")): - status = formatted % ('#CC0000', status) + color = gajim.config.get('tooltip_status_na_color') elif status.startswith(_("Offline")): - status = formatted % ('#555753', status) + color = gajim.config.get('tooltip_status_offline_color') + if color: + status = formatted % (color, status) return status @staticmethod @@ -202,14 +205,17 @@ it's semantics. Color palette is the Tango. """ formatted = "%s" + color = None if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")): - affiliation = formatted % ('#555753', affiliation) + color = gajim.conig.get('tooltip_affiliation_none_color') elif affiliation.startswith(_("Member")): - affiliation = formatted % ('#73D216', affiliation) + color = gajim.conig.get('tooltip_affiliation_member_color') elif affiliation.startswith(_("Administrator")): - affiliation = formatted % ('#F57900', affiliation) + color = gajim.conig.get('tooltip_affiliation_administrator_color') elif affiliation.startswith(_("Owner")): - affiliation = formatted % ('#CC0000', affiliation) + color = gajim.conig.get('tooltip_affiliation_owner_color') + if color: + affiliation = formatted % (color, affiliation) return affiliation class StatusTable: @@ -493,9 +499,9 @@ gobject.markup_escape_text(prim_contact.get_shown_name())\ + '' if gajim.config.get('mergeaccounts'): - name_markup += u" (" + \ - gobject.markup_escape_text(prim_contact.account.name) \ - + ')' + name_markup += u" (%s)" % ( + gajim.config.get('tooltip_account_name_color'), + gobject.markup_escape_text(prim_contact.account.name)) if self.account and helpers.jid_is_blocked(self.account, prim_contact.jid): @@ -528,7 +534,8 @@ iconset = gajim.config.get('iconset') if not iconset: iconset = 'dcraven' - file_path = os.path.join(helpers.get_iconset_path(iconset), '16x16') + file_path = os.path.join(helpers.get_iconset_path(iconset), + '16x16') contact_keys = sorted(contacts_dict.keys()) contact_keys.reverse() @@ -641,7 +648,9 @@ # is no meaningful difference between last activity time and # current time. if diff.days > 0 or diff.seconds > 0: - cs = "%s" + cs = "" % gajim.config.get( + 'tooltip_idle_color') + cs += '%s' properties.append((str(), None)) properties.append(((cs % _("Idle since %s")) % formatted, None)) properties.append(((cs % _("Idle for %s")) % str(diff), None))

1 0

gajim: fix typo. Fixes #7161
by Yann Leboulanger 16 Jun '12

16 Jun '12

changeset 4b8e79f6938c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4b8e79f6938c description: fix typo. Fixes #7161 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8c3223cea458 -r 4b8e79f6938c src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Jun 13 17:17:45 2012 +0400 +++ b/src/common/connection_handlers.py Sat Jun 16 13:51:54 2012 +0200 @@ -2024,7 +2024,7 @@ def _StreamCB(self, con, obj): log.debug('StreamCB') gajim.nec.push_incoming_event(StreamReceivedEvent(None, - conn=self, stanza=iq_obj)) + conn=self, stanza=obj)) def _register_handlers(self, con, con_type): # try to find another way to register handlers in each class

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 2012