Commits August 2007

commits@gajim.org

7 participants
239 discussions

[commit-gajim] r8595 - branches/gajim_0.11.1/src/common
by roidelapluie＠gajim.org 29 Aug '07

29 Aug '07

Author: roidelapluie Date: 2007-08-29 22:42:28 +0200 (Wed, 29 Aug 2007) New Revision: 8595 Modified: branches/gajim_0.11.1/src/common/logger.py Log: Prevent a TB when a jid is in mem but not in DB (is has been removed while gajim was running). Fix #3073. Modified: branches/gajim_0.11.1/src/common/logger.py =================================================================== --- branches/gajim_0.11.1/src/common/logger.py 2007-08-29 20:40:32 UTC (rev 8594) +++ branches/gajim_0.11.1/src/common/logger.py 2007-08-29 20:42:28 UTC (rev 8595) @@ -169,19 +169,21 @@ jid = jid.split('/', 1)[0] # remove the resource if jid in self.jids_already_in: # we already have jids in DB self.cur.execute('SELECT jid_id FROM jids WHERE jid=?', [jid]) - jid_id = self.cur.fetchone()[0] - else: # oh! a new jid :), we add it now - if typestr == 'ROOM': - typ = constants.JID_ROOM_TYPE - else: - typ = constants.JID_NORMAL_TYPE - self.cur.execute('INSERT INTO jids (jid, type) VALUES (?, ?)', (jid, typ)) - try: - self.con.commit() - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) - jid_id = self.cur.lastrowid - self.jids_already_in.append(jid) + row = self.cur.fetchone() + if row: + return row[0] + # oh! a new jid :), we add it now + if typestr == 'ROOM': + typ = constants.JID_ROOM_TYPE + else: + typ = constants.JID_NORMAL_TYPE + self.cur.execute('INSERT INTO jids (jid, type) VALUES (?, ?)', (jid, typ)) + try: + self.con.commit() + except sqlite.OperationalError, e: + print >> sys.stderr, str(e) + jid_id = self.cur.lastrowid + self.jids_already_in.append(jid) return jid_id def convert_human_values_to_db_api_values(self, kind, show):

1 0

[commit-gajim] r8594 - in branches/gajim_0.11.1/src: . common
by roidelapluie＠gajim.org 29 Aug '07

29 Aug '07

Author: roidelapluie Date: 2007-08-29 22:40:32 +0200 (Wed, 29 Aug 2007) New Revision: 8594 Modified: branches/gajim_0.11.1/src/common/connection.py branches/gajim_0.11.1/src/roster_window.py Log: Cleanup connection.connect(). Fix #3061. Modified: branches/gajim_0.11.1/src/common/connection.py =================================================================== --- branches/gajim_0.11.1/src/common/connection.py 2007-08-29 20:34:40 UTC (rev 8593) +++ branches/gajim_0.11.1/src/common/connection.py 2007-08-29 20:40:32 UTC (rev 8594) @@ -285,16 +285,13 @@ def connect(self, data = None): ''' Start a connection to the Jabber server. Returns connection, and connection type ('tls', 'ssl', 'tcp', '') - data MUST contain name, hostname, resource, usessl, proxy, - use_custom_host, custom_host (if use_custom_host), custom_port (if - use_custom_host), ''' + data MUST contain hostname, usessl, proxy, use_custom_host, + custom_host (if use_custom_host), custom_port (if use_custom_host)''' if self.connection: return self.connection, '' if data: - name = data['name'] hostname = data['hostname'] - resource = data['resource'] usessl = data['usessl'] self.try_connecting_for_foo_secs = 45 p = data['proxy'] @@ -304,9 +301,7 @@ custom_h = data['custom_host'] custom_p = data['custom_port'] else: - name = gajim.config.get_per('accounts', self.name, 'name') hostname = gajim.config.get_per('accounts', self.name, 'hostname') - resource = gajim.config.get_per('accounts', self.name, 'resource') usessl = gajim.config.get_per('accounts', self.name, 'usessl') self.try_connecting_for_foo_secs = gajim.config.get_per('accounts', self.name, 'try_connecting_for_foo_secs') @@ -317,7 +312,7 @@ custom_h = gajim.config.get_per('accounts', self.name, 'custom_host') custom_p = gajim.config.get_per('accounts', self.name, 'custom_port') - #create connection if it doesn't already exist + # create connection if it doesn't already exist self.connected = 1 if p and p in gajim.config.get_per('proxies'): proxy = {'host': gajim.config.get_per('proxies', p, 'host')} @@ -434,10 +429,8 @@ self.dispatch('CON_TYPE', con_type) ConnectionHandlers._register_handlers(self, con, con_type) name = gajim.config.get_per('accounts', self.name, 'name') - hostname = gajim.config.get_per('accounts', self.name, 'hostname') - resource = gajim.config.get_per('accounts', self.name, 'resource') self.connection = con - con.auth(name, self.password, resource, 1, self.__on_auth) + con.auth(name, self.password, self.server_resource, 1, self.__on_auth) def __on_auth(self, con, auth): if not con: @@ -887,6 +880,7 @@ if self.connection: return self._hostname = config['hostname'] + self.server_resource = config['resource'] self.new_account_info = config self.name = name self.on_connect_success = self._on_new_account Modified: branches/gajim_0.11.1/src/roster_window.py =================================================================== --- branches/gajim_0.11.1/src/roster_window.py 2007-08-29 20:34:40 UTC (rev 8593) +++ branches/gajim_0.11.1/src/roster_window.py 2007-08-29 20:40:32 UTC (rev 8594) @@ -1326,8 +1326,7 @@ contact = gajim.contacts.create_contact(jid = jid, name = account_name, show = connection.get_status(), sub = '', status = connection.status, - resource = gajim.config.get_per('accounts', connection.name, - 'resource'), + resource = connection.server_resource, priority = connection.priority, keyID = gajim.config.get_per('accounts', connection.name, 'keyid')) @@ -2659,7 +2658,7 @@ gajim.connections[account].unsubscribe(contact.jid, remove_auth) for c in gajim.contacts.get_contact(account, contact.jid): self.remove_contact(c, account) - gajim.contacts.remove_jid(account, c.jid) + gajim.contacts.remove_jid(account, contact.jid) # redraw group rows for contact numbers for group in c.groups: self.draw_group(group, account)

