Commits July 2006

commits@gajim.org

5 participants
109 discussions

[commit-gajim] r6623 - in trunk: data/iconsets/transports src/common
by asterix＠gajim.org 30 Jul '06

30 Jul '06

Author: asterix Date: 2006-07-30 22:06:42 +0200 (Sun, 30 Jul 2006) New Revision: 6623 Added: trunk/data/iconsets/transports/gadu-gadu/ Removed: trunk/data/iconsets/transports/gadugadu/ Modified: trunk/src/common/gajim.py Log: gadu gadu dsco type is gadu-gadu, not gadugadu Copied: trunk/data/iconsets/transports/gadu-gadu (from rev 6622, trunk/data/iconsets/transports/gadugadu) Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2006-07-29 22:29:59 UTC (rev 6622) +++ trunk/src/common/gajim.py 2006-07-30 20:06:42 UTC (rev 6623) @@ -239,7 +239,7 @@ if host == 'aim': return 'aim' elif host == 'gg': - return 'gadugadu' + return 'gadu-gadu' elif host == 'irc': return 'irc' elif host == 'icq':

1 0

[commit-gajim] r6622 - in trunk/src: . common
by asterix＠gajim.org 29 Jul '06

29 Jul '06

Author: asterix Date: 2006-07-30 00:29:59 +0200 (Sun, 30 Jul 2006) New Revision: 6622 Modified: trunk/src/common/config.py trunk/src/common/connection_handlers.py trunk/src/common/gajim.py trunk/src/common/logger.py trunk/src/common/optparser.py trunk/src/gajim.py Log: we now get transport type from disco info and save that in DB. Fixes #1990 and #1938 Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2006-07-29 20:54:17 UTC (rev 6621) +++ trunk/src/common/config.py 2006-07-29 22:29:59 UTC (rev 6622) @@ -134,7 +134,7 @@ 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour).')], 'show_roster_on_startup': [opt_bool, True], 'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP.')], - 'version': [ opt_str, '0.10.1.2' ], # which version created the config + 'version': [ opt_str, '0.10.1.3' ], # which version created the config 'search_engine': [opt_str, 'http://www.google.com/search?&q=%s&sourceid=gajim'], 'dictionary_url': [opt_str, 'WIKTIONARY', _("Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary.")], 'always_english_wikipedia': [opt_bool, False], Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2006-07-29 20:54:17 UTC (rev 6621) +++ trunk/src/common/connection_handlers.py 2006-07-29 22:29:59 UTC (rev 6622) @@ -725,11 +725,15 @@ if not qc: qc = [] is_muc = False + transport_type = '' for i in qc: if i.getName() == 'identity': attr = {} for key in i.getAttrs().keys(): attr[key] = i.getAttr(key) + if attr.has_key('category') and attr['category'] in ('gateway', 'headline')\ + and attr.has_key('type'): + transport_type = attr['type'] if attr.has_key('category') and attr['category'] == 'conference' \ and attr.has_key('type') and attr['type'] == 'text': is_muc = True @@ -739,6 +743,9 @@ elif i.getName() == 'x' and i.getAttr('xmlns') == common.xmpp.NS_DATA: data.append(common.xmpp.DataForm(node=i)) jid = helpers.get_full_jid_from_iq(iq_obj) + if transport_type and jid not in gajim.transport_type: + gajim.transport_type[jid] = transport_type + gajim.logger.save_transport_type(jid, transport_type) id = iq_obj.getID() if not identities: # ejabberd doesn't send identities when we browse online users #FIXME: see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225 Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2006-07-29 20:54:17 UTC (rev 6621) +++ trunk/src/common/gajim.py 2006-07-29 22:29:59 UTC (rev 6622) @@ -83,6 +83,8 @@ gmail_domains = ['gmail.com', 'googlemail.com'] +transport_type = {} # list the type of transport + last_message_time = {} # list of time of the latest incomming message # {acct1: {jid1: time1, jid2: time2}, } encrypted_chats = {} # list of encrypted chats {acct1: [jid1, jid2], ..} @@ -223,8 +225,11 @@ # jid was None. Yann why? if not jid or (use_config_setting and not config.get('use_transports_iconsets')): return - + host = get_server_from_jid(jid) + if host in transport_type: + return transport_type[host] + # host is now f.e. icq.foo.org or just icq (sometimes on hacky transports) host_splitted = host.split('.') if len(host_splitted) != 0: @@ -293,7 +298,7 @@ if ev[0] == typ: return ev return None - + def get_notification_image_prefix(jid): '''returns the prefix for the notification images''' transport_name = get_transport_name_from_jid(jid) Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2006-07-29 20:54:17 UTC (rev 6621) +++ trunk/src/common/logger.py 2006-07-29 22:29:59 UTC (rev 6622) @@ -78,6 +78,22 @@ self.SHOW_OFFLINE ) = range(6) + ( + self.TYPE_AIM, + self.TYPE_GG, + self.TYPE_HTTP_WS, + self.TYPE_ICQ, + self.TYPE_MSN, + self.TYPE_QQ, + self.TYPE_SMS, + self.TYPE_SMTP, + self.TYPE_TLEN, + self.TYPE_YAHOO, + self.TYPE_NEWMAIL, + self.TYPE_RSS, + self.TYPE_WEATHER, + ) = range(13) + constants = Constants() class Logger: @@ -192,7 +208,66 @@ show_col = 'UNKNOWN' return kind_col, show_col - + + def convert_human_transport_type_to_db_api_values(self, type_): + '''converts from string style to constant ints for db''' + if type_ == 'aim': + return constants.TYPE_AIM + if type_ == 'gadu-gadu': + return constants.TYPE_GG + if type_ == 'http-ws': + return constants.TYPE_HTTP_WS + if type_ == 'icq': + return constants.TYPE_ICQ + if type_ == 'msn': + return constants.TYPE_MSN + if type_ == 'qq': + return constants.TYPE_QQ + if type_ == 'sms': + return constants.TYPE_SMS + if type_ == 'smtp': + return constants.TYPE_SMTP + if type_ == 'tlen': + return constants.TYPE_TLEN + if type_ == 'yahoo': + return constants.TYPE_YAHOO + if type_ == 'newmail': + return constants.TYPE_NEWMAIL + if type_ == 'rss': + return constants.TYPE_RSS + if type_ == 'weather': + return constants.TYPE_WEATHER + return None + + def convert_api_values_to_human_transport_type(self, type_id): + '''converts from constant ints for db to string style''' + if type_id == constants.TYPE_AIM: + return 'aim' + if type_id == constants.TYPE_GG: + return 'gadu-gadu' + if type_id == constants.TYPE_HTTP_WS: + return 'http-ws' + if type_id == constants.TYPE_ICQ: + return 'icq' + if type_id == constants.TYPE_MSN: + return 'msn' + if type_id == constants.TYPE_QQ: + return 'qq' + if type_id == constants.TYPE_SMS: + return 'sms' + if type_id == constants.TYPE_SMTP: + return 'smtp' + if type_id == constants.TYPE_TLEN: + return 'tlen' + if type_id == constants.TYPE_YAHOO: + return 'yahoo' + if type_id == constants.TYPE_NEWMAIL: + return 'newmail' + if type_id == constants.TYPE_RSS: + return 'rss' + if type_id == constants.TYPE_WEATHER: + return 'weather' + def commit_to_db(self, values, write_unread = False): #print 'saving', values sql = 'INSERT INTO logs (jid_id, contact_name, time, kind, show, message, subject) VALUES (?, ?, ?, ?, ?, ?, ?)' @@ -498,3 +573,43 @@ jid_id = self.get_jid_id(jid) where_sql = 'jid_id = %s' % jid_id return where_sql + + def save_transport_type(self, jid, type_): + '''save the type of the transport in DB''' + type_id = self.convert_human_transport_type_to_db_api_values(type_) + if not type_id: + # unknown type + return + self.cur.execute( + 'SELECT type from transports_cache WHERE transport = "%s"' % jid) + results = self.cur.fetchall() + if results: + result = results[0][0] + if result == type_id: + return + self.cur.execute( + 'UPDATE transports_cache SET type = %d WHERE transport = "%s"' % (type_id, + jid)) + try: + self.con.commit() + except sqlite.OperationalError, e: + print >> sys.stderr, str(e) + return + self.cur.execute( + 'INSERT INTO transports_cache VALUES ("%s", %d)' % (jid, type_id)) + try: + self.con.commit() + except sqlite.OperationalError, e: + print >> sys.stderr, str(e) + + def get_transports_type(self): + '''return all the type of the transports in DB''' + self.cur.execute( + 'SELECT * from transports_cache') + results = self.cur.fetchall() + if not results: + return {} + answer = {} + for result in results: + answer[result[0]] = self.convert_api_values_to_human_transport_type(result[1]) + return answer Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2006-07-29 20:54:17 UTC (rev 6621) +++ trunk/src/common/optparser.py 2006-07-29 22:29:59 UTC (rev 6622) @@ -144,6 +144,8 @@ self.update_config_to_01011() if old < [0, 10, 1, 2] and new >= [0, 10, 1, 2]: self.update_config_to_01012() + if old < [0, 10, 1, 3] and new >= [0, 10, 1, 3]: + self.update_config_to_01013() gajim.config.set('version', new_version) @@ -272,3 +274,29 @@ self.old_values['emoticons_theme'] == 'Disabled': gajim.config.set('emoticons_theme', '') gajim.config.set('version', '0.10.1.2') + + def update_config_to_01013(self): + '''create table transports_cache if there is no such table''' + import exceptions + try: + from pysqlite2 import dbapi2 as sqlite + except ImportError: + raise exceptions.PysqliteNotAvailable + import logger + + con = sqlite.connect(logger.LOG_DB_PATH) + cur = con.cursor() + try: + cur.executescript( + ''' + CREATE TABLE transports_cache ( + transport TEXT UNIQUE, + type INTEGER + ); + ''' + ) + con.commit() + except sqlite.OperationalError, e: + pass + con.close() + gajim.config.set('version', '0.10.1.3') Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-07-29 20:54:17 UTC (rev 6621) +++ trunk/src/gajim.py 2006-07-29 22:29:59 UTC (rev 6622) @@ -1891,6 +1891,9 @@ # get instances for windows/dialogs that will show_all()/hide() self.instances['file_transfers'] = dialogs.FileTransfersWindow() + # get transports type from DB + gajim.transport_type = gajim.logger.get_transports_type() + gobject.timeout_add(100, self.autoconnect) gobject.timeout_add(200, self.process_connections) gobject.timeout_add(500, self.read_sleepy)

