Commits May 2007

commits@gajim.org

4 participants
63 discussions

[commit-gajim] r8145 - trunk/src
by asterix＠gajim.org 12 May '07

12 May '07

Author: asterix Date: 2007-05-12 23:49:49 +0200 (Sat, 12 May 2007) New Revision: 8145 Modified: trunk/src/vcard.py Log: don't count real jid as fake jid Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2007-05-12 21:49:27 UTC (rev 8144) +++ trunk/src/vcard.py 2007-05-12 21:49:49 UTC (rev 8145) @@ -453,7 +453,7 @@ self.fill_status_label() gajim.connections[self.account].request_vcard(self.contact.jid, - self.gc_contact is not None) + (self.gc_contact is not None and not self.gc_contact.jid)) def on_close_button_clicked(self, widget): self.window.destroy()

1 0

[commit-gajim] r8144 - trunk/src
by asterix＠gajim.org 12 May '07

12 May '07

Author: asterix Date: 2007-05-12 23:49:27 +0200 (Sat, 12 May 2007) New Revision: 8144 Modified: trunk/src/groupchat_control.py Log: request vcard to real jid when we ask avatar. Fixes #3054 Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-05-12 20:30:26 UTC (rev 8143) +++ trunk/src/groupchat_control.py 2007-05-12 21:49:27 UTC (rev 8144) @@ -1016,10 +1016,18 @@ server = gajim.get_server_from_jid(self.room_jid) if gajim.config.get('ask_avatars_on_startup') and \ not server.startswith('irc'): - fjid = self.room_jid + '/' + nick + if j: + fjid = j + if resource: + fjid += '/' + resource + else: + fjid = self.room_jid + '/' + nick pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(fjid, True) if pixbuf == 'ask': - gajim.connections[self.account].request_vcard(fjid, True) + if j: + gajim.connections[self.account].request_vcard(fjid) + else: + gajim.connections[self.account].request_vcard(fjid, True) if nick == self.nick: # we became online self.got_connected() self.list_treeview.expand_row((model.get_path(role_iter)), False)

1 0

[commit-gajim] r8143 - in trunk/src: . common
by asterix＠gajim.org 12 May '07

12 May '07

