Commits September 2009

commits@gajim.org

5 participants
120 discussions

gajim: merge bug 4212 branch
by Yann Leboulanger 27 Sep '09

27 Sep '09

changeset 67c1a9751347 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=67c1a9751347 description: merge bug 4212 branch diffstat: src/common/connection.py | 5 ++ src/common/xmpp/roster_nb.py | 10 +++++ src/common/zeroconf/connection_zeroconf.py | 5 ++ src/common/zeroconf/roster_zeroconf.py | 4 ++ src/roster_window.py | 63 +++++++++++++++++++++++-------- 5 files changed, 70 insertions(+), 17 deletions(-) diffs (144 lines): diff -r 2c866750d7c8 -r 67c1a9751347 src/common/connection.py --- a/src/common/connection.py Sun Sep 27 12:32:57 2009 +0300 +++ b/src/common/connection.py Sun Sep 27 11:52:51 2009 +0200 @@ -1487,6 +1487,11 @@ self.connection.getRoster().setItem(jid = jid, name = name, groups = groups) + def update_contacts(self, contacts): + '''update multiple roster items on jabber server''' + if self.connection: + self.connection.getRoster().setItemMulti(contacts) + def send_new_account_infos(self, form, is_form): if is_form: # Get username and password and put them in new_account_info diff -r 2c866750d7c8 -r 67c1a9751347 src/common/xmpp/roster_nb.py --- a/src/common/xmpp/roster_nb.py Sun Sep 27 12:32:57 2009 +0300 +++ b/src/common/xmpp/roster_nb.py Sun Sep 27 11:52:51 2009 +0200 @@ -174,6 +174,16 @@ item=query.setTag('item',attrs) for group in groups: item.addChild(node=Node('group',payload=[group])) self._owner.send(iq) + def setItemMulti(self,items): + ''' Renames multiple contacts and sets their group lists.''' + iq=Iq('set',NS_ROSTER) + query=iq.getTag('query') + for i in items: + attrs={'jid':i['jid']} + if i['name']: attrs['name']=i['name'] + item=query.setTag('item',attrs) + for group in i['groups']: item.addChild(node=Node('group',payload=[group])) + self._owner.send(iq) def getItems(self): ''' Return list of all [bare] JIDs that the roster is currently tracks.''' return self._data.keys() diff -r 2c866750d7c8 -r 67c1a9751347 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Sun Sep 27 12:32:57 2009 +0300 +++ b/src/common/zeroconf/connection_zeroconf.py Sun Sep 27 11:52:51 2009 +0200 @@ -526,6 +526,11 @@ self.connection.getRoster().setItem(jid = jid, name = name, groups = groups) + def update_contacts(self, contacts): + '''update multiple roster items''' + if self.connection: + self.connection.getRoster().setItemMulti(contacts) + def new_account(self, name, config, sync = False): gajim.log.debug('This should not happen (new_account)') diff -r 2c866750d7c8 -r 67c1a9751347 src/common/zeroconf/roster_zeroconf.py --- a/src/common/zeroconf/roster_zeroconf.py Sun Sep 27 12:32:57 2009 +0300 +++ b/src/common/zeroconf/roster_zeroconf.py Sun Sep 27 11:52:51 2009 +0200 @@ -88,6 +88,10 @@ self._data[jid]['status'] = status self._data[jid]['show'] = status + def setItemMulti(self, items): + for i in items: + self.setItem(jid=i['jid'], name=i['name'], groups=i['groups']) + def delItem(self, jid): #print 'roster_zeroconf.py: delItem %s' % jid if jid in self._data: diff -r 2c866750d7c8 -r 67c1a9751347 src/roster_window.py --- a/src/roster_window.py Sun Sep 27 12:32:57 2009 +0300 +++ b/src/roster_window.py Sun Sep 27 11:52:51 2009 +0200 @@ -848,6 +848,51 @@ '''Remove transport from roster and redraw account and group.''' self.remove_contact(jid, account, force=True, backend=True) return True + + def rename_group(self, old_name, new_name): + """ + rename a roster group + """ + if old_name == new_name: + return + + # Groups may not change name from or to a special groups + for g in helpers.special_groups: + if g in (new_name, old_name): + return + + # update all contacts in the given group + if self.regroup: + accounts = gajim.connections.keys() + else: + accounts = [account,] + + for acc in accounts: + changed_contacts = [] + for jid in gajim.contacts.get_jid_list(acc): + contact = gajim.contacts.get_first_contact_from_jid(acc, jid) + if old_name not in contact.groups: + continue + + self.remove_contact(jid, acc, force=True) + + contact.groups.remove(old_name) + if new_name not in contact.groups: + contact.groups.append(new_name) + + changed_contacts.append({'jid':jid, 'name':contact.name, + 'groups':contact.groups}) + + gajim.connections[acc].update_contacts(changed_contacts) + + for c in changed_contacts: + self.add_contact(c['jid'], acc) + + self._adjust_group_expand_collapse_state(new_name, acc) + + self.draw_group(old_name, acc) + self.draw_group(new_name, acc) + def add_contact_to_groups(self, jid, account, groups, update=True): '''Add contact to given groups and redraw them. @@ -2711,23 +2756,7 @@ win.show_title() elif row_type == 'group': # in C_JID column, we hold the group name (which is not escaped) - if old_text == new_text: - return - # Groups may not change name from or to a special groups - for g in helpers.special_groups: - if g in (new_text, old_text): - return - # update all contacts in the given group - if self.regroup: - accounts = gajim.connections.keys() - else: - accounts = [account,] - for acc in accounts: - for jid in gajim.contacts.get_jid_list(acc): - contact = gajim.contacts.get_first_contact_from_jid(acc, jid) - if old_text in contact.groups: - self.add_contact_to_groups(jid, acc, [new_text,]) - self.remove_contact_from_groups(jid, acc, [old_text,]) + self.rename_group(old_text, new_text) def on_canceled(): if 'rename' in gajim.interface.instances:

1 0

gajim: Improve group renaming efficiency. Fixes #4212
by Benjamin Richter 27 Sep '09

27 Sep '09

changeset 4d5c6be751db in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4d5c6be751db description: Improve group renaming efficiency. Fixes #4212 diffstat: src/common/connection.py | 5 ++ src/common/xmpp/roster_nb.py | 10 +++++ src/common/zeroconf/connection_zeroconf.py | 5 ++ src/common/zeroconf/roster_zeroconf.py | 4 ++ src/roster_window.py | 63 +++++++++++++++++++++++-------- 5 files changed, 70 insertions(+), 17 deletions(-) diffs (144 lines): diff -r 6eecfdb97a5a -r 4d5c6be751db src/common/connection.py --- a/src/common/connection.py Sat Sep 26 11:55:49 2009 +0200 +++ b/src/common/connection.py Sat Sep 26 20:23:59 2009 +0200 @@ -1487,6 +1487,11 @@ self.connection.getRoster().setItem(jid = jid, name = name, groups = groups) + def update_contacts(self, contacts): + '''update multiple roster items on jabber server''' + if self.connection: + self.connection.getRoster().setItemMulti(contacts) + def send_new_account_infos(self, form, is_form): if is_form: # Get username and password and put them in new_account_info diff -r 6eecfdb97a5a -r 4d5c6be751db src/common/xmpp/roster_nb.py --- a/src/common/xmpp/roster_nb.py Sat Sep 26 11:55:49 2009 +0200 +++ b/src/common/xmpp/roster_nb.py Sat Sep 26 20:23:59 2009 +0200 @@ -174,6 +174,16 @@ item=query.setTag('item',attrs) for group in groups: item.addChild(node=Node('group',payload=[group])) self._owner.send(iq) + def setItemMulti(self,items): + ''' Renames multiple contacts and sets their group lists.''' + iq=Iq('set',NS_ROSTER) + query=iq.getTag('query') + for i in items: + attrs={'jid':i['jid']} + if i['name']: attrs['name']=i['name'] + item=query.setTag('item',attrs) + for group in i['groups']: item.addChild(node=Node('group',payload=[group])) + self._owner.send(iq) def getItems(self): ''' Return list of all [bare] JIDs that the roster is currently tracks.''' return self._data.keys() diff -r 6eecfdb97a5a -r 4d5c6be751db src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Sat Sep 26 11:55:49 2009 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Sat Sep 26 20:23:59 2009 +0200 @@ -526,6 +526,11 @@ self.connection.getRoster().setItem(jid = jid, name = name, groups = groups) + def update_contacts(self, contacts): + '''update multiple roster items''' + if self.connection: + self.connection.getRoster().setItemMulti(contacts) + def new_account(self, name, config, sync = False): gajim.log.debug('This should not happen (new_account)') diff -r 6eecfdb97a5a -r 4d5c6be751db src/common/zeroconf/roster_zeroconf.py --- a/src/common/zeroconf/roster_zeroconf.py Sat Sep 26 11:55:49 2009 +0200 +++ b/src/common/zeroconf/roster_zeroconf.py Sat Sep 26 20:23:59 2009 +0200 @@ -88,6 +88,10 @@ self._data[jid]['status'] = status self._data[jid]['show'] = status + def setItemMulti(self, items): + for i in items: + self.setItem(jid=i['jid'], name=i['name'], groups=i['groups']) + def delItem(self, jid): #print 'roster_zeroconf.py: delItem %s' % jid if jid in self._data: diff -r 6eecfdb97a5a -r 4d5c6be751db src/roster_window.py --- a/src/roster_window.py Sat Sep 26 11:55:49 2009 +0200 +++ b/src/roster_window.py Sat Sep 26 20:23:59 2009 +0200 @@ -848,6 +848,51 @@ '''Remove transport from roster and redraw account and group.''' self.remove_contact(jid, account, force=True, backend=True) return True + + def rename_group(self, old_name, new_name): + """ + rename a roster group + """ + if old_name == new_name: + return + + # Groups may not change name from or to a special groups + for g in helpers.special_groups: + if g in (new_name, old_name): + return + + # update all contacts in the given group + if self.regroup: + accounts = gajim.connections.keys() + else: + accounts = [account,] + + for acc in accounts: + changed_contacts = [] + for jid in gajim.contacts.get_jid_list(acc): + contact = gajim.contacts.get_first_contact_from_jid(acc, jid) + if old_name not in contact.groups: + continue + + self.remove_contact(jid, acc, force=True) + + contact.groups.remove(old_name) + if new_name not in contact.groups: + contact.groups.append(new_name) + + changed_contacts.append({'jid':jid, 'name':contact.name, + 'groups':contact.groups}) + + gajim.connections[acc].update_contacts(changed_contacts) + + for c in changed_contacts: + self.add_contact(c['jid'], acc) + + self._adjust_group_expand_collapse_state(new_name, acc) + + self.draw_group(old_name, acc) + self.draw_group(new_name, acc) + def add_contact_to_groups(self, jid, account, groups, update=True): '''Add contact to given groups and redraw them. @@ -2711,23 +2756,7 @@ win.show_title() elif row_type == 'group': # in C_JID column, we hold the group name (which is not escaped) - if old_text == new_text: - return - # Groups may not change name from or to a special groups - for g in helpers.special_groups: - if g in (new_text, old_text): - return - # update all contacts in the given group - if self.regroup: - accounts = gajim.connections.keys() - else: - accounts = [account,] - for acc in accounts: - for jid in gajim.contacts.get_jid_list(acc): - contact = gajim.contacts.get_first_contact_from_jid(acc, jid) - if old_text in contact.groups: - self.add_contact_to_groups(jid, acc, [new_text,]) - self.remove_contact_from_groups(jid, acc, [old_text,]) + self.rename_group(old_text, new_text) def on_canceled(): if 'rename' in gajim.interface.instances:

1 0

gajim: Fixed the duplication of input history
by red-agent 27 Sep '09

27 Sep '09

changeset 2c866750d7c8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2c866750d7c8 description: Fixed the duplication of input history diffstat: src/commands/framework.py | 12 ++++++------ src/commands/middleware.py | 6 ++---- 2 files changed, 8 insertions(+), 10 deletions(-) diffs (53 lines): diff -r 2b7b183c30a2 -r 2c866750d7c8 src/commands/framework.py --- a/src/commands/framework.py Sat Sep 26 13:16:48 2009 +0200 +++ b/src/commands/framework.py Sun Sep 27 12:32:57 2009 +0300 @@ -642,21 +642,21 @@ if not text.startswith(self.COMMAND_PREFIX): return False - text = text[len(self.COMMAND_PREFIX):] - text = text.strip() + body = text[len(self.COMMAND_PREFIX):] + body = body.strip() - parts = text.split(' ', 1) + parts = body.split(' ', 1) name, arguments = parts if len(parts) > 1 else (parts[0], None) - flag = self.looks_like_command(text, name, arguments) + flag = self.looks_like_command(body, name, arguments) if flag is not None: return flag - self.execute_command(name, arguments) + self.execute_command(text, name, arguments) return True - def execute_command(self, name, arguments): + def execute_command(self, text, name, arguments): command = self.retrieve_command(name) args, opts = self.parse_command_arguments(arguments) if arguments else ([], []) diff -r 2b7b183c30a2 -r 2c866750d7c8 src/commands/middleware.py --- a/src/commands/middleware.py Sat Sep 26 13:16:48 2009 +0200 +++ b/src/commands/middleware.py Sun Sep 27 12:32:57 2009 +0300 @@ -31,16 +31,14 @@ Also provides some few basic utilities for the same purpose. """ - def process_as_command(self, text): + def execute_command(self, text, name, arguments): try: - return super(ChatMiddleware, self).process_as_command(text) + super(ChatMiddleware, self).execute_command(text, name, arguments) except CommandError, exception: self.echo("%s: %s" %(exception.name, exception.message), 'error') - return True except Exception: self.echo("An error occured while trying to execute the command", 'error') print_exc() - return True finally: self.add_history(text) self.clear_input()

1 0

gajim: Don't send audio/video data before session acceptance.
by Thibaut GIRKA 27 Sep '09

27 Sep '09

changeset b986fe5b2cf7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b986fe5b2cf7 description: Don't send audio/video data before session acceptance. diffstat: src/common/jingle.py | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diffs (45 lines): diff -r e36c7ab156d6 -r b986fe5b2cf7 src/common/jingle.py --- a/src/common/jingle.py Sat Sep 26 21:55:43 2009 +0200 +++ b/src/common/jingle.py Sat Sep 26 23:07:09 2009 +0200 @@ -816,10 +816,14 @@ self.candidates_ready = False # True when local candidates are prepared - self.callbacks['content-accept'] += [self.__getRemoteCodecsCB] + self.callbacks['session-initiate'] += [self.__getRemoteCodecsCB] self.callbacks['content-add'] += [self.__getRemoteCodecsCB] - self.callbacks['session-accept'] += [self.__getRemoteCodecsCB] - self.callbacks['session-initiate'] += [self.__getRemoteCodecsCB] + self.callbacks['content-accept'] += [self.__getRemoteCodecsCB, + self.__contentAcceptCB] + self.callbacks['session-accept'] += [self.__getRemoteCodecsCB, + self.__contentAcceptCB] + self.callbacks['session-accept-sent'] += [self.__contentAcceptCB] + self.callbacks['content-accept-sent'] += [self.__contentAcceptCB] self.callbacks['session-terminate'] += [self.__stop] self.callbacks['session-terminate-sent'] += [self.__stop] @@ -888,10 +892,6 @@ reason = xmpp.Node('reason') reason.setTag('failed-transport') self.session._session_terminate(reason) - elif state == farsight.STREAM_STATE_READY: - #TODO: farsight.DIRECTION_BOTH only if senders='both' - self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH) - self.session.content_negociated(self.media) elif name == 'farsight-error': print 'Farsight error #%d!' % message.structure['error-no'] print 'Message: %s' % message.structure['error-msg'] @@ -899,6 +899,12 @@ else: print name + def __contentAcceptCB(self, stanza, content, error, action): + if self.accepted: + #TODO: farsight.DIRECTION_BOTH only if senders='both' + self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH) + self.session.content_negociated(self.media) + def __getRemoteCodecsCB(self, stanza, content, error, action): ''' Get peer codecs from what we get from peer. ''' if self.got_codecs:

1 0

gajim: Fix somes issues with content-add/content-accept/session-...
by Thibaut GIRKA 27 Sep '09

27 Sep '09

changeset e36c7ab156d6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e36c7ab156d6 description: Fix somes issues with content-add/content-accept/session-accept, and other things. diffstat: src/common/jingle.py | 37 +++++++++++++++++++++++-------------- src/dialogs.py | 2 +- 2 files changed, 24 insertions(+), 15 deletions(-) diffs (122 lines): diff -r a660888d0a98 -r e36c7ab156d6 src/common/jingle.py --- a/src/common/jingle.py Sat Sep 26 14:14:58 2009 +0200 +++ b/src/common/jingle.py Sat Sep 26 21:55:43 2009 +0200 @@ -17,10 +17,7 @@ # - 'senders' attribute of 'content' element # - security preconditions # * actions: -# - content-accept: see content-add -# - content-reject: sending it ; receiving is ok -# - content-add: handling ; sending is ok -# - content-modify: both +# - content-modify # - description-info, session-info # - security-info # - transport-accept, transport-reject @@ -223,7 +220,20 @@ pass def on_session_state_changed(self, content=None): - if self.state == JingleStates.active and self.accepted: + if self.state == JingleStates.ended: + # Session not yet started, only one action possible: session-initiate + if self.is_ready() and self.weinitiate: + self.__session_initiate() + elif self.state == JingleStates.pending: + # We can either send a session-accept or a content-add + if self.is_ready() and not self.weinitiate: + self.__session_accept() + elif content and (content.creator == 'initiator') == self.weinitiate: + self.__content_add(content) + elif content and self.weinitiate: + self.__content_accept(content) + elif self.state == JingleStates.active: + # We can either send a content-add or a content-accept if not content: return if (content.creator == 'initiator') == self.weinitiate: @@ -232,11 +242,6 @@ else: # The other side created this content, we accept it. self.__content_accept(content) - elif self.is_ready(): - if not self.weinitiate and self.state == JingleStates.pending: - self.__session_accept() - elif self.weinitiate and self.state == JingleStates.ended: - self.__session_initiate() def is_ready(self): ''' Returns True when all codecs and candidates are ready @@ -388,7 +393,6 @@ name = content['name']#TODO... def __contentAddCB(self, stanza, jingle, error, action): - #TODO: Needs to be rewritten if self.state == JingleStates.ended: raise OutOfOrder @@ -476,7 +480,7 @@ ''' Internal methods. ''' def __parse_contents(self, jingle): - #TODO: WIP + #TODO: Needs some reworking contents = [] contents_rejected = [] contents_ok = False @@ -627,6 +631,9 @@ stanza, jingle = self.__make_jingle('content-reject') self.__append_content(jingle, content) self.connection.connection.send(stanza) + #TODO: this will fail if content is not an RTP content + self.connection.dispatch('JINGLE_DISCONNECTED', + (self.peerjid, self.sid, content.media, 'rejected')) def __content_modify(self): assert self.state != JingleStates.ended @@ -734,6 +741,7 @@ # Instead, it should be etablished after session-accept! if len(candidates) > 0: self.p2pstream.set_remote_candidates(candidates) + print self.media, self.creator, self.name, candidates def __content(self, payload=[]): ''' Build a XML content-wrapper for our data. ''' @@ -1002,6 +1010,7 @@ JingleRTPContent.setup_stream(self) # the local parts src_vid = gst.element_factory_make('videotestsrc') + src_vid.set_property('is-live', True) videoscale = gst.element_factory_make('videoscale') caps = gst.element_factory_make('capsfilter') caps.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=320, height=240')) @@ -1072,7 +1081,7 @@ def startVoIP(self, jid): if self.get_jingle_session(jid, media='audio'): - return + return self.get_jingle_session(jid, media='audio').sid jingle = self.get_jingle_session(jid, media='video') if jingle: jingle.add_content('voice', JingleVoIP(jingle)) @@ -1085,7 +1094,7 @@ def startVideoIP(self, jid): if self.get_jingle_session(jid, media='video'): - return + return self.get_jingle_session(jid, media='video').sid jingle = self.get_jingle_session(jid, media='audio') if jingle: jingle.add_content('video', JingleVideo(jingle)) diff -r a660888d0a98 -r e36c7ab156d6 src/dialogs.py --- a/src/dialogs.py Sat Sep 26 14:14:58 2009 +0200 +++ b/src/dialogs.py Sat Sep 26 21:55:43 2009 +0200 @@ -4490,7 +4490,7 @@ def add_contents(self, content_types): for type_ in content_types: if type_ not in self.content_types: - self.content_types.append(type_) + self.content_types.add(type_) self.set_secondary_text() def on_voip_call_received_messagedialog_destroy(self, dialog):

1 0

gajim: Merge changes from default branch into osx_newbuildsys.
by Jonathan Schleifer 26 Sep '09

26 Sep '09

changeset c4d7a553ab28 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c4d7a553ab28 description: Merge changes from default branch into osx_newbuildsys. diffstat: configure.ac | 2 +- data/glade/join_groupchat_window.glade | 620 +- data/glade/service_discovery_window.glade | 45 +- data/glade/zeroconf_contact_context_menu.glade | 89 +- gajim.nsi | 5 + po/be.po | 4862 +++++++++++++----------- po/be(a)latin.po | 4749 +++++++++++++----------- po/bg.po | 4651 +++++++++++++---------- po/br.po | 4768 +++++++++++++----------- po/cs.po | 2828 +++++++------ po/da.po | 4766 +++++++++++++----------- po/de.po | 3434 +++++++++-------- po/el.po | 4761 +++++++++++++----------- po/en_GB.po | 4741 +++++++++++++----------- po/eo.po | 4866 +++++++++++++----------- po/es.po | 4367 ++++++++++++---------- po/eu.po | 4864 +++++++++++++----------- po/fr.po | 4575 ++++++++++++---------- po/gl.po | 4872 +++++++++++++----------- po/hr.po | 4593 ++++++++++++---------- po/it.po | 4826 +++++++++++++----------- po/lt.po | 4781 +++++++++++++----------- po/nb.po | 4561 ++++++++++++---------- po/nl.po | 4770 +++++++++++++----------- po/no.po | 4561 ++++++++++++---------- po/pl.po | 2803 +++++++------ po/pt.po | 4774 +++++++++++++----------- po/pt_BR.po | 3719 ++++++++++--------- po/ru.po | 2137 +++++----- po/sk.po | 3461 +++++++++-------- po/sr.po | 4659 +++++++++++++---------- po/sr(a)Latn.po | 4663 +++++++++++++---------- po/sv.po | 3477 +++++++++-------- po/uk.po | 2145 +++++----- po/zh_CN.po | 4757 +++++++++++++----------- src/advanced.py | 6 +- src/chat_control.py | 258 +- src/commands/__init__.py | 20 + src/commands/custom.py | 88 + src/commands/framework.py | 764 +++ src/commands/implementation.py | 262 + src/commands/middleware.py | 105 + src/common/check_paths.py | 3 +- src/common/config.py | 8 +- src/common/connection.py | 32 +- src/common/connection_handlers.py | 38 +- src/common/dbus_support.py | 16 +- src/common/defs.py | 2 +- src/common/fuzzyclock.py | 117 +- src/common/gajim.py | 2 +- src/common/helpers.py | 5 + src/common/i18n.py | 18 + src/common/latex.py | 40 +- src/common/logger.py | 19 +- src/common/optparser.py | 36 +- src/common/pubsub.py | 6 +- src/common/stanza_session.py | 9 +- src/common/zeroconf/client_zeroconf.py | 38 + src/common/zeroconf/connection_handlers_zeroconf.py | 41 +- src/config.py | 44 +- src/conversation_textview.py | 60 +- src/dataforms_widget.py | 32 +- src/dialogs.py | 100 +- src/disco.py | 51 +- src/gajim-remote.py | 10 + src/gajim.py | 197 +- src/groupchat_control.py | 495 +- src/gtkgui_helpers.py | 20 +- src/history_window.py | 7 +- src/htmltextview.py | 206 +- src/message_window.py | 9 + src/music_track_listener.py | 20 - src/notify.py | 2 +- src/remote_control.py | 30 +- src/roster_window.py | 177 +- src/session.py | 6 +- 76 files changed, 71795 insertions(+), 60156 deletions(-) diffs (truncated from 298113 to 300 lines): diff -r ea4a16692761 -r c4d7a553ab28 configure.ac --- a/configure.ac Wed Aug 19 16:53:11 2009 +0200 +++ b/configure.ac Sat Sep 26 21:14:45 2009 +0200 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.12.3.1-dev],[http://trac.gajim.org/],[gajim]) + [0.12.5.2-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_SRCDIR(src) diff -r ea4a16692761 -r c4d7a553ab28 data/glade/join_groupchat_window.glade --- a/data/glade/join_groupchat_window.glade Wed Aug 19 16:53:11 2009 +0200 +++ b/data/glade/join_groupchat_window.glade Sat Sep 26 21:14:45 2009 +0200 @@ -1,365 +1,259 @@ -<?xml version="1.0" standalone="no"?>  -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0"?> <glade-interface> - -<widget class="GtkWindow" id="join_groupchat_window"> - <property name="border_width">6</property> - <property name="title" translatable="yes">Join Group Chat</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">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> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <signal name="destroy" handler="on_join_groupchat_window_destroy" last_modification_time="Wed, 02 Mar 2005 12:20:14 GMT"/> - <signal name="key_press_event" handler="on_join_groupchat_window_key_press_event" last_modification_time="Tue, 05 Apr 2005 13:13:40 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox28"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkTable" id="table15"> - <property name="visible">True</property> - <property name="n_rows">5</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - - <child> - <widget class="GtkEntry" id="room_jid_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">True</property> - <signal name="changed" handler="on_required_entry_changed" last_modification_time="Sat, 14 Jan 2006 21:51:39 GMT"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="nickname_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">True</property> - <signal name="changed" handler="on_required_entry_changed" last_modification_time="Sat, 14 Jan 2006 21:51:24 GMT"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label143"> - <property name="visible">True</property> - <property name="label" translatable="yes">Room:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label142"> - <property name="visible">True</property> - <property name="label" translatable="yes">Nickname:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label225"> - <property name="visible">True</property> - <property name="label" translatable="yes">Recently:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="recently_combobox"> - <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - <signal name="changed" handler="on_recently_combobox_changed" last_modification_time="Wed, 06 Apr 2005 22:25:35 GMT"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label145"> - <property name="visible">True</property> - <property name="label" translatable="yes">Password:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="password_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">False</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="auto_join_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Join this room automatically when I connect</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox12"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkButton" id="cancel_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Fri, 04 Mar 2005 13:40:16 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="join_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property>

1 0

gajim: A little fix with content acceptance ; modified a bit JIN...
by Thibaut GIRKA 26 Sep '09

26 Sep '09

changeset a660888d0a98 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a660888d0a98 description: A little fix with content acceptance ; modified a bit JINGLE_DISCONNECTED diffstat: src/common/jingle.py | 20 ++++++++++++++------ src/gajim.py | 8 +++++--- 2 files changed, 19 insertions(+), 9 deletions(-) diffs (89 lines): diff -r a39c323da8bd -r a660888d0a98 src/common/jingle.py --- a/src/common/jingle.py Sat Sep 26 12:31:56 2009 +0200 +++ b/src/common/jingle.py Sat Sep 26 14:14:58 2009 +0200 @@ -364,7 +364,11 @@ creator = content['creator'] name = content['name'] if (creator, name) in self.contents: - self.contents[(creator, name)].destroy() + content = self.contents[(creator, name)] + #TODO: this will fail if content is not an RTP content + self.connection.dispatch('JINGLE_DISCONNECTED', + (self.peerjid, self.sid, content.media, 'removed')) + content.destroy() if len(self.contents) == 0: reason = xmpp.Node('reason') reason.setTag('success') @@ -399,7 +403,7 @@ self.__content_reject(content) self.contents[(content.creator, content.name)].destroy() - self.connection.dispatch('JINGLE_INCOMING', (self.initiator, self.sid, + self.connection.dispatch('JINGLE_INCOMING', (self.peerjid, self.sid, contents)) def __sessionInitiateCB(self, stanza, jingle, error, action): @@ -442,7 +446,7 @@ self.state = JingleStates.pending # Send event about starting a session - self.connection.dispatch('JINGLE_INCOMING', (self.initiator, self.sid, + self.connection.dispatch('JINGLE_INCOMING', (self.peerjid, self.sid, contents)) def __broadcastCB(self, stanza, jingle, error, action): @@ -462,7 +466,8 @@ text = '%s (%s)' % (reason, text) else: text = reason#TODO - self.connection.dispatch('JINGLE_DISCONNECTED', (self.peerjid, self.sid, text)) + self.connection.dispatch('JINGLE_DISCONNECTED', + (self.peerjid, self.sid, None, text)) def __broadcastAllCB(self, stanza, jingle, error, action): ''' Broadcast the stanza to all content handlers. ''' @@ -598,7 +603,8 @@ else: text = reason self.connection.delete_jingle(self) - self.connection.dispatch('JINGLE_DISCONNECTED', (self.peerjid, self.sid, text)) + self.connection.dispatch('JINGLE_DISCONNECTED', + (self.peerjid, self.sid, None, text)) def __content_add(self, content): #TODO: test @@ -630,7 +636,9 @@ stanza, jingle = self.__make_jingle('content-remove') self.__append_content(jingle, content) self.connection.connection.send(stanza) - #TODO: dispatch something? + #TODO: this will fail if content is not an RTP content + self.connection.dispatch('JINGLE_DISCONNECTED', + (self.peerjid, self.sid, content.media, 'removed')) def content_negociated(self, media): self.connection.dispatch('JINGLE_CONNECTED', (self.peerjid, self.sid, diff -r a39c323da8bd -r a660888d0a98 src/gajim.py --- a/src/gajim.py Sat Sep 26 12:31:56 2009 +0200 +++ b/src/gajim.py Sat Sep 26 14:14:58 2009 +0200 @@ -2164,15 +2164,17 @@ def handle_event_jingle_disconnected(self, account, data): # ('JINGLE_DISCONNECTED', account, (peerjid, sid, reason)) - peerjid, sid, reason = data + peerjid, sid, media, reason = data jid = gajim.get_jid_without_resource(peerjid) resource = gajim.get_resource_from_jid(peerjid) ctrl = self.msg_win_mgr.get_control(peerjid, account) if not ctrl: ctrl = self.msg_win_mgr.get_control(jid, account) if ctrl: - ctrl.set_audio_state('stop', sid=sid, reason=reason) - ctrl.set_video_state('stop', sid=sid, reason=reason) + if media in ('audio', None): + ctrl.set_audio_state('stop', sid=sid, reason=reason) + if media in ('video', None): + ctrl.set_video_state('stop', sid=sid, reason=reason) dialog = dialogs.VoIPCallReceivedDialog.get_dialog(peerjid, sid) if dialog: dialog.dialog.destroy()

1 0

gajim: fix indentation
by Yann Leboulanger 26 Sep '09

26 Sep '09

changeset 2b7b183c30a2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b7b183c30a2 description: fix indentation diffstat: src/common/i18n.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 091ee996b8c9 -r 2b7b183c30a2 src/common/i18n.py --- a/src/common/i18n.py Sat Sep 26 13:44:08 2009 +0300 +++ b/src/common/i18n.py Sat Sep 26 13:16:48 2009 +0200 @@ -38,9 +38,9 @@ for char in text: bidi = unicodedata.bidirectional(char) if bidi == 'L': - return u'\u200E' + return u'\u200E' elif bidi == 'AL' or bidi == 'R': - return u'\u200F' + return u'\u200F' return u'\u200E'

1 0

gajim: Tiny code style corrections
by red-agent 26 Sep '09

26 Sep '09

changeset 091ee996b8c9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=091ee996b8c9 description: Tiny code style corrections diffstat: src/common/i18n.py | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diffs (28 lines): diff -r 6eecfdb97a5a -r 091ee996b8c9 src/common/i18n.py --- a/src/common/i18n.py Sat Sep 26 11:55:49 2009 +0200 +++ b/src/common/i18n.py Sat Sep 26 13:44:08 2009 +0300 @@ -29,14 +29,18 @@ import unicodedata def paragraph_direction_mark(text): - """Determine paragraph writing direction according to + """ + Determine paragraph writing direction according to http://www.unicode.org/reports/tr9/#The_Paragraph_Level - Returns either Unicode LTR mark or RTL mark.""" - for c in text: - bidi = unicodedata.bidirectional(c) - if bidi == 'L': return u'\u200E' - elif bidi == 'AL' or bidi == 'R': return u'\u200F' + Returns either Unicode LTR mark or RTL mark. + """ + for char in text: + bidi = unicodedata.bidirectional(char) + if bidi == 'L': + return u'\u200E' + elif bidi == 'AL' or bidi == 'R': + return u'\u200F' return u'\u200E'

1 0

gajim: Fix content reject
by Thibaut GIRKA 26 Sep '09

26 Sep '09

changeset a39c323da8bd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a39c323da8bd description: Fix content reject diffstat: src/common/jingle.py | 2 ++ src/dialogs.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletions(-) diffs (28 lines): diff -r 3c7b8691b0f9 -r a39c323da8bd src/common/jingle.py --- a/src/common/jingle.py Sat Sep 26 12:25:36 2009 +0200 +++ b/src/common/jingle.py Sat Sep 26 12:31:56 2009 +0200 @@ -157,6 +157,8 @@ def reject_content(self, media): content = self.get_content(media) if content: + if self.state == JingleStates.active: + self.__content_reject(content) content.destroy() self.on_session_state_changed() diff -r 3c7b8691b0f9 -r a39c323da8bd src/dialogs.py --- a/src/dialogs.py Sat Sep 26 12:25:36 2009 +0200 +++ b/src/dialogs.py Sat Sep 26 12:31:56 2009 +0200 @@ -4530,7 +4530,11 @@ if session.get_content('video'): ctrl.set_video_state('connecting', self.sid) else: # response==gtk.RESPONSE_NO - session.decline_session() + if not session.accepted: + session.decline_session() + else: + for content in self.content_types: + session.reject_content(content) dialog.destroy()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2009