Commits July 2007

commits@gajim.org

8 participants
98 discussions

[commit-gajim] r8436 - trunk/src
by asterix＠gajim.org 26 Jul '07

26 Jul '07

Author: asterix Date: 2007-07-26 18:54:13 +0200 (Thu, 26 Jul 2007) New Revision: 8436 Modified: trunk/src/roster_window.py Log: print resource in chat window only if several resources. fixes #3175 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-07-25 23:06:33 UTC (rev 8435) +++ trunk/src/roster_window.py 2007-07-26 16:54:13 UTC (rev 8436) @@ -1286,10 +1286,15 @@ contact_instances = gajim.contacts.get_contacts(account, contact.jid) contact.show = show contact.status = status + # name is to show in conversation window + name = contact.get_shown_name() + if show in ('offline', 'error') and \ len(gajim.events.get_events(account, contact.get_full_jid())) == 0: if len(contact_instances) > 1: # if multiple resources + if contact.resource != '': + name += '/' + contact.resource jid_with_resource = contact.jid + '/' + contact.resource if gajim.interface.msg_win_mgr.has_window(jid_with_resource, account): @@ -1299,34 +1304,27 @@ ctrl.update_ui() win.redraw_tab(ctrl) gajim.contacts.remove_contact(account, contact) + elif len(contact_instances) > 1 and contact.resource != '': + name += '/' + contact.resource self.remove_contact(contact, account) self.add_contact_to_roster(contact.jid, account) # print status in chat window and update status/GPG image - jid_list = [contact.jid] - for jid in jid_list: - if gajim.interface.msg_win_mgr.has_window(jid, account): - win = gajim.interface.msg_win_mgr.get_window(jid, account) - ctrl = win.get_control(jid, account) - ctrl.contact = gajim.contacts.get_contact_with_highest_priority( - account, contact.jid) - ctrl.update_ui() - win.redraw_tab(ctrl) + if gajim.interface.msg_win_mgr.has_window(contact.jid, account): + win = gajim.interface.msg_win_mgr.get_window(contact.jid, account) + ctrl = win.get_control(contact.jid, account) + ctrl.contact = gajim.contacts.get_contact_with_highest_priority( + account, contact.jid) + ctrl.update_ui() + win.redraw_tab(ctrl) - name = contact.get_shown_name() + uf_show = helpers.get_uf_show(show) + if status: + ctrl.print_conversation(_('%s is now %s (%s)') % (name, uf_show, + status), 'status') + else: # No status message + ctrl.print_conversation(_('%s is now %s') % (name, uf_show), + 'status') - # if multiple resources (or second one disconnecting) - if (len(contact_instances) > 1 or (len(contact_instances) == 1 and \ - show in ('offline', 'error'))) and contact.resource != '': - name += '/' + contact.resource - - uf_show = helpers.get_uf_show(show) - if status: - ctrl.print_conversation(_('%s is now %s (%s)') % (name, uf_show, - status), 'status') - else: # No status message - ctrl.print_conversation(_('%s is now %s') % (name, uf_show), - 'status') - if not contact.groups: self.draw_group(_('General'), account) else:

1 0

[commit-gajim] r8435 - trunk/src/common
by asterix＠gajim.org 25 Jul '07

25 Jul '07

Author: asterix Date: 2007-07-26 01:06:33 +0200 (Thu, 26 Jul 2007) New Revision: 8435 Modified: trunk/src/common/configpaths.py Log: fix typo. see #2149 Modified: trunk/src/common/configpaths.py =================================================================== --- trunk/src/common/configpaths.py 2007-07-25 23:04:15 UTC (rev 8434) +++ trunk/src/common/configpaths.py 2007-07-25 23:06:33 UTC (rev 8435) @@ -74,7 +74,7 @@ yield (key, self[key]) def init(self, root = None): - if self.root is not None: + if root is not None: self.root = root # LOG is deprecated

1 0

[commit-gajim] r8434 - in trunk/src: . common
by asterix＠gajim.org 25 Jul '07

25 Jul '07