1 0

[commit-gajim] r6621 - trunk/src
by asterix＠gajim.org 29 Jul '06

29 Jul '06

Author: asterix Date: 2006-07-29 22:54:17 +0200 (Sat, 29 Jul 2006) New Revision: 6621 Modified: trunk/src/dialogs.py Log: don't ask nick when we want to join a room in which we already are Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-07-29 17:57:12 UTC (rev 6620) +++ trunk/src/dialogs.py 2006-07-29 20:54:17 UTC (rev 6621) @@ -959,6 +959,11 @@ '''automatic is a dict like {'invities': []} If automatic is not empty, this means room must be automaticaly configured and when done, invities must be automatically invited''' + if server and room: + jid = room + '@' + server + if jid in gajim.gc_connected[account] and gajim.gc_connected[account][jid]: + ErrorDialog(_('You are already in room %s') % jid) + raise RuntimeError, 'You are already in this room' self.account = account self.automatic = automatic if nick == '':

1 0

[commit-gajim] r6620 - trunk/src/common
by asterix＠gajim.org 29 Jul '06

29 Jul '06

Author: asterix Date: 2006-07-29 19:57:12 +0200 (Sat, 29 Jul 2006) New Revision: 6620 Modified: trunk/src/common/connection_handlers.py Log: prevent a TB and print an error message to the user when he/she tries to et a non valid nickname in a room Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2006-07-28 16:15:18 UTC (rev 6619) +++ trunk/src/common/connection_handlers.py 2006-07-29 17:57:12 UTC (rev 6620) @@ -1394,7 +1394,17 @@ if ptype == 'available': ptype = None gajim.log.debug('PresenceCB: %s' % ptype) - who = helpers.get_full_jid_from_iq(prs) + try: + who = helpers.get_full_jid_from_iq(prs) + except: + if prs.getTag('error').getTag('jid-malformed'): + # wrong jid, we probably tried to change our nick in a room to a non valid + # one + who = str(prs.getFrom()) + jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who) + self.dispatch('GC_MSG', (jid_stripped, _('Nickname not allowed: %s') % \ + resource, None)) + return jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who) timestamp = None is_gc = False # is it a GC presence ?

1 0

[commit-gajim] r6619 - trunk/src/common
by asterix＠gajim.org 28 Jul '06

28 Jul '06

Author: asterix Date: 2006-07-28 18:15:18 +0200 (Fri, 28 Jul 2006) New Revision: 6619 Modified: trunk/src/common/logger.py Log: remove old code (when we modified unread_message table structure) Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2006-07-28 11:47:43 UTC (rev 6618) +++ trunk/src/common/logger.py 2006-07-28 16:15:18 UTC (rev 6619) @@ -238,25 +238,8 @@ self.cur.execute( 'SELECT message_id from unread_messages WHERE jid_id = %d' % jid_id) results = self.cur.fetchall() - # Remove before 0.10 except: - try: - self.cur.executescript('DROP TABLE unread_messages;') - self.con.commit() - except: - pass - try: - self.cur.executescript('''CREATE TABLE unread_messages( - message_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, - jid_id INTEGER - );''') - self.con.commit() - except: - pass - self.con.close() - self.jids_already_in = [] - self.init_vars() - return [] + pass for message in results: msg_id = message[0]

1 0

[commit-gajim] r6618 - trunk/src
by asterix＠gajim.org 28 Jul '06

28 Jul '06

Author: asterix Date: 2006-07-28 13:47:43 +0200 (Fri, 28 Jul 2006) New Revision: 6618 Removed: trunk/src/migrate_logs_to_dot9_db.py Modified: trunk/src/gajim.py Log: remove log migration process, 0.8 is old Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-07-28 11:23:19 UTC (rev 6617) +++ trunk/src/gajim.py 2006-07-28 11:47:43 UTC (rev 6618) @@ -180,20 +180,6 @@ import vcard import config -class MigrateCommand(nslookup.IdleCommand): - def __init__(self, on_result): - nslookup.IdleCommand.__init__(self, on_result) - self.commandtimeout = 10 - - def _compose_command_args(self): - return ['python', 'migrate_logs_to_dot9_db.py', 'dont_wait'] - - def _return_result(self): - print self.result - if self.result_handler: - self.result_handler(self.result) - self.result_handler = None - class GlibIdleQueue(idlequeue.IdleQueue): ''' Extends IdleQueue to use glib io_add_wath, instead of select/poll @@ -1942,30 +1928,6 @@ gtkgui_helpers.possibly_set_gajim_as_xmpp_handler() - # Migrate old logs if we have such olds logs - from common import logger - from migrate_logs_to_dot9_db import PATH_TO_LOGS_BASE_DIR - LOG_DB_PATH = logger.LOG_DB_PATH - if not os.path.exists(LOG_DB_PATH) and os.path.isdir(PATH_TO_LOGS_BASE_DIR): - import Queue - q = Queue.Queue(100) - dialog = dialogs.ProgressDialog(_('Migrating Logs...'), - _('Please wait while logs are being migrated...'), q) - if os.name == 'nt' and gtk.pygtk_version > (2, 8, 0): - idlequeue = idlequeue.SelectIdleQueue() - else: - idlequeue = GlibIdleQueue() - def on_result(*arg): - dialog.dialog.destroy() - dialog.dialog = None - gobject.source_remove(dialog.update_progressbar_timeout_id) - gajim.logger.init_vars() - check_paths.check_and_possibly_create_paths() - Interface() - m = MigrateCommand(on_result) - m.set_idlequeue(idlequeue) - m.start() - else: - check_paths.check_and_possibly_create_paths() - Interface() + check_paths.check_and_possibly_create_paths() + Interface() gtk.main() Deleted: trunk/src/migrate_logs_to_dot9_db.py =================================================================== --- trunk/src/migrate_logs_to_dot9_db.py 2006-07-28 11:23:19 UTC (rev 6617) +++ trunk/src/migrate_logs_to_dot9_db.py 2006-07-28 11:47:43 UTC (rev 6618) @@ -1,267 +0,0 @@ -#!/bin/sh -''':' -exec python -OOt "$0" ${1+"$@"} -' ''' -## Contributors for this file: -## - Yann Le Boulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> -## -## Copyright (C) 2003-2004 Yann Le Boulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Le Boulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <nkour(a)jabber.org> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -import os -import sre -import sys -import time -from common import logger -from common import i18n - -try: - PREFERRED_ENCODING = sys.getpreferredencoding() -except: - PREFERRED_ENCODING = 'utf-8' -from common.helpers import from_one_line, decode_string - -from pysqlite2 import dbapi2 as sqlite - -if os.name == 'nt': - try: - PATH_TO_LOGS_BASE_DIR = os.path.join(os.environ['appdata'], 'Gajim', 'Logs') - PATH_TO_DB = os.path.join(os.environ['appdata'], 'Gajim', 'logs.db') # database is called logs.db - except KeyError: - # win9x - PATH_TO_LOGS_BASE_DIR = '../src/Logs' - PATH_TO_DB = '../src/logs.db' -else: - PATH_TO_LOGS_BASE_DIR = os.path.expanduser('~/.gajim/logs') - PATH_TO_DB = os.path.expanduser('~/.gajim/logs.db') # database is called logs.db - - - -class Migration: - def __init__(self): - self.constants = logger.Constants() - self.DONE = False - self.PROCESSING = False - - if os.path.exists(PATH_TO_DB): - print '%s already exists. Exiting..' % PATH_TO_DB - sys.exit() - - self.jids_already_in = [] # jid we already put in DB - - def get_jid(self, dirname, filename): - # jids.jid text column will be JID if TC-related, room_jid if GC-related, - # ROOM_JID/nick if pm-related. Here I get names from filenames - if dirname.endswith('logs') or dirname.endswith('Logs'): - # we have file (not dir) in logs base dir, so it's TC - jid = filename # file is JID - else: - # we are in a room folder (so it can be either pm or message in room) - if filename == os.path.basename(dirname): # room/room - jid = dirname # filename is ROOM_JID - else: #room/nick it's pm - jid = dirname + '/' + filename - - if jid.startswith('/'): - p = len(PATH_TO_LOGS_BASE_DIR) - jid = jid[p+1:] - jid = jid.lower() - return jid - - def decode_jid(self, string): - '''try to decode (to make it Unicode instance) given jid''' - string = decode_string(string) - if isinstance(string, str): - return None # decode failed - return string - - def visit(self, arg, dirname, filenames): - s = _('Visiting %s') % dirname - if self.queue: - self.queue.put(s) - else: - print s - for filename in filenames: - # Don't take this file into account, this is dup info - # notifications are also in contact log file - if filename in ('notify.log', 'README'): - continue - path_to_text_file = os.path.join(dirname, filename) - if os.path.isdir(path_to_text_file): - continue - - jid = self.get_jid(dirname, filename) - - jid = self.decode_jid(jid) - if not jid: - continue - - if filename == os.path.basename(dirname): # gajim@conf/gajim@conf then gajim@conf is type room - jid_type = self.constants.JID_ROOM_TYPE - #Type of log - typ = 'room' - else: - jid_type = self.constants.JID_NORMAL_TYPE - #Type of log - typ = _('normal') - s = _('Processing %s of type %s') % (jid, typ) - if self.queue: - self.queue.put(s.encode(PREFERRED_ENCODING)) - else: - print s.encode(PREFERRED_ENCODING) - - JID_ID = None - f = open(path_to_text_file, 'r') - lines = f.readlines() - for line in lines: - line = from_one_line(line) - splitted_line = line.split(':') - if len(splitted_line) > 2: - # type in logs is one of - # 'gc', 'gcstatus', 'recv', 'sent' and if nothing of those - # it is status - # new db has: - # status, gcstatus, gc_msg, (we only recv those 3), - # single_msg_recv, chat_msg_recv, chat_msg_sent, single_msg_sent - # to meet all our needs - # here I convert - # gc ==> gc_msg, gcstatus ==> gcstatus, recv ==> chat_msg_recv - # sent ==> chat_msg_sent, status ==> status - typ = splitted_line[1] # line[1] has type of logged message - message_data = splitted_line[2:] # line[2:] has message data - # line[0] is date, - # some lines can be fucked up, just drop them - try: - tim = int(float(splitted_line[0])) - except: - continue - - contact_name = None - show = None - if typ == 'gc': - contact_name = message_data[0] - message = ':'.join(message_data[1:]) - kind = self.constants.KIND_GC_MSG - elif typ == 'gcstatus': - contact_name = message_data[0] - show = message_data[1] - message = ':'.join(message_data[2:]) # status msg - kind = self.constants.KIND_GCSTATUS - elif typ == 'recv': - message = ':'.join(message_data[0:]) - kind = self.constants.KIND_CHAT_MSG_RECV - elif typ == 'sent': - message = ':'.join(message_data[0:]) - kind = self.constants.KIND_CHAT_MSG_SENT - else: # status - kind = self.constants.KIND_STATUS - show = message_data[0] - message = ':'.join(message_data[1:]) # status msg - - message = message[:-1] # remove last \n - if not message: - continue - - # jid is already in the DB, don't create a new row, just get his jid_id - if not JID_ID: - if jid in self.jids_already_in: - self.cur.execute('SELECT jid_id FROM jids WHERE jid = "%s"' % jid) - JID_ID = self.cur.fetchone()[0] - else: - self.jids_already_in.append(jid) - self.cur.execute('INSERT INTO jids (jid, type) VALUES (?, ?)', - (jid, jid_type)) - self.con.commit() - JID_ID = self.cur.lastrowid - - sql = 'INSERT INTO logs (jid_id, contact_name, time, kind, show, message) '\ - 'VALUES (?, ?, ?, ?, ?, ?)' - - values = (JID_ID, contact_name, tim, kind, show, message) - self.cur.execute(sql, values) - self.con.commit() - - def migrate(self, queue = None): - self.queue = queue - self.con = sqlite.connect(PATH_TO_DB) - os.chmod(PATH_TO_DB, 0600) # rw only for us - self.cur = self.con.cursor() - # create the tables - # kind can be - # status, gcstatus, gc_msg, (we only recv for those 3), - # single_msg_recv, chat_msg_recv, chat_msg_sent, single_msg_sent - # to meet all our needs - # logs.jid_id --> jids.jid_id but Sqlite doesn't do FK etc so it's done in python code - self.cur.executescript( - ''' - CREATE TABLE jids( - jid_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, - jid TEXT UNIQUE, - type INTEGER - ); - - CREATE TABLE unread_messages( - message_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, - jid_id INTEGER - ); - - CREATE TABLE logs( - log_line_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, - jid_id INTEGER, - contact_name TEXT, - time INTEGER, - kind INTEGER, - show INTEGER, - message TEXT, - subject TEXT - ); - ''' - ) - - self.con.commit() - - self.PROCESSING = True - os.path.walk(PATH_TO_LOGS_BASE_DIR, self.visit, None) - s = ''' - -We do not use plain-text files anymore, because they do not meet our needs. -Those files here are logs for Gajim up until 0.8.2 -We now use an sqlite database called logs.db found in %s -You can now safely remove your %s folder -Thank you''' % (os.path.dirname(PATH_TO_LOGS_BASE_DIR), PATH_TO_LOGS_BASE_DIR) - f = open(os.path.join(PATH_TO_LOGS_BASE_DIR, 'README'), 'w') - f.write(s) - f.close() - if queue: - queue.put(s) - self.DONE = True - -if __name__ == '__main__': - # magic argumen 'dont_wait' tells us that script is run from Gajim - if len(sys.argv) < 2 or sys.argv[1] != 'dont_wait': - print 'IMPORTNANT: PLEASE READ http://trac.gajim.org/wiki/MigrateLogToDot9DB' - print 'Migration will start in 40 seconds unless you press Ctrl+C' - time.sleep(40) # give the user time to act - print - print 'Starting Logs Migration' - print '=======================' - print 'Please do NOT run Gajim until this script is over' - m = Migration() - m.migrate()