Author: asterix Date: 2007-05-12 22:30:26 +0200 (Sat, 12 May 2007) New Revision: 8143 Modified: trunk/src/common/connection_handlers.py trunk/src/common/contacts.py trunk/src/gajim.py Log: show transport nickname if there is one and user hasn't set a nickname. fixes #3094 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-05-09 20:59:29 UTC (rev 8142) +++ trunk/src/common/connection_handlers.py 2007-05-12 20:30:26 UTC (rev 8143) @@ -1569,6 +1569,7 @@ user_nick = prs.getTagData('nick') if not user_nick: user_nick = '' + contact_nickname = None transport_auto_auth = False xtags = prs.getTags('x') for x in xtags: @@ -1581,6 +1582,7 @@ sigTag = x elif namespace == common.xmpp.NS_VCARD_UPDATE: avatar_sha = x.getTagData('photo') + contact_nickname = x.getTagData('nickname') elif namespace == common.xmpp.NS_DELAY: # JEP-0091 tim = prs.getTimestamp() @@ -1620,7 +1622,7 @@ errcode = prs.getErrorCode() if errcode == '502': # Internal Timeout: self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, - prio, keyID, timestamp)) + prio, keyID, timestamp, None)) elif errcode == '401': # password required to join self.dispatch('ERROR', (_('Unable to join group chat'), _('A password is required to join this group chat.'))) @@ -1716,7 +1718,7 @@ self.connection.send(p) if who.find("@") <= 0 or transport_auto_auth: self.dispatch('NOTIFY', (jid_stripped, 'offline', 'offline', - resource, prio, keyID, timestamp)) + resource, prio, keyID, timestamp, None)) if transport_auto_auth: self.automatically_added.append(jid_stripped) self.request_subscription(jid_stripped, name = user_nick) @@ -1767,7 +1769,7 @@ errcode = prs.getErrorCode() if errcode == '502': # Internal Timeout: self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, - prio, keyID, timestamp)) + prio, keyID, timestamp, None)) else: # print in the window the error self.dispatch('ERROR_ANSWER', ('', jid_stripped, errmsg, errcode)) @@ -1788,7 +1790,7 @@ not in no_log_for and jid_stripped not in no_log_for: gajim.logger.write('status', jid_stripped, status, show) self.dispatch('NOTIFY', (jid_stripped, show, status, resource, prio, - keyID, timestamp)) + keyID, timestamp, contact_nickname)) # END presenceCB def _StanzaArrivedCB(self, con, obj): Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-05-09 20:59:29 UTC (rev 8142) +++ trunk/src/common/contacts.py 2007-05-12 20:30:26 UTC (rev 8143) @@ -23,6 +23,7 @@ chatstate=None, last_status_time=None, msg_id = None, composing_jep = None): self.jid = jid self.name = name + self.contact_name = '' # nick choosen by contact self.groups = groups self.show = show self.status = status @@ -57,6 +58,8 @@ def get_shown_name(self): if self.name: return self.name + if self.contact_name: + return self.contact_name return self.jid.split('@')[0] def is_hidden_from_roster(self): Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-05-09 20:59:29 UTC (rev 8142) +++ trunk/src/gajim.py 2007-05-12 20:30:26 UTC (rev 8143) @@ -505,7 +505,7 @@ def handle_event_notify(self, account, array): # 'NOTIFY' (account, (jid, status, status message, resource, priority, - # keyID, timestamp)) + # keyID, timestamp, contact_nickname)) # if we're here it means contact changed show statuss = ['offline', 'error', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible'] @@ -517,6 +517,7 @@ status_message = array[2] jid = array[0].split('/')[0] keyID = array[5] + contact_nickname = array[7] attached_keys = gajim.config.get_per('accounts', account, 'attached_gpg_keys').split() if jid in attached_keys: @@ -545,6 +546,10 @@ if contact1: if contact1.show in statuss: old_show = statuss.index(contact1.show) + if contact_nickname is not None and \ + contact1.contact_name != contact_nickname: + contact1.contact_name = contact_nickname + self.roster.draw_contact(jid, account) if old_show == new_show and contact1.status == status_message and \ contact1.priority == priority: # no change return @@ -599,6 +604,7 @@ elif not gajim.block_signed_in_notifications[account]: # We're connected since more that 30 seconds contact1.last_status_time = time.localtime() + contact1.contact_nickname = contact_nickname if gajim.jid_is_transport(jid): # It must be an agent if ji in jid_list:

1 0

[commit-gajim] r8142 - in trunk/src: . common
by asterix＠gajim.org 09 May '07

09 May '07

Author: asterix Date: 2007-05-09 22:59:29 +0200 (Wed, 09 May 2007) New Revision: 8142 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/gajim.py Log: when we're disconnected because of a resource conflict, ask the user another resource. Fixes #3044 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-05-09 20:28:21 UTC (rev 8141) +++ trunk/src/common/connection.py 2007-05-09 20:59:29 UTC (rev 8142) @@ -780,7 +780,7 @@ 'resource') self.connect_and_init(show, msg, signed) - elif show == 'offline' and self.connected: + elif show == 'offline': self.connected = 0 if self.connection: self.on_purpose = True Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-05-09 20:28:21 UTC (rev 8141) +++ trunk/src/common/connection_handlers.py 2007-05-09 20:59:29 UTC (rev 8142) @@ -1957,6 +1957,11 @@ df[i.getName()] = i.getData() self.dispatch('SEARCH_FORM', (jid, df, False)) + def _StreamCB(self, con, obj): + if obj.getTag('conflict'): + # disconnected because of a resource conflict + self.dispatch('RESOURCE_CONFLICT', ()) + def _register_handlers(self, con, con_type): # try to find another way to register handlers in each class # that defines handlers @@ -2031,3 +2036,4 @@ 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') Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-05-09 20:28:21 UTC (rev 8141) +++ trunk/src/gajim.py 2007-05-09 20:59:29 UTC (rev 8142) @@ -546,7 +546,7 @@ if contact1.show in statuss: old_show = statuss.index(contact1.show) if old_show == new_show and contact1.status == status_message and \ - contact1.priority == priority: # no change + contact1.priority == priority: # no change return else: contact1 = gajim.contacts.get_first_contact_from_jid(account, ji) @@ -1743,6 +1743,19 @@ self.instances[account]['search'][data[0]].on_result_arrived(data[1], data[2]) + def handle_event_resource_conflict(self, account, data): + # ('RESOURCE_CONFLICT', account, ()) + # First we go offline, but we don't overwrite status message + self.roster.send_status(account, 'offline', + gajim.connections[account].status) + def on_ok(new_resource): + gajim.config.set_per('accounts', account, 'resource', new_resource) + self.roster.send_status(account, gajim.connections[account].old_show, + gajim.connections[account].status) + dlg = dialogs.InputDialog(_('Resource Conflict'), + _('You are already connected to this account with the same resource. Please type a new one'), input_str = gajim.connections[account].server_resource, + is_modal = False, ok_handler = on_ok) + def read_sleepy(self): '''Check idle status and change that status if needed''' if not self.sleeper.poll(): @@ -2066,6 +2079,7 @@ 'PING_ERROR': self.handle_event_ping_error, 'SEARCH_FORM': self.handle_event_search_form, 'SEARCH_RESULT': self.handle_event_search_result, + 'RESOURCE_CONFLICT': self.handle_event_resource_conflict, } gajim.handlers = self.handlers