1 0

[commit-gajim] r8593 - branches/gajim_0.11.1/po
by roidelapluie＠gajim.org 29 Aug '07

29 Aug '07

Author: roidelapluie Date: 2007-08-29 22:34:40 +0200 (Wed, 29 Aug 2007) New Revision: 8593 Modified: branches/gajim_0.11.1/po/fr.po Log: [kerneis] Typo in french translation. Fix #3055 and #3056. Modified: branches/gajim_0.11.1/po/fr.po =================================================================== --- branches/gajim_0.11.1/po/fr.po 2007-08-29 20:29:45 UTC (rev 8592) +++ branches/gajim_0.11.1/po/fr.po 2007-08-29 20:34:40 UTC (rev 8593) @@ -1210,7 +1210,7 @@ #: ../data/glade/join_groupchat_window.glade.h:2 msgid "Join this room automatically when I connect" -msgstr "Joindre ce groupe de discution quand je me connecte" +msgstr "Joindre ce groupe de discussion quand je me connecte" #: ../data/glade/join_groupchat_window.glade.h:3 #: ../data/glade/manage_bookmarks_window.glade.h:4 @@ -2598,11 +2598,11 @@ #: ../src/chat_control.py:1259 msgid "Encryption enabled" -msgstr "Chiffrement activée" +msgstr "Chiffrement activé" #: ../src/chat_control.py:1264 msgid "Encryption disabled" -msgstr "Chiffrement désactivée" +msgstr "Chiffrement désactivé" #. add_to_roster_menuitem #: ../src/chat_control.py:1408 ../src/conversation_textview.py:497 @@ -4342,7 +4342,7 @@ #: ../src/gajim-remote.py:244 msgid "room" -msgstr "groupe de discution" +msgstr "groupe de discussion" #: ../src/gajim-remote.py:245 msgid "nick"

1 0

[commit-gajim] r8592 - branches/gajim_0.11.1/src
by roidelapluie＠gajim.org 29 Aug '07

29 Aug '07

Author: roidelapluie Date: 2007-08-29 22:29:45 +0200 (Wed, 29 Aug 2007) New Revision: 8592 Modified: branches/gajim_0.11.1/src/gajim.py Log: Detect correctly running instances under win with built version. Fix #3050. Modified: branches/gajim_0.11.1/src/gajim.py =================================================================== --- branches/gajim_0.11.1/src/gajim.py 2007-08-29 20:26:19 UTC (rev 8591) +++ branches/gajim_0.11.1/src/gajim.py 2007-08-29 20:29:45 UTC (rev 8592) @@ -208,7 +208,7 @@ return b.contents.szExeFile f = k.Process32Next(h, b) - if get_p(pid) == 'python.exe': + if get_p(pid) in ('python.exe', 'gajim.exe'): return True return False try:

1 0

[commit-gajim] r8591 - branches/gajim_0.11.1/po
by roidelapluie＠gajim.org 29 Aug '07