Author: asterix Date: 2007-07-26 01:04:15 +0200 (Thu, 26 Jul 2007) New Revision: 8434 Modified: trunk/src/common/configpaths.py trunk/src/gajim.py Log: add --config-path option so that we can specify the root folder of config files. see #2149 Modified: trunk/src/common/configpaths.py =================================================================== --- trunk/src/common/configpaths.py 2007-07-25 23:02:55 UTC (rev 8433) +++ trunk/src/common/configpaths.py 2007-07-25 23:04:15 UTC (rev 8434) @@ -25,6 +25,11 @@ '''Convert from filesystem encoding if not already Unicode''' return unicode(s, sys.getfilesystemencoding()) +def windowsify(s): + if os.name == 'nt': + return s.capitalize() + return s + class ConfigPaths: def __init__(self, root=None): self.root = root @@ -68,51 +73,45 @@ for key in self.paths.iterkeys(): yield (key, self[key]) -def windowsify(s): - if os.name == 'nt': - return s.capitalize() - return s + def init(self, root = None): + if self.root is not None: + self.root = root -def init(): - paths = ConfigPaths() + # LOG is deprecated + k = ( 'LOG', 'LOG_DB', 'VCARD', 'AVATAR', 'MY_EMOTS' ) + v = (u'logs', u'logs.db', u'vcards', u'avatars', u'emoticons') - # LOG is deprecated - k = ( 'LOG', 'LOG_DB', 'VCARD', 'AVATAR', 'MY_EMOTS' ) - v = (u'logs', u'logs.db', u'vcards', u'avatars', u'emoticons') + if os.name == 'nt': + v = map(lambda x: x.capitalize(), v) - if os.name == 'nt': - v = map(lambda x: x.capitalize(), v) + for n, p in zip(k, v): + self.add_from_root(n, p) - for n, p in zip(k, v): - paths.add_from_root(n, p) + self.add('DATA', os.path.join(u'..', windowsify(u'data'))) + self.add('HOME', fse(os.path.expanduser('~'))) + self.add('TMP', fse(tempfile.gettempdir())) - paths.add('DATA', os.path.join(u'..', windowsify(u'data'))) - paths.add('HOME', fse(os.path.expanduser('~'))) - paths.add('TMP', fse(tempfile.gettempdir())) + try: + import svn_config + svn_config.configure(self) + except (ImportError, AttributeError): + pass - try: - import svn_config - svn_config.configure(paths) - except (ImportError, AttributeError): - pass + # for k, v in paths.iteritems(): + # print "%s: %s" % (repr(k), repr(v)) - # for k, v in paths.iteritems(): - # print "%s: %s" % (repr(k), repr(v)) + def init_profile(self, profile): + conffile = windowsify(u'config') + pidfile = windowsify(u'gajim') - return paths + if len(profile) > 0: + conffile += u'.' + profile + pidfile += u'.' + profile + pidfile += u'.pid' + self.add_from_root('CONFIG_FILE', conffile) + self.add_from_root('PID_FILE', pidfile) -gajimpaths = init() + # for k, v in paths.iteritems(): + # print "%s: %s" % (repr(k), repr(v)) -def init_profile(profile, paths=gajimpaths): - conffile = windowsify(u'config') - pidfile = windowsify(u'gajim') - - if len(profile) > 0: - conffile += u'.' + profile - pidfile += u'.' + profile - pidfile += u'.pid' - paths.add_from_root('CONFIG_FILE', conffile) - paths.add_from_root('PID_FILE', pidfile) - - # for k, v in paths.iteritems(): - # print "%s: %s" % (repr(k), repr(v)) +gajimpaths = ConfigPaths() Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-07-25 23:02:55 UTC (rev 8433) +++ trunk/src/gajim.py 2007-07-25 23:04:15 UTC (rev 8434) @@ -72,10 +72,11 @@ def parseOpts(): profile = '' verbose = False + config_path = None try: - shortargs = 'hqvl:p:' - longargs = 'help quiet verbose loglevel= profile=' + shortargs = 'hqvl:p:c:' + longargs = 'help quiet verbose loglevel= profile= config_path=' opts, args = getopt.getopt(sys.argv[1:], shortargs, longargs.split()) except getopt.error, msg: print msg @@ -95,11 +96,22 @@ profile = a elif o in ('-l', '--loglevel'): parseAndSetLogLevels(a) - return profile, verbose + elif o in ('-c', '--config-path'): + config_path = a + return profile, verbose, config_path -profile, verbose = parseOpts() +profile, verbose, config_path = parseOpts() del parseOpts, parseAndSetLogLevels, parseLogTarget, parseLogLevel +import locale +profile = unicode(profile, locale.getpreferredencoding()) + +import common.configpaths +common.configpaths.gajimpaths.init(config_path) +del config_path +common.configpaths.gajimpaths.init_profile(profile) +del profile + import message_control from chat_control import ChatControlBase @@ -198,12 +210,6 @@ if verbose: gajim.verbose = True del verbose -import locale -profile = unicode(profile, locale.getpreferredencoding()) - -import common.configpaths -common.configpaths.init_profile(profile) -del profile gajimpaths = common.configpaths.gajimpaths pid_filename = gajimpaths['PID_FILE']