1 0

[commit-gajim] r8141 - trunk/src
by asterix＠gajim.org 09 May '07

09 May '07

Author: asterix Date: 2007-05-09 22:28:21 +0200 (Wed, 09 May 2007) New Revision: 8141 Modified: trunk/src/groupchat_control.py Log: fix TB, call correctly ErrorDialog Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-05-09 14:49:48 UTC (rev 8140) +++ trunk/src/groupchat_control.py 2007-05-09 20:28:21 UTC (rev 8141) @@ -1484,7 +1484,7 @@ try: jid = helpers.parse_jid(jid) except: - ErrorDialog(_('Invalid group chat Jabber ID'), + dialogs.ErrorDialog(_('Invalid group chat Jabber ID'), _('The group chat Jabber ID has not allowed characters.')) return else: @@ -2023,4 +2023,4 @@ if widget.get_active(): self.grant_owner(widget, jid) else: - self.revoke_owner(widget, jid) \ No newline at end of file + self.revoke_owner(widget, jid)

1 0

[commit-gajim] r8140 - www-website
by asterix＠gajim.org 09 May '07

09 May '07

Author: asterix Date: 2007-05-09 16:49:48 +0200 (Wed, 09 May 2007) New Revision: 8140 Modified: www-website/dev.php Log: change stefan's nick on website Modified: www-website/dev.php =================================================================== --- www-website/dev.php 2007-05-09 12:37:06 UTC (rev 8139) +++ www-website/dev.php 2007-05-09 14:49:48 UTC (rev 8140) @@ -62,7 +62,7 @@ print (" <li>Jean-Marie Traissard (Jim)</li>"); print (" <li>Junglecow</li>"); print (" <li>Tomasz Melcer (Liorithiel)</li>"); -print (" <li>Stefan Bethge (foe)</li>"); +print (" <li>Stefan Bethge (sb)</li>"); print (" </ul>"); print (" <br/>"); print _(" We also want to thank")." <a href=\"http://trac.gajim.org/browser/trunk/THANKS\">"._("these people")."</a>.\n";

1 0

[commit-gajim] r8139 - trunk/src
by asterix＠gajim.org 09 May '07

09 May '07

Author: asterix Date: 2007-05-09 14:37:06 +0200 (Wed, 09 May 2007) New Revision: 8139 Modified: trunk/src/dialogs.py Log: don't add a line break to the status message when we press ctrl+enter. Fixes #3106 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-05-09 12:29:55 UTC (rev 8138) +++ trunk/src/dialogs.py 2007-05-09 12:37:06 UTC (rev 8139) @@ -380,6 +380,8 @@ event.keyval == gtk.keysyms.KP_Enter: # catch CTRL+ENTER if (event.state & gtk.gdk.CONTROL_MASK): self.window.response(gtk.RESPONSE_OK) + # Stop the event + return True def toggle_sensitiviy_of_save_as_preset(self, widget): btn = self.xml.get_widget('save_as_preset_button')

1 0

[commit-gajim] r8138 - trunk/data/glade
by asterix＠gajim.org 09 May '07

09 May '07

Author: asterix Date: 2007-05-09 14:29:55 +0200 (Wed, 09 May 2007) New Revision: 8138 Modified: trunk/data/glade/vcard_information_window.glade Log: re-make vcard window resizable. fixes #2255 Modified: trunk/data/glade/vcard_information_window.glade =================================================================== --- trunk/data/glade/vcard_information_window.glade 2007-05-08 18:32:44 UTC (rev 8137) +++ trunk/data/glade/vcard_information_window.glade 2007-05-09 12:29:55 UTC (rev 8138) @@ -9,7 +9,7 @@ <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> - <property name="resizable">False</property> + <property name="resizable">True</property> <property name="destroy_with_parent">False</property> <property name="decorated">True</property> <property name="skip_taskbar_hint">False</property>

1 0

[commit-gajim] r8137 - trunk/src
by roidelapluie＠gajim.org 08 May '07

08 May '07

Author: roidelapluie Date: 2007-05-08 20:32:44 +0200 (Tue, 08 May 2007) New Revision: 8137 Modified: trunk/src/gajim.py Log: Fix a bug with status in PM window on status change. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-05-08 15:38:23 UTC (rev 8136) +++ trunk/src/gajim.py 2007-05-08 18:32:44 UTC (rev 8137) @@ -1052,6 +1052,22 @@ show = array[1] status = array[2] + # Get the window and control for the updated status, this may be a + # PrivateChatControl + control = self.msg_win_mgr.get_control(room_jid, account) + if not control and \ + self.minimized_controls.has_key(account) and \ + room_jid in self.minimized_controls[account]: + control = self.minimized_controls[account][room_jid] + + if control and control.type_id != message_control.TYPE_GC: + return + if control: + control.chg_contact_status(nick, show, status, array[4], array[5], + array[6], array[7], array[8], array[9], array[10]) + if control and not control.parent_win: + gajim.interface.roster.draw_contact(room_jid, account) + ctrl = self.msg_win_mgr.get_control(fjid, account) # print status in chat window and update status/GPG image @@ -1059,7 +1075,6 @@ contact = ctrl.contact contact.show = show contact.status = status - ctrl.update_ui() uf_show = helpers.get_uf_show(show) if status: ctrl.print_conversation(_('%s is now %s (%s)') % (nick, uf_show, @@ -1067,28 +1082,11 @@ else: ctrl.print_conversation(_('%s is now %s') % (nick, uf_show), 'status') - if ctrl.parent_win: - ctrl.parent_win.redraw_tab(ctrl) + ctrl.parent_win.redraw_tab(ctrl) + ctrl.update_ui() if self.remote_ctrl: self.remote_ctrl.raise_signal('GCPresence', (account, array)) - # Get the window and control for the updated status, this may be a - # PrivateChatControl - control = self.msg_win_mgr.get_control(room_jid, account) - if not control and \ - self.minimized_controls.has_key(account) and \ - room_jid in self.minimized_controls[account]: - control = self.minimized_controls[account][room_jid] - - if not control: - return - if control.type_id != message_control.TYPE_GC: - return - control.chg_contact_status(nick, show, status, array[4], array[5], - array[6], array[7], array[8], array[9], array[10]) - if not control.parent_win: - gajim.interface.roster.draw_contact(room_jid, account) - def handle_event_gc_msg(self, account, array): # ('GC_MSG', account, (jid, msg, time, has_timestamp, htmlmsg)) jids = array[0].split('/', 1)

1 0

[commit-gajim] r8136 - trunk/src
by roidelapluie＠gajim.org 08 May '07

08 May '07

Author: roidelapluie Date: 2007-05-08 17:38:23 +0200 (Tue, 08 May 2007) New Revision: 8136 Modified: trunk/src/chat_control.py trunk/src/gajim.py Log: Fix a bug with notifs in systray. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-05-08 12:07:11 UTC (rev 8135) +++ trunk/src/chat_control.py 2007-05-08 15:38:23 UTC (rev 8136) @@ -571,14 +571,18 @@ gc_message = False if self.type_id == message_control.TYPE_GC: gc_message = True - if not gc_message or \ - (gc_message and (other_tags_for_text == ['marked'] or \ + + if ((self.parent_win and (not self.parent_win.get_active_jid() or \ + full_jid != self.parent_win.get_active_jid() or \ + not self.parent_win.is_active() or not end)) or \ + ((gc_message and (other_tags_for_text == ['marked'] or \ gajim.config.get('notify_on_all_muc_messages'))) or \ (gc_message and \ gajim.interface.minimized_controls.has_key(self.account) and \ - jid in gajim.interface.minimized_controls[self.account]): - # we want to have save this message in events list - # other_tags_for_text == ['marked'] --> highlighted gc message + jid in gajim.interface.minimized_controls[self.account]))) and \ + kind in ('incoming', 'incoming_queue'): + # we want to have save this message in events list + # other_tags_for_text == ['marked'] --> highlighted gc message type_ = 'printed_' + self.type_id event = 'message_received' if gc_message: Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-05-08 12:07:11 UTC (rev 8135) +++ trunk/src/gajim.py 2007-05-08 15:38:23 UTC (rev 8136) @@ -1080,11 +1080,12 @@ room_jid in self.minimized_controls[account]: control = self.minimized_controls[account][room_jid] - if control and control.type_id != message_control.TYPE_GC: + if not control: return - if control: - control.chg_contact_status(nick, show, status, array[4], array[5], - array[6], array[7], array[8], array[9], array[10]) + if control.type_id != message_control.TYPE_GC: + return + control.chg_contact_status(nick, show, status, array[4], array[5], + array[6], array[7], array[8], array[9], array[10]) if not control.parent_win: gajim.interface.roster.draw_contact(room_jid, account)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2007