29 Aug '07

Author: roidelapluie Date: 2007-08-29 22:26:19 +0200 (Wed, 29 Aug 2007) New Revision: 8591 Modified: branches/gajim_0.11.1/po/fr.po Log: Fix crashing bug in translation. Fix #3043. Modified: branches/gajim_0.11.1/po/fr.po =================================================================== --- branches/gajim_0.11.1/po/fr.po 2007-08-29 20:22:00 UTC (rev 8590) +++ branches/gajim_0.11.1/po/fr.po 2007-08-29 20:26:19 UTC (rev 8591) @@ -3522,7 +3522,7 @@ #: ../src/dialogs.py:2244 #, python-format msgid "$Contact has invited you to group chat %(room_jid)s" -msgstr "%Contact vous a invité dans le salon de discussion %(room_jid)s" +msgstr "$Contact vous a invité dans le salon de discussion %(room_jid)s" #. only if not None and not '' #: ../src/dialogs.py:2256

1 0

[commit-gajim] r8590 - branches/gajim_0.11.1/src/common
by roidelapluie＠gajim.org 29 Aug '07

29 Aug '07

Author: roidelapluie Date: 2007-08-29 22:22:00 +0200 (Wed, 29 Aug 2007) New Revision: 8590 Modified: branches/gajim_0.11.1/src/common/contacts.py Log: Compute metacontact big brother by comparing them instead of computing an absolute score for each one. Fix #2781 and #2156. Modified: branches/gajim_0.11.1/src/common/contacts.py =================================================================== --- branches/gajim_0.11.1/src/common/contacts.py 2007-08-29 20:17:11 UTC (rev 8589) +++ branches/gajim_0.11.1/src/common/contacts.py 2007-08-29 20:22:00 UTC (rev 8590) @@ -379,45 +379,48 @@ answers.append(data) return answers - def _get_data_score(self, data): - '''compute thescore of a gived data - data is {'jid': jid, 'account': account, 'order': order} - order is optional - score = (max_order - order)*10000 + is_jabber*priority*10 + status''' - jid = data['jid'] - account = data['account'] - max_order = 0 - order = 0 - if data.has_key('order'): - order = data['order'] - if order: - family = self.get_metacontacts_family(account, jid) - for data_ in family: - if data_.has_key('order') and data_['order'] > max_order: - max_order = data_['order'] - contact = self.get_contact_with_highest_priority(account, jid) - score = (max_order - order)*10000 - - if common.gajim.get_transport_name_from_jid(jid) is None and \ - contact.show not in ('error', 'offline'): - score += 10 - if contact.priority > 0: - score += contact.priority * 10 - score += ['not in roster', 'error', 'offline', 'invisible', 'dnd', 'xa', - 'away', 'chat', 'online', 'requested', 'message'].index(contact.show) - return score + def compare_metacontacts(self, data1, data2): + '''compare 2 metacontacts. + Data is {'jid': jid, 'account': account, 'order': order} + order is optional''' + if 'order' in data1 and 'order' in data2: + if data1['order'] > data2['order']: + return 1 + if data1['order'] < data2['order']: + return -1 + jid1 = data1['jid'] + jid2 = data2['jid'] + transport1 = common.gajim.get_transport_name_from_jid(jid1) + transport2 = common.gajim.get_transport_name_from_jid(jid2) + if transport2 and not transport1: + return 1 + if transport1 and not transport2: + return -1 + contact1 = self.get_contact_with_highest_priority(data1['account'], jid1) + contact2 = self.get_contact_with_highest_priority(data2['account'], jid2) + if contact1.priority > contact2.priority: + return 1 + if contact2.priority > contact1.priority: + return -1 + show_list = ['not in roster', 'error', 'offline', 'invisible', 'dnd', + 'xa', 'away', 'chat', 'online', 'requested', 'message'] + show1 = show_list.index(contact1.show) + show2 = show_list.index(contact2.show) + if show1 > show2: + return 1 + if show2 > show1: + return -1 + if jid1 > jid2: + return 1 + if jid2 > jid1: + return -1 + return 0 def get_metacontacts_big_brother(self, family): '''which of the family will be the big brother under wich all others will be ?''' - max_score = 0 - max_data = family[0] - for data in family: - score = self._get_data_score(data) - if score > max_score: - max_score = score - max_data = data - return max_data + family.sort(cmp=self.compare_metacontacts) + return family[-1] def is_pm_from_jid(self, account, jid): '''Returns True if the given jid is a private message jid'''

1 0

[commit-gajim] r8589 - branches/gajim_0.11.1/src/common
by roidelapluie＠gajim.org 29 Aug '07

29 Aug '07