1 0

[commit-gajim] r6617 - trunk/src
by asterix＠gajim.org 28 Jul '06

28 Jul '06

Author: asterix Date: 2006-07-28 13:23:19 +0200 (Fri, 28 Jul 2006) New Revision: 6617 Modified: trunk/src/config.py trunk/src/gtkgui_helpers.py Log: always show preferences window in current workspace. Fixes #2189 Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2006-07-28 11:05:13 UTC (rev 6616) +++ trunk/src/config.py 2006-07-28 11:23:19 UTC (rev 6617) @@ -461,6 +461,7 @@ self.notebook.set_current_page(0) self.window.show_all() + gtkgui_helpers.possibly_move_window_in_current_desktop(self.window) def on_preferences_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2006-07-28 11:05:13 UTC (rev 6616) +++ trunk/src/gtkgui_helpers.py 2006-07-28 11:23:19 UTC (rev 6617) @@ -406,7 +406,7 @@ if current_virtual_desktop_no != window_virtual_desktop: # we are in another VD that the window was # so show it in current VD - window.show() + window.present() def file_is_locked(path_to_file): '''returns True if file is locked (WINDOWS ONLY)'''

1 0

[commit-gajim] r6616 - trunk/src
by asterix＠gajim.org 28 Jul '06

28 Jul '06