1 0

[commit-gajim] r8433 - trunk/src/common
by asterix＠gajim.org 25 Jul '07

25 Jul '07

Author: asterix Date: 2007-07-26 01:02:55 +0200 (Thu, 26 Jul 2007) New Revision: 8433 Modified: trunk/src/common/connection_handlers.py Log: fix traceback when receiving a file Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-07-25 17:30:43 UTC (rev 8432) +++ trunk/src/common/connection_handlers.py 2007-07-25 23:02:55 UTC (rev 8433) @@ -562,6 +562,7 @@ file_props['sender'] = helpers.get_full_jid_from_iq(iq_obj) file_props['request-id'] = unicode(iq_obj.getAttr('id')) file_props['sid'] = unicode(si.getAttr('id')) + file_props['transfered_size'] = [] gajim.socks5queue.add_file_props(self.name, file_props) self.dispatch('FILE_REQUEST', (jid, file_props)) raise common.xmpp.NodeProcessed

1 0

[commit-gajim] r8432 - trunk/src
by steve-e＠gajim.org 25 Jul '07

25 Jul '07

Author: steve-e Date: 2007-07-25 19:30:43 +0200 (Wed, 25 Jul 2007) New Revision: 8432 Modified: trunk/src/chat_control.py trunk/src/groupchat_control.py Log: Prevent possible traceback Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-07-25 00:33:18 UTC (rev 8431) +++ trunk/src/chat_control.py 2007-07-25 17:30:43 UTC (rev 8432) @@ -1768,6 +1768,8 @@ if not c.resource: return if target_type == self.TARGET_TYPE_URI_LIST: + if not selection.data: + return uri = selection.data.strip() uri_splitted = uri.split() # we may have more than one file dropped for uri in uri_splitted: Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-07-25 00:33:18 UTC (rev 8431) +++ trunk/src/groupchat_control.py 2007-07-25 17:30:43 UTC (rev 8432) @@ -1658,6 +1658,8 @@ # Invite contact to groupchat treeview = gajim.interface.roster.tree model = treeview.get_model() + if not selection.data: + return data = selection.data path = treeview.get_selection().get_selected_rows()[1][0] iter = model.get_iter(path)

1 0

[commit-gajim] r8431 - trunk/src
by asterix＠gajim.org 25 Jul '07

25 Jul '07