Author: roidelapluie Date: 2007-08-29 22:17:11 +0200 (Wed, 29 Aug 2007) New Revision: 8589 Modified: branches/gajim_0.11.1/src/common/dbus_support.py Log: Don't stop Gajim when dbus is stopped. Fix #3032. Modified: branches/gajim_0.11.1/src/common/dbus_support.py =================================================================== --- branches/gajim_0.11.1/src/common/dbus_support.py 2007-08-29 20:12:19 UTC (rev 8588) +++ branches/gajim_0.11.1/src/common/dbus_support.py 2007-08-29 20:17:11 UTC (rev 8589) @@ -60,6 +60,8 @@ return False if self.system_bus is None: return False + # Don't exit Gajim when dbus is stopped + self.system_bus.set_exit_on_disconnect(False) return True system_bus = SystemBus()

1 0

[commit-gajim] r8588 - in branches/gajim_0.11.1: data/glade src
by roidelapluie＠gajim.org 29 Aug '07

29 Aug '07

Author: roidelapluie Date: 2007-08-29 22:12:19 +0200 (Wed, 29 Aug 2007) New Revision: 8588 Modified: branches/gajim_0.11.1/data/glade/preferences_window.glade branches/gajim_0.11.1/src/config.py Log: Make idle part of preference window insensitive if idle is not supported. Fix #2949. Modified: branches/gajim_0.11.1/data/glade/preferences_window.glade =================================================================== --- branches/gajim_0.11.1/data/glade/preferences_window.glade 2007-08-29 19:44:10 UTC (rev 8587) +++ branches/gajim_0.11.1/data/glade/preferences_window.glade 2007-08-29 20:12:19 UTC (rev 8588) @@ -2031,7 +2031,7 @@ <property name="spacing">12</property> <child> - <widget class="GtkTable" id="table19"> + <widget class="GtkTable" id="autoaway_table"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">4</property> Modified: branches/gajim_0.11.1/src/config.py =================================================================== --- branches/gajim_0.11.1/src/config.py 2007-08-29 19:44:10 UTC (rev 8587) +++ branches/gajim_0.11.1/src/config.py 2007-08-29 20:12:19 UTC (rev 8588) @@ -392,6 +392,10 @@ self.auto_xa_message_entry.set_text(st) self.auto_xa_message_entry.set_sensitive(gajim.config.get('autoxa')) + from common import sleepy + if not sleepy.SUPPORTED: + self.xml.get_widget('autoaway_table').set_sensitive(False) + # ask_status when online / offline st = gajim.config.get('ask_online_status') self.xml.get_widget('prompt_online_status_message_checkbutton').\

1 0

[commit-gajim] r8587 - branches/gajim_0.11.1/src/common
by roidelapluie＠gajim.org 29 Aug '07

29 Aug '07

Author: roidelapluie Date: 2007-08-29 21:44:10 +0200 (Wed, 29 Aug 2007) New Revision: 8587 Modified: branches/gajim_0.11.1/src/common/proxy65_manager.py Log: fixes large WCPU footprint under freebsd. fixes #1963 for 0.11.2. Modified: branches/gajim_0.11.1/src/common/proxy65_manager.py =================================================================== --- branches/gajim_0.11.1/src/common/proxy65_manager.py 2007-08-29 19:35:16 UTC (rev 8586) +++ branches/gajim_0.11.1/src/common/proxy65_manager.py 2007-08-29 19:44:10 UTC (rev 8587) @@ -253,7 +253,8 @@ self._recv=self._sock.recv except Exception, ee: (errnum, errstr) = ee - if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): + # 56 is for freebsd + if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK, 56): # still trying to connect return # win32 needs this

1 0

[commit-gajim] r8586 - branches/gajim_0.11.1
by roidelapluie＠gajim.org 29 Aug '07

29 Aug '07

Author: roidelapluie Date: 2007-08-29 21:35:16 +0200 (Wed, 29 Aug 2007) New Revision: 8586 Modified: branches/gajim_0.11.1/ChangeLog Log: Fix Changelog date and start the work for 0.11.2 ;-) Modified: branches/gajim_0.11.1/ChangeLog =================================================================== --- branches/gajim_0.11.1/ChangeLog 2007-08-29 15:42:37 UTC (rev 8585) +++ branches/gajim_0.11.1/ChangeLog 2007-08-29 19:35:16 UTC (rev 8586) @@ -1,4 +1,4 @@ -Gajim 0.11.1 (XX February 2007) +Gajim 0.11.1 (18 February 2007) * Fixes in gajim-remote and the way XMPP URI are handled * Fix Idle under Windows * Fix Gajim under non-ascii languages Windows

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2007