Author: asterix Date: 2006-07-28 13:05:13 +0200 (Fri, 28 Jul 2006) New Revision: 6616 Modified: trunk/src/dialogs.py Log: privacy lists open / delete buttons are not unsensitive when we open the window and no privacy lists is available. Fixes #2140 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-07-28 10:53:51 UTC (rev 6615) +++ trunk/src/dialogs.py 2006-07-28 11:05:13 UTC (rev 6616) @@ -1936,6 +1936,7 @@ 'privacy_lists_refresh_button', 'close_privacy_lists_window_button']: self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add) + self.draw_privacy_lists_in_combobox() self.privacy_lists_refresh() self.enabled = True

1 0

[commit-gajim] r6615 - trunk/src
by asterix＠gajim.org 28 Jul '06

28 Jul '06

Author: asterix Date: 2006-07-28 12:53:51 +0200 (Fri, 28 Jul 2006) New Revision: 6615 Modified: trunk/src/dialogs.py Log: fix 2 typo. Fixes #1514 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-07-28 10:25:58 UTC (rev 6614) +++ trunk/src/dialogs.py 2006-07-28 10:53:51 UTC (rev 6615) @@ -148,7 +148,7 @@ return iter = model.iter_next(iter) self.changes_made = True - model.append((group, True)) + model.append((group, True, False)) self.add_group(group) self.update_contact() self.init_list() # Re-draw list to sort new item @@ -185,7 +185,7 @@ continue if g in groups: continue - groups[g] = 0 + groups[g] = 0 for g in contact.groups: groups[g] += 1 group_list = groups.keys()