Author: asterix Date: 2007-07-25 02:33:18 +0200 (Wed, 25 Jul 2007) New Revision: 8431 Modified: trunk/src/filetransfers_window.py Log: compute file transfer speed on the last 3 seonds only. fixes #2631 Modified: trunk/src/filetransfers_window.py =================================================================== --- trunk/src/filetransfers_window.py 2007-07-24 08:20:06 UTC (rev 8430) +++ trunk/src/filetransfers_window.py 2007-07-25 00:33:18 UTC (rev 8431) @@ -420,10 +420,18 @@ #they are not translatable. return _('%(hours)02.d:%(minutes)02.d:%(seconds)02.d') % times - def _get_eta_and_speed(self, full_size, transfered_size, elapsed_time): - if elapsed_time == 0: + def _get_eta_and_speed(self, full_size, transfered_size, file_props): + if len(file_props['transfered_size']) == 0: return 0., 0. - speed = round(float(transfered_size) / elapsed_time) + elif len(file_props['transfered_size']) == 1: + speed = round(float(transfered_size) / file_props['elapsed-time']) + else: + # first and last are (time, transfered_size) + first = file_props['transfered_size'][0] + last = file_props['transfered_size'][-1] + transfered = last[1] - first[1] + tim = last[0] - first[0] + speed = round(float(transfered) / tim) if speed == 0.: return 0., 0. remaining_size = full_size - transfered_size @@ -484,8 +492,13 @@ if file_props.has_key('offset') and file_props['offset']: transfered_size -= file_props['offset'] full_size -= file_props['offset'] + + if file_props['elapsed-time'] > 0: + file_props['transfered_size'].append((file_props['last-time'], transfered_size)) + if len(file_props['transfered_size']) > 6: + file_props['transfered_size'].pop(0) eta, speed = self._get_eta_and_speed(full_size, transfered_size, - file_props['elapsed-time']) + file_props) self.model.set(iter, C_PROGRESS, text) self.model.set(iter, C_PERCENT, int(percent)) @@ -547,6 +560,8 @@ file_props['sender'] = account file_props['receiver'] = contact file_props['tt_account'] = account + # keep the last time: transfered_size to compute transfer speed + file_props['transfered_size'] = [] return file_props def add_transfer(self, account, contact, file_props): @@ -784,6 +799,8 @@ elif self.is_transfer_active(file_props): file_props['paused'] = True self.set_status(file_props['type'], file_props['sid'], 'pause') + # reset that to compute speed only when we resume + file_props['transfered_size'] = [] self.toggle_pause_continue(False) def on_cancel_button_clicked(self, widget):

1 0

[commit-gajim] r8430 - trunk/src/common
by asterix＠gajim.org 24 Jul '07

24 Jul '07

Author: asterix Date: 2007-07-24 10:20:06 +0200 (Tue, 24 Jul 2007) New Revision: 8430 Modified: trunk/src/common/passwords.py Log: fix traceback when not using gnome keyring. fixes #3319 Modified: trunk/src/common/passwords.py =================================================================== --- trunk/src/common/passwords.py 2007-07-23 21:35:01 UTC (rev 8429) +++ trunk/src/common/passwords.py 2007-07-24 08:20:06 UTC (rev 8430) @@ -86,7 +86,8 @@ display_name, attributes, password, update) token = 'gnomekeyring:%i' % auth_token gajim.config.set_per('accounts', account_name, 'password', token) - gajim.connections[account_name].password = password + if gajim.connections.has_key(account_name): + gajim.connections[account_name].password = password storage = None def get_storage():

1 0

[commit-gajim] r8429 - trunk/src/common
by asterix＠gajim.org 23 Jul '07

23 Jul '07

Author: asterix Date: 2007-07-23 23:35:01 +0200 (Mon, 23 Jul 2007) New Revision: 8429 Modified: trunk/src/common/passwords.py Log: update password in connection instance when we modify it and we use gnome keyring. fixes #3318 Modified: trunk/src/common/passwords.py =================================================================== --- trunk/src/common/passwords.py 2007-07-23 21:20:33 UTC (rev 8428) +++ trunk/src/common/passwords.py 2007-07-23 21:35:01 UTC (rev 8429) @@ -86,8 +86,8 @@ display_name, attributes, password, update) token = 'gnomekeyring:%i' % auth_token gajim.config.set_per('accounts', account_name, 'password', token) + gajim.connections[account_name].password = password - storage = None def get_storage(): global storage

1 0

[commit-gajim] r8428 - trunk/src
by steve-e＠gajim.org 23 Jul '07

23 Jul '07

Author: steve-e Date: 2007-07-23 23:20:33 +0200 (Mon, 23 Jul 2007) New Revision: 8428 Modified: trunk/src/chat_control.py trunk/src/groupchat_control.py trunk/src/roster_window.py Log: DnD of contact on a MUC window to invite Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-07-23 15:29:53 UTC (rev 8427) +++ trunk/src/chat_control.py 2007-07-23 21:20:33 UTC (rev 8428) @@ -138,7 +138,8 @@ self.handlers[id] = widget # Init DND self.TARGET_TYPE_URI_LIST = 80 - self.dnd_list = [ ( 'text/uri-list', 0, self.TARGET_TYPE_URI_LIST ) ] + self.dnd_list = [ ( 'text/uri-list', 0, self.TARGET_TYPE_URI_LIST ), + ('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_APP, 0)] id = self.widget.connect('drag_data_received', self._on_drag_data_received) self.handlers[id] = self.widget Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-07-23 15:29:53 UTC (rev 8427) +++ trunk/src/groupchat_control.py 2007-07-23 21:20:33 UTC (rev 8428) @@ -1653,10 +1653,20 @@ _('Bookmark has been added successfully'), _('You can manage your bookmarks via Actions menu in your roster.')) - def _on_drag_data_received(self, widget, context, x, y, selection, - target_type, timestamp): - # TODO: Invite to groupchat on dnd of a contact - pass + def _on_drag_data_received(self, widget, context, x, y, selection, + target_type, timestamp): + # Invite contact to groupchat + treeview = gajim.interface.roster.tree + model = treeview.get_model() + data = selection.data + path = treeview.get_selection().get_selected_rows()[1][0] + iter = model.get_iter(path) + type = model[iter][2] + account = model[iter][4].decode('utf-8') + if type != 'contact': # source is not a contact + return + contact_jid = data.decode('utf-8') + gajim.connections[self.account].send_invite(self.room_jid, contact_jid) def handle_message_textview_mykey_press(self, widget, event_keyval, event_keymod): Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-07-23 15:29:53 UTC (rev 8427) +++ trunk/src/roster_window.py 2007-07-23 21:20:33 UTC (rev 8428) @@ -5190,7 +5190,8 @@ #signals self.TARGET_TYPE_URI_LIST = 80 - TARGETS = [('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_WIDGET, 0)] + TARGETS = [('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_APP | gtk.TARGET_SAME_WIDGET, + 0)] TARGETS2 = [('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_WIDGET, 0), ('text/uri-list', 0, self.TARGET_TYPE_URI_LIST)] self.tree.enable_model_drag_source(gtk.gdk.BUTTON1_MASK, TARGETS,

1 0

[commit-gajim] r8427 - trunk/src
by asterix＠gajim.org 23 Jul '07

23 Jul '07

Author: asterix Date: 2007-07-23 17:29:53 +0200 (Mon, 23 Jul 2007) New Revision: 8427 Modified: trunk/src/chat_control.py Log: send file only once when we drop it on message textview Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-07-23 13:07:04 UTC (rev 8426) +++ trunk/src/chat_control.py 2007-07-23 15:29:53 UTC (rev 8427) @@ -196,8 +196,7 @@ self._on_drag_data_received) self.handlers[id] = self.msg_textview self.msg_textview.drag_dest_set(gtk.DEST_DEFAULT_MOTION | - gtk.DEST_DEFAULT_HIGHLIGHT | - gtk.DEST_DEFAULT_DROP, + gtk.DEST_DEFAULT_HIGHLIGHT, self.dnd_list, gtk.gdk.ACTION_COPY) self.update_font() @@ -1775,7 +1774,7 @@ if os.path.isfile(path): # is it file? ft = gajim.interface.instances['file_transfers'] ft.send_file(self.account, c, path) - + def _on_message_tv_buffer_changed(self, textbuffer): self.kbd_activity_in_last_5_secs = True self.kbd_activity_in_last_30_secs = True

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 July 2007