1 0

[commit-gajim] r6614 - trunk/src
by asterix＠gajim.org 28 Jul '06

28 Jul '06

Author: asterix Date: 2006-07-28 12:25:58 +0200 (Fri, 28 Jul 2006) New Revision: 6614 Modified: trunk/src/dialogs.py trunk/src/roster_window.py Log: we can now edit groups of multiple contacts. Fixes #1514 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-07-28 06:40:37 UTC (rev 6613) +++ trunk/src/dialogs.py 2006-07-28 10:25:58 UTC (rev 6614) @@ -44,86 +44,97 @@ class EditGroupsDialog: '''Class for the edit group dialog window''' - def __init__(self, user, account): + def __init__(self, list_): + '''list_ is a list of (contact, account) tuples''' self.xml = gtkgui_helpers.get_glade('edit_groups_dialog.glade') self.dialog = self.xml.get_widget('edit_groups_dialog') self.dialog.set_transient_for(gajim.interface.roster.window) - self.account = account - self.user = user + self.list_ = list_ self.changes_made = False self.list = self.xml.get_widget('groups_treeview') - self.xml.get_widget('nickname_label').set_markup( - _("Contact's name: %s") % user.get_shown_name()) - self.xml.get_widget('jid_label').set_markup( - _('JID: %s') % user.jid) - + if len(list_) == 1: + contact = list_[0][0] + self.xml.get_widget('nickname_label').set_markup( + _("Contact's name: %s") % contact.get_shown_name()) + self.xml.get_widget('jid_label').set_markup( + _('JID: %s') % contact.jid) + else: + self.xml.get_widget('nickname_label').set_no_show_all(True) + self.xml.get_widget('nickname_label').hide() + self.xml.get_widget('jid_label').set_no_show_all(True) + self.xml.get_widget('jid_label').hide() + self.xml.signal_autoconnect(self) self.init_list() def run(self): self.dialog.show_all() if self.changes_made: - gajim.connections[self.account].update_contact(self.user.jid, - self.user.name, self.user.groups) + for (contact, account) in self.list_: + gajim.connections[account].update_contact(contact.jid, contact.name, + contact.groups) def on_edit_groups_dialog_response(self, widget, response_id): if response_id == gtk.RESPONSE_CLOSE: self.dialog.destroy() def update_contact(self): - tag = gajim.contacts.get_metacontacts_tag(self.account, self.user.jid) - if not tag: - gajim.interface.roster.remove_contact(self.user, self.account) - gajim.interface.roster.add_contact_to_roster(self.user.jid, - self.account) - gajim.connections[self.account].update_contact(self.user.jid, - self.user.name, self.user.groups) - return - all_jid = gajim.contacts.get_metacontacts_jids(tag) - for _account in all_jid: - if not gajim.interface.roster.regroup and _account != self.account: + for (contact, account) in self.list_: + tag = gajim.contacts.get_metacontacts_tag(account, contact.jid) + if not tag: + gajim.interface.roster.remove_contact(contact, account) + gajim.interface.roster.add_contact_to_roster(contact.jid, account) + gajim.connections[account].update_contact(contact.jid, contact.name, + contact.groups) continue - for _jid in all_jid[_account]: - c = gajim.contacts.get_first_contact_from_jid(_account, _jid) - if not c: + all_jid = gajim.contacts.get_metacontacts_jids(tag) + for _account in all_jid: + if not gajim.interface.roster.regroup and _account != account: continue - gajim.interface.roster.remove_contact(c, _account) - gajim.interface.roster.add_contact_to_roster(_jid, _account) - gajim.connections[_account].update_contact(_jid, c.name, c.groups) + for _jid in all_jid[_account]: + c = gajim.contacts.get_first_contact_from_jid(_account, _jid) + if not c: + continue + gajim.interface.roster.remove_contact(c, _account) + gajim.interface.roster.add_contact_to_roster(_jid, _account) + gajim.connections[_account].update_contact(_jid, c.name, + c.groups) def remove_group(self, group): - '''add group group to self.user and all his brothers''' - tag = gajim.contacts.get_metacontacts_tag(self.account, self.user.jid) - if not tag: - if group in self.user.groups: - self.user.groups.remove(group) - return - all_jid = gajim.contacts.get_metacontacts_jids(tag) - for _account in all_jid: - if not gajim.interface.roster.regroup and _account != self.account: + '''remove group group from all contacts and all their brothers''' + for (contact, account) in self.list_: + tag = gajim.contacts.get_metacontacts_tag(account, contact.jid) + if not tag: + if group in contact.groups: + contact.groups.remove(group) continue - for _jid in all_jid[_account]: - contacts = gajim.contacts.get_contact(_account, _jid) - for contact in contacts: - if group in contact.groups: - contact.groups.remove(group) + all_jid = gajim.contacts.get_metacontacts_jids(tag) + for _account in all_jid: + if not gajim.interface.roster.regroup and _account != account: + continue + for _jid in all_jid[_account]: + contacts = gajim.contacts.get_contact(_account, _jid) + for c in contacts: + if group in c.groups: + c.groups.remove(group) def add_group(self, group): - '''add group group to self.user and all his brothers''' - tag = gajim.contacts.get_metacontacts_tag(self.account, self.user.jid) - if not tag: - if group not in self.user.groups: - self.user.groups.append(group) - return - all_jid = gajim.contacts.get_metacontacts_jids(tag) - for _account in all_jid: - if not gajim.interface.roster.regroup and _account != self.account: + '''add group group to all contacts and all their brothers''' + for (contact, account) in self.list_: + tag = gajim.contacts.get_metacontacts_tag(account, contact.jid) + if not tag: + if group not in contact.groups: + contact.groups.append(group) continue - for _jid in all_jid[_account]: - contacts = gajim.contacts.get_contact(_account, _jid) - for contact in contacts: - if not group in contact.groups: - contact.groups.append(group) + all_jid = gajim.contacts.get_metacontacts_jids(tag) + for _account in all_jid: + if not gajim.interface.roster.regroup and _account != account: + continue + for _jid in all_jid[_account]: + contacts = gajim.contacts.get_contact(_account, _jid) + for c in contacts: + if not group in c.groups: + c.groups.append(group) def on_add_button_clicked(self, widget): group = self.xml.get_widget('group_entry').get_text().decode('utf-8') @@ -145,7 +156,11 @@ def group_toggled_cb(self, cell, path): self.changes_made = True model = self.list.get_model() - model[path][1] = not model[path][1] + if model[path][2]: + model[path][2] = False + model[path][1] = True + else: + model[path][1] = not model[path][1] group = model[path][0].decode('utf-8') if model[path][1]: self.add_group(group) @@ -154,23 +169,39 @@ self.update_contact() def init_list(self): - store = gtk.ListStore(str, bool) + store = gtk.ListStore(str, bool, bool) self.list.set_model(store) for column in self.list.get_columns(): # Clear treeview when re-drawing self.list.remove_column(column) - groups = [] # Store accounts in a list so we can sort them - for g in gajim.groups[self.account].keys(): - if g in helpers.special_groups: - continue - in_group = False - if g in self.user.groups: - in_group = True - groups.append([g, in_group]) - groups.sort() - for group in groups: + accounts = [] + # Store groups in a list so we can sort them and the number of contacts in + # it + groups = {} + for (contact, account) in self.list_: + if account not in accounts: + accounts.append(account) + for g in gajim.groups[account].keys(): + if g in helpers.special_groups: + continue + if g in groups: + continue + groups[g] = 0 + for g in contact.groups: + groups[g] += 1 + group_list = groups.keys() + group_list.sort() + for group in group_list: iter = store.append() - store.set(iter, 0, group[0]) # Group name - store.set(iter, 1, group[1]) # In group boolean + store.set(iter, 0, group) # Group name + if groups[group] == 0: + store.set(iter, 1, False) + else: + store.set(iter, 1, True) + if groups[group] == len(self.list_): + # all contacts are in this group + store.set(iter, 2, False) + else: + store.set(iter, 2, True) column = gtk.TreeViewColumn(_('Group')) column.set_expand(True) self.list.append_column(column) @@ -185,7 +216,7 @@ column.pack_start(renderer) renderer.set_property('activatable', True) renderer.connect('toggled', self.group_toggled_cb) - column.set_attributes(renderer, active = 1) + column.set_attributes(renderer, active = 1, inconsistent = 2) class PassphraseDialog: '''Class for Passphrase dialog''' Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-07-28 06:40:37 UTC (rev 6613) +++ trunk/src/roster_window.py 2006-07-28 10:25:58 UTC (rev 6614) @@ -1290,8 +1290,8 @@ keys_str += jid + ' ' + keys[jid] + ' ' gajim.config.set_per('accounts', account, 'attached_gpg_keys', keys_str) - def on_edit_groups(self, widget, contact, account): - dlg = dialogs.EditGroupsDialog(contact, account) + def on_edit_groups(self, widget, list_): + dlg = dialogs.EditGroupsDialog(list_) dlg.run() def on_history(self, widget, contact, account): @@ -1444,8 +1444,8 @@ assign_openpgp_key_menuitem.set_no_show_all(False) add_to_roster_menuitem.hide() add_to_roster_menuitem.set_no_show_all(True) - edit_groups_menuitem.connect('activate', self.on_edit_groups, contact, - account) + edit_groups_menuitem.connect('activate', self.on_edit_groups, [( + contact,account)]) if gajim.config.get('usegpg'): assign_openpgp_key_menuitem.connect('activate', @@ -1592,6 +1592,10 @@ invite_item.set_submenu(sub_menu) menu.append(invite_item) + edit_groups_item = gtk.MenuItem(_('Edit _Groups')) + menu.append(edit_groups_item) + edit_groups_item.connect('activate', self.on_edit_groups, list_) + # unsensitive if one account is not connected if one_account_offline: remove_item.set_sensitive(False)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2006