Commits January 2010

commits@gajim.org

7 participants
107 discussions

gajim: fix completion dict in history window. see #5564
by Yann Leboulanger 29 Jan '10

29 Jan '10

changeset cbcb30a77ac6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cbcb30a77ac6 description: fix completion dict in history window. see #5564 diffstat: src/gtkgui_helpers.py | 4 ++-- src/history_window.py | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diffs (46 lines): diff -r 7bab6bd269ea -r cbcb30a77ac6 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Fri Jan 15 20:15:59 2010 +0100 +++ b/src/gtkgui_helpers.py Fri Jan 29 22:29:25 2010 +0100 @@ -73,11 +73,11 @@ liststore = gtk.ListStore(gtk.gdk.Pixbuf, str) render_pixbuf = gtk.CellRendererPixbuf() - completion.pack_start(render_pixbuf, expand = False) + completion.pack_start(render_pixbuf, expand=False) completion.add_attribute(render_pixbuf, 'pixbuf', 0) render_text = gtk.CellRendererText() - completion.pack_start(render_text, expand = True) + completion.pack_start(render_text, expand=True) completion.add_attribute(render_text, 'text', 1) completion.set_property('text_column', 1) completion.set_model(liststore) diff -r 7bab6bd269ea -r cbcb30a77ac6 src/history_window.py --- a/src/history_window.py Fri Jan 15 20:15:59 2010 +0100 +++ b/src/history_window.py Fri Jan 29 22:29:25 2010 +0100 @@ -145,14 +145,13 @@ # Add all jids in logs.db: db_jids = gajim.logger.get_jids_in_db() - self.completion_dict = dict.fromkeys(db_jids) + completion_dict = dict.fromkeys(db_jids) self.accounts_seen_online = gajim.contacts.get_accounts()[:] # Enhance contacts of online accounts with contact. Needed for mapping below for account in self.accounts_seen_online: - self.completion_dict.update( - helpers.get_contact_dict_for_account(account)) + completion_dict.update(helpers.get_contact_dict_for_account(account)) muc_active_img = gtkgui_helpers.load_icon('muc_active') contact_img = gajim.interface.jabber_state_images['16']['online'] @@ -171,7 +170,7 @@ # Warning : This for is time critical with big DB for key in keys: completed = key - contact = self.completion_dict[completed] + contact = completion_dict[completed] if contact: info_name = contact.get_shown_name() info_completion = info_name

1 0

gajim: don't mix TextTag and tag names in buffer.insert_with_tag...
by Yann Leboulanger 29 Jan '10

29 Jan '10

changeset b3fda919309b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b3fda919309b description: don't mix TextTag and tag names in buffer.insert_with_tags. Fixes #5581 diffstat: src/conversation_textview.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 9578b872fdf0 -r b3fda919309b src/conversation_textview.py --- a/src/conversation_textview.py Fri Jan 29 19:47:52 2010 +0100 +++ b/src/conversation_textview.py Fri Jan 29 21:59:13 2010 +0100 @@ -1158,7 +1158,10 @@ all_tags = tags[:] if use_other_tags: all_tags += other_tags - buffer_.insert_with_tags_by_name(end_iter, special_text, *all_tags) + # convert all names to TextTag + ttt = buffer_.get_tag_table() + all_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in all_tags] + buffer_.insert_with_tags(end_iter, special_text, *all_tags) def print_empty_line(self): buffer_ = self.tv.get_buffer()

1 0

gajim: add missing function. Fixes #5585
by Yann Leboulanger 29 Jan '10

29 Jan '10

changeset 9578b872fdf0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9578b872fdf0 description: add missing function. Fixes #5585 diffstat: src/common/account.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 64e26959cbc8 -r 9578b872fdf0 src/common/account.py --- a/src/common/account.py Fri Jan 29 19:40:15 2010 +0100 +++ b/src/common/account.py Fri Jan 29 19:47:52 2010 +0100 @@ -25,6 +25,9 @@ self.contacts = contacts self.gc_contacts = gc_contacts + def change_contact_jid(self, old_jid, new_jid): + self.contacts.change_contact_jid(old_jid, new_jid) + def __repr__(self): return self.name

1 0

gajim: allow default status message to be on several lines. Fixe...
by Yann Leboulanger 29 Jan '10

29 Jan '10

changeset 64e26959cbc8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=64e26959cbc8 description: allow default status message to be on several lines. Fixes #5580 diffstat: src/config.py | 2 ++ src/roster_window.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diffs (34 lines): diff -r cf5d98f592da -r 64e26959cbc8 src/config.py --- a/src/config.py Fri Jan 29 19:16:48 2010 +0100 +++ b/src/config.py Fri Jan 29 19:40:15 2010 +0100 @@ -1026,6 +1026,7 @@ status.sort() for status_ in status: msg = gajim.config.get_per('defaultstatusmsg', status_, 'message') + msg = helpers.from_one_line(msg) enabled = gajim.config.get_per('defaultstatusmsg', status_, 'enabled') iter_ = model.append() uf_show = helpers.get_uf_show(status_) @@ -1043,6 +1044,7 @@ def on_default_msg_treemodel_row_changed(self, model, path, iter_): status = model[iter_][0] message = model[iter_][2].decode('utf-8') + message = helpers.to_one_line(message) gajim.config.set_per('defaultstatusmsg', status, 'enabled', model[iter_][3]) gajim.config.set_per('defaultstatusmsg', status, 'message', message) diff -r cf5d98f592da -r 64e26959cbc8 src/roster_window.py --- a/src/roster_window.py Fri Jan 29 19:16:48 2010 +0100 +++ b/src/roster_window.py Fri Jan 29 19:40:15 2010 +0100 @@ -2136,8 +2136,9 @@ 'mood': '', 'mood_text': ''} if show in gajim.config.get_per('defaultstatusmsg'): if gajim.config.get_per('defaultstatusmsg', show, 'enabled'): - on_response(gajim.config.get_per('defaultstatusmsg', show, - 'message'), empty_pep) + msg = gajim.config.get_per('defaultstatusmsg', show, 'message') + msg = helpers.from_one_line(msg) + on_response(msg, empty_pep) return if not always_ask and ((show == 'online' and not gajim.config.get( 'ask_online_status')) or (show in ('offline', 'invisible') and not \

1 0

gajim: fix groups combobox in add contact dialog. Fixes #5584
by Yann Leboulanger 29 Jan '10

29 Jan '10

changeset cf5d98f592da in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cf5d98f592da description: fix groups combobox in add contact dialog. Fixes #5584 diffstat: data/gui/add_new_contact_window.ui | 11 +++-------- src/dialogs.py | 2 -- 2 files changed, 3 insertions(+), 10 deletions(-) diffs (40 lines): diff -r e9d5e49cdc6c -r cf5d98f592da data/gui/add_new_contact_window.ui --- a/data/gui/add_new_contact_window.ui Fri Jan 29 19:02:54 2010 +0100 +++ b/data/gui/add_new_contact_window.ui Fri Jan 29 19:16:48 2010 +0100 @@ -196,13 +196,8 @@ <child> <object class="GtkComboBoxEntry" id="group_comboboxentry"> <property name="visible">True</property> - <property name="model">liststore1</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> + <property name="model">groups_liststore</property> + <property name="text_column">0</property> </object> <packing> <property name="left_attach">1</property> @@ -375,7 +370,7 @@ <object class="GtkTextBuffer" id="textbuffer1"> <property name="text" translatable="yes">I would like to add you to my contact list.</property> </object> - <object class="GtkListStore" id="liststore1"> + <object class="GtkListStore" id="groups_liststore"> <columns>  <column type="gchararray"/> diff -r e9d5e49cdc6c -r cf5d98f592da src/dialogs.py --- a/src/dialogs.py Fri Jan 29 19:02:54 2010 +0100 +++ b/src/dialogs.py Fri Jan 29 19:16:48 2010 +0100 @@ -896,8 +896,6 @@ if not jid_ in self.agents[type_]: self.agents[type_].append(jid_) self.available_types.append(type_) - liststore = gtk.ListStore(str) - self.group_comboboxentry.set_model(liststore) # Combobox with transport/jabber icons liststore = gtk.ListStore(str, gtk.gdk.Pixbuf, str) cell = gtk.CellRendererPixbuf()

1 0

gajim: prevent wrong spliting of db
by Yann Leboulanger 29 Jan '10

29 Jan '10

changeset e9d5e49cdc6c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e9d5e49cdc6c description: prevent wrong spliting of db diffstat: src/common/optparser.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (18 lines): diff -r a692572bfbbb -r e9d5e49cdc6c src/common/optparser.py --- a/src/common/optparser.py Fri Jan 29 15:20:23 2010 +0100 +++ b/src/common/optparser.py Fri Jan 29 19:02:54 2010 +0100 @@ -890,9 +890,14 @@ con = sqlite.connect(logger.LOG_DB_FILE) os.chdir(back) cur = con.cursor() + cur.execute('''SELECT name FROM sqlite_master WHERE type = 'table';''') + tables = cur.fetchall() # we get [(u'jids',), (u'unread_messages',), ... + tables = [t[0] for t in tables] cur.execute("ATTACH DATABASE '%s' AS cache" % logger.CACHE_DB_PATH) for table in ('caps_cache', 'rooms_last_message_time', 'roster_entry', 'roster_group', 'transports_cache'): + if table not in tables: + continue try: cur.executescript( 'INSERT INTO cache.%s SELECT * FROM %s;' % (table, table))

1 0

gajim: missing import and incomplete error message. Fixes #5583
by Yann Leboulanger 29 Jan '10

29 Jan '10

changeset a692572bfbbb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a692572bfbbb description: missing import and incomplete error message. Fixes #5583 diffstat: src/common/optparser.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (23 lines): diff -r 3372b574e372 -r a692572bfbbb src/common/optparser.py --- a/src/common/optparser.py Fri Jan 29 11:25:06 2010 +0100 +++ b/src/common/optparser.py Fri Jan 29 15:20:23 2010 +0100 @@ -27,6 +27,7 @@ ## import os +import sys import locale import re from time import time @@ -898,8 +899,9 @@ con.commit() cur.executescript('DROP TABLE %s;' % table) con.commit() - except sqlite.OperationalError: - print >> sys.stderr, 'error moving table %s to cache.db' + except sqlite.OperationalError, e: + print >> sys.stderr, 'error moving table %s to cache.db: %s' % \ + (table, str(e)) con.close() gajim.config.set('version', '0.13.10.2')

1 0

gajim: split logs.db into logs.db and cache.db. Fixes #2845
by Yann Leboulanger 29 Jan '10

29 Jan '10

changeset 3372b574e372 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3372b574e372 description: split logs.db into logs.db and cache.db. Fixes #2845 diffstat: configure.ac | 2 +- src/common/check_paths.py | 33 ++++++++++++++++++++++++++++----- src/common/configpaths.py | 10 +++++----- src/common/defs.py | 2 +- src/common/logger.py | 12 ++++++++++++ src/common/optparser.py | 23 +++++++++++++++++++++++ 6 files changed, 70 insertions(+), 12 deletions(-) diffs (189 lines): diff -r 69da706a7ea9 -r 3372b574e372 configure.ac --- a/configure.ac Wed Jan 27 17:23:37 2010 +0100 +++ b/configure.ac Fri Jan 29 11:25:06 2010 +0100 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.13.10.1-dev],[http://trac.gajim.org/],[gajim]) + [0.13.10.2-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) diff -r 69da706a7ea9 -r 3372b574e372 src/common/check_paths.py --- a/src/common/check_paths.py Wed Jan 27 17:23:37 2010 +0100 +++ b/src/common/check_paths.py Fri Jan 29 11:25:06 2010 +0100 @@ -63,11 +63,6 @@ CREATE INDEX idx_unread_messages_jid_id ON unread_messages (jid_id); - CREATE TABLE transports_cache ( - transport TEXT UNIQUE, - type INTEGER - ); - CREATE TABLE logs( log_line_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, jid_id INTEGER, @@ -80,6 +75,23 @@ ); CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC); + ''' + ) + + con.commit() + con.close() + +def create_cache_db(): + print _('creating cache database') + con = sqlite.connect(logger.CACHE_DB_PATH) + os.chmod(logger.CACHE_DB_PATH, 0600) # rw only for us + cur = con.cursor() + cur.executescript( + ''' + CREATE TABLE transports_cache ( + transport TEXT UNIQUE, + type INTEGER + ); CREATE TABLE caps_cache ( hash_method TEXT, @@ -115,6 +127,7 @@ def check_and_possibly_create_paths(): LOG_DB_PATH = logger.LOG_DB_PATH + CACHE_DB_PATH = logger.CACHE_DB_PATH VCARD_PATH = gajim.VCARD_PATH AVATAR_PATH = gajim.AVATAR_PATH dot_gajim = os.path.dirname(VCARD_PATH) @@ -149,6 +162,13 @@ print _('Gajim will now exit') sys.exit() + if not os.path.exists(CACHE_DB_PATH): + create_cache_db() + elif os.path.isdir(CACHE_DB_PATH): + print _('%s is a directory but should be a file') % CACHE_DB_PATH + print _('Gajim will now exit') + sys.exit() + else: # dot_gajim doesn't exist if dot_gajim: # is '' on win9x so avoid that create_path(dot_gajim) @@ -159,6 +179,9 @@ if not os.path.isfile(LOG_DB_PATH): create_log_db() gajim.logger.init_vars() + if not os.path.isfile(CACHE_DB_PATH): + create_cache_db() + gajim.logger.attach_cache_database() def create_path(directory): print _('creating %s directory') % directory diff -r 69da706a7ea9 -r 3372b574e372 src/common/configpaths.py --- a/src/common/configpaths.py Wed Jan 27 17:23:37 2010 +0100 +++ b/src/common/configpaths.py Fri Jan 29 11:25:06 2010 +0100 @@ -105,11 +105,11 @@ self.root = root # LOG is deprecated - k = ( 'LOG', 'LOG_DB', 'VCARD', 'AVATAR', 'MY_EMOTS', - 'MY_ICONSETS', 'MY_MOOD_ICONSETS', - 'MY_ACTIVITY_ICONSETS', 'MY_CACERTS') - v = (u'logs', u'logs.db', u'vcards', u'avatars', u'emoticons', - u'iconsets', u'moods', u'activities', u'cacerts.pem') + k = ( 'LOG', 'LOG_DB', 'CACHE_DB', 'VCARD', 'AVATAR', 'MY_EMOTS', + 'MY_ICONSETS', 'MY_MOOD_ICONSETS', 'MY_ACTIVITY_ICONSETS', + 'MY_CACERTS') + v = (u'logs', u'logs.db', u'cache.db', u'vcards', u'avatars', + u'emoticons', u'iconsets', u'moods', u'activities', u'cacerts.pem') if os.name == 'nt': v = [x.capitalize() for x in v] diff -r 69da706a7ea9 -r 3372b574e372 src/common/defs.py --- a/src/common/defs.py Wed Jan 27 17:23:37 2010 +0100 +++ b/src/common/defs.py Fri Jan 29 11:25:06 2010 +0100 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.13.10.1-dev' +version = '0.13.10.2-dev' import sys, os.path for base in ('.', 'common'): diff -r 69da706a7ea9 -r 3372b574e372 src/common/logger.py --- a/src/common/logger.py Wed Jan 27 17:23:37 2010 +0100 +++ b/src/common/logger.py Fri Jan 29 11:25:06 2010 +0100 @@ -43,6 +43,7 @@ import configpaths LOG_DB_PATH = configpaths.gajimpaths['LOG_DB'] LOG_DB_FOLDER, LOG_DB_FILE = os.path.split(LOG_DB_PATH) +CACHE_DB_PATH = configpaths.gajimpaths['CACHE_DB'] class Constants: def __init__(self): @@ -107,6 +108,11 @@ # db is not created here but in src/common/checks_paths.py return self.init_vars() + if not os.path.exists(CACHE_DB_PATH): + # this can happen cache database is not present when gajim is launched + # db will be created in src/common/checks_paths.py + return + self.attach_cache_database() def close_db(self): if self.con: @@ -132,6 +138,12 @@ self.cur = self.con.cursor() self.set_synchronous(False) + def attach_cache_database(self): + try: + self.cur.execute("ATTACH DATABASE '%s' AS cache" % CACHE_DB_PATH) + except sqlite.Error, e: + gajim.log.debug("Failed to attach cache database: %s" % str(e)) + def set_synchronous(self, sync): try: if sync: diff -r 69da706a7ea9 -r 3372b574e372 src/common/optparser.py --- a/src/common/optparser.py Wed Jan 27 17:23:37 2010 +0100 +++ b/src/common/optparser.py Fri Jan 29 11:25:06 2010 +0100 @@ -216,8 +216,11 @@ self.update_config_to_013100() if old < [0, 13, 10, 1] and new >= [0, 13, 10, 1]: self.update_config_to_013101() + if old < [0, 13, 10, 2] and new >= [0, 13, 10, 2]: + self.update_config_to_013102() gajim.logger.init_vars() + gajim.logger.attach_cache_database() gajim.config.set('version', new_version) caps_cache.capscache.initialize_from_db() @@ -880,4 +883,24 @@ con.close() gajim.config.set('version', '0.13.10.1') + def update_config_to_013102(self): + back = os.getcwd() + os.chdir(logger.LOG_DB_FOLDER) + con = sqlite.connect(logger.LOG_DB_FILE) + os.chdir(back) + cur = con.cursor() + cur.execute("ATTACH DATABASE '%s' AS cache" % logger.CACHE_DB_PATH) + for table in ('caps_cache', 'rooms_last_message_time', 'roster_entry', + 'roster_group', 'transports_cache'): + try: + cur.executescript( + 'INSERT INTO cache.%s SELECT * FROM %s;' % (table, table)) + con.commit() + cur.executescript('DROP TABLE %s;' % table) + con.commit() + except sqlite.OperationalError: + print >> sys.stderr, 'error moving table %s to cache.db' + con.close() + gajim.config.set('version', '0.13.10.2') + # vim: se ts=3:

1 0

gajim: improve subscription request message, ability to save it....
by Yann Leboulanger 27 Jan '10

27 Jan '10

changeset 69da706a7ea9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=69da706a7ea9 description: improve subscription request message, ability to save it. Fixes #2176 diffstat: data/gui/add_new_contact_window.ui | 20 +++++++++++-- src/common/config.py | 1 + src/common/connection_handlers.py | 6 ++-- src/common/helpers.py | 24 ++++++++++++++++ src/dialogs.py | 54 +++++++++++++++++++++++++------------ 5 files changed, 81 insertions(+), 24 deletions(-) diffs (272 lines): diff -r 4f78a9e08b3a -r 69da706a7ea9 data/gui/add_new_contact_window.ui --- a/data/gui/add_new_contact_window.ui Tue Jan 26 19:55:28 2010 +0100 +++ b/data/gui/add_new_contact_window.ui Wed Jan 27 17:23:37 2010 +0100 @@ -44,6 +44,7 @@ <object class="GtkComboBox" id="account_combobox"> <property name="visible">True</property> <property name="model">liststore3</property> + <signal name="changed" handler="on_account_combobox_changed"/> <child> <object class="GtkCellRendererText" id="cellrenderertext3"/> <attributes> @@ -257,6 +258,19 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="save_message_checkbutton"> + <property name="label" translatable="yes">_Save subscription message</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="position">6</property> + </packing> + </child> + <child> <object class="GtkHBox" id="register_hbox"> <property name="visible">True</property> <property name="no_show_all">True</property> @@ -293,7 +307,7 @@ </child> </object> <packing> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -306,7 +320,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -352,7 +366,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> </object> diff -r 4f78a9e08b3a -r 69da706a7ea9 src/common/config.py --- a/src/common/config.py Tue Jan 26 19:55:28 2010 +0100 +++ b/src/common/config.py Wed Jan 27 17:23:37 2010 +0100 @@ -365,6 +365,7 @@ 'log_encrypted_sessions': [opt_bool, True, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')], 'send_idle_time': [ opt_bool, True ], 'roster_version': [opt_str, ''], + 'subscription_request_msg': [opt_str, '', _('Message that is sent to contacts you want to add')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ], diff -r 4f78a9e08b3a -r 69da706a7ea9 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jan 26 19:55:28 2010 +0100 +++ b/src/common/connection_handlers.py Wed Jan 27 17:23:37 2010 +0100 @@ -437,7 +437,7 @@ except IOError, e: self.dispatch('ERROR', (_('Disk Write Error'), str(e))) - def get_cached_vcard(self, fjid, is_fake_jid = False): + def get_cached_vcard(self, fjid, is_fake_jid=False): """ Return the vcard as a dict. Return {} if vcard was too old. @@ -457,7 +457,7 @@ c = f.read() f.close() try: - card = common.xmpp.Node(node = c) + card = common.xmpp.Node(node=c) except Exception: # We are unable to parse it. Remove it os.remove(path_to_file) @@ -469,7 +469,7 @@ elif 'SHA' in vcard['PHOTO']: cached_sha = vcard['PHOTO']['SHA'] if jid in self.vcard_shas and self.vcard_shas[jid] != \ - cached_sha: + cached_sha: # user change his vcard so don't use the cached one return {} vcard['jid'] = jid diff -r 4f78a9e08b3a -r 69da706a7ea9 src/common/helpers.py --- a/src/common/helpers.py Tue Jan 26 19:55:28 2010 +0100 +++ b/src/common/helpers.py Wed Jan 27 17:23:37 2010 +0100 @@ -41,6 +41,7 @@ import caps_cache from encodings.punycode import punycode_encode +from string import Template from i18n import Q_ from i18n import ngettext @@ -1329,4 +1330,27 @@ return ((group in gajim.connections[account].blocked_groups) or \ gajim.connections[account].blocked_all) +def get_subscription_request_msg(account=None): + s = gajim.config.get_per('accounts', account, 'subscription_request_msg') + if s: + return s + s = _('I would like to add you to my contact list.') + if account: + s = _('Hello, I am $name.') + ' ' + s + our_jid = gajim.get_jid_from_account(account) + vcard = gajim.connections[account].get_cached_vcard(our_jid) + name = '' + if 'N' in vcard: + if 'GIVEN' in vcard['N'] and 'FAMILY' in vcard['N']: + name = vcard['N']['GIVEN'] + ' ' + vcard['N']['FAMILY'] + if not name: + if 'FN' in vcard: + name = vcard['FN'] + nick = gajim.nicks[account] + if name and nick: + name += ' (%s)' % nick + elif nick: + name = nick + s = Template(s).safe_substitute({'name': name}) + return s # vim: se ts=3: diff -r 4f78a9e08b3a -r 69da706a7ea9 src/dialogs.py --- a/src/dialogs.py Tue Jan 26 19:55:28 2010 +0100 +++ b/src/dialogs.py Wed Jan 27 17:23:37 2010 +0100 @@ -827,11 +827,11 @@ """ uid_labels = {'jabber': _('Jabber ID:'), - 'aim': _('AIM Address:'), - 'gadu-gadu': _('GG Number:'), - 'icq': _('ICQ Number:'), - 'msn': _('MSN Address:'), - 'yahoo': _('Yahoo! Address:')} + 'aim': _('AIM Address:'), + 'gadu-gadu': _('GG Number:'), + 'icq': _('ICQ Number:'), + 'msn': _('MSN Address:'), + 'yahoo': _('Yahoo! Address:')} def __init__(self, account=None, jid=None, user_nick=None, group=None): self.account = account @@ -860,17 +860,18 @@ self.xml.connect_signals(self) self.window = self.xml.get_object('add_new_contact_window') for w in ('account_combobox', 'account_hbox', 'account_label', - 'uid_label', 'uid_entry', 'protocol_combobox', 'protocol_jid_combobox', - 'protocol_hbox', 'nickname_entry', 'message_scrolledwindow', - 'register_hbox', 'subscription_table', 'add_button', - 'message_textview', 'connected_label', 'group_comboboxentry', - 'auto_authorize_checkbutton'): + 'uid_label', 'uid_entry', 'protocol_combobox', 'protocol_jid_combobox', + 'protocol_hbox', 'nickname_entry', 'message_scrolledwindow', + 'save_message_checkbutton', 'register_hbox', 'subscription_table', + 'add_button', 'message_textview', 'connected_label', + 'group_comboboxentry', 'auto_authorize_checkbutton'): self.__dict__[w] = self.xml.get_object(w) if account and len(gajim.connections) >= 2: - prompt_text =\ -_('Please fill in the data of the contact you want to add in account %s') %account + prompt_text = \ +_('Please fill in the data of the contact you want to add in account %s') % account else: - prompt_text = _('Please fill in the data of the contact you want to add') + prompt_text = \ + _('Please fill in the data of the contact you want to add') self.xml.get_object('prompt_label').set_text(prompt_text) self.agents = {'jabber': []} # types to which we are not subscribed but account has an agent for it @@ -908,7 +909,7 @@ self.protocol_combobox.add_attribute(cell, 'text', 0) self.protocol_combobox.set_model(liststore) uf_type = {'jabber': 'Jabber', 'aim': 'AIM', 'gadu-gadu': 'Gadu Gadu', - 'icq': 'ICQ', 'msn': 'MSN', 'yahoo': 'Yahoo'} + 'icq': 'ICQ', 'msn': 'MSN', 'yahoo': 'Yahoo'} # Jabber as first img = gajim.interface.jabber_state_images['16']['online'] liststore.append(['Jabber', img.get_pixbuf(), 'jabber']) @@ -938,7 +939,7 @@ else: uid, transport = gajim.get_name_and_server_from_jid(jid) self.uid_entry.set_text(uid.replace('%', '@', 1)) - #set protocol_combobox + # set protocol_combobox model = self.protocol_combobox.get_model() iter_ = model.get_iter_first() i = 0 @@ -990,6 +991,11 @@ self.account_combobox.set_model(liststore) self.account_combobox.set_active(0) + if self.account: + message_buffer = self.message_textview.get_buffer() + message_buffer.set_text(helpers.get_subscription_request_msg( + self.account)) + def on_add_new_contact_window_destroy(self, widget): if self.account: location = gajim.interface.instances[self.account] @@ -1058,7 +1064,7 @@ c = gajim.contacts.get_first_contact_from_jid(self.account, jid) if _('Not in Roster') not in c.groups and c.sub in ('both', 'to'): ErrorDialog(_('Contact already in roster'), - _('This contact is already listed in your roster.')) + _('This contact is already listed in your roster.')) return if type_ == 'jabber': @@ -1066,6 +1072,9 @@ start_iter = message_buffer.get_start_iter() end_iter = message_buffer.get_end_iter() message = message_buffer.get_text(start_iter, end_iter).decode('utf-8') + if self.save_message_checkbutton.get_active(): + gajim.config.set_per('accounts', self.account, + 'subscription_request_msg', message) else: message= '' group = self.group_comboboxentry.child.get_text().decode('utf-8') @@ -1074,9 +1083,16 @@ groups = [group] auto_auth = self.auto_authorize_checkbutton.get_active() gajim.interface.roster.req_sub(self, jid, message, self.account, - groups = groups, nickname = nickname, auto_auth = auto_auth) + groups=groups, nickname=nickname, auto_auth=auto_auth) self.window.destroy() + def on_account_combobox_changed(self, widget): + model = widget.get_model() + iter_ = widget.get_active_iter() + account = model[iter_][0] + message_buffer = self.message_textview.get_buffer() + message_buffer.set_text(helpers.get_subscription_request_msg(account)) + def on_protocol_combobox_changed(self, widget): model = widget.get_model() iter_ = widget.get_active_iter() @@ -1097,8 +1113,10 @@ self.uid_label.set_text(_('User ID:')) if type_ == 'jabber': self.message_scrolledwindow.show() + self.save_message_checkbutton.show() else: self.message_scrolledwindow.hide() + self.save_message_checkbutton.hide() if type_ in self.available_types: self.register_hbox.show() self.auto_authorize_checkbutton.hide() @@ -1110,7 +1128,7 @@ if type_ != 'jabber': jid = self.protocol_jid_combobox.get_active_text() contact = gajim.contacts.get_first_contact_from_jid(self.account, - jid) + jid) if contact.show in ('offline', 'error'): self.subscription_table.hide() self.connected_label.show()

1 0

gajim: use Ctrl + Shift + n to change nick in groupchats. Fixes ...
by Yann Leboulanger 26 Jan '10

26 Jan '10

changeset 4f78a9e08b3a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4f78a9e08b3a description: use Ctrl + Shift + n to change nick in groupchats. Fixes #5450 diffstat: src/groupchat_control.py | 4 ++-- src/message_window.py | 16 +++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diffs (67 lines): diff -r 2f21c6382990 -r 4f78a9e08b3a src/groupchat_control.py --- a/src/groupchat_control.py Tue Jan 26 15:41:13 2010 +0100 +++ b/src/groupchat_control.py Tue Jan 26 19:55:28 2010 +0100 @@ -688,7 +688,7 @@ ag = gtk.accel_groups_from_object(self.parent_win.window)[0] change_nick_menuitem.add_accelerator('activate', ag, gtk.keysyms.n, - gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) + gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK, gtk.ACCEL_VISIBLE) change_subject_menuitem.add_accelerator('activate', ag, gtk.keysyms.t, gtk.gdk.MOD1_MASK, gtk.ACCEL_VISIBLE) bookmark_room_menuitem.add_accelerator('activate', ag, gtk.keysyms.b, @@ -760,7 +760,7 @@ # destroy accelerators ag = gtk.accel_groups_from_object(self.parent_win.window)[0] change_nick_menuitem.remove_accelerator(ag, gtk.keysyms.n, - gtk.gdk.CONTROL_MASK) + gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK) change_subject_menuitem.remove_accelerator(ag, gtk.keysyms.t, gtk.gdk.MOD1_MASK) bookmark_room_menuitem.remove_accelerator(ag, gtk.keysyms.b, diff -r 2f21c6382990 -r 4f78a9e08b3a src/message_window.py --- a/src/message_window.py Tue Jan 26 15:41:13 2010 +0100 +++ b/src/message_window.py Tue Jan 26 19:55:28 2010 +0100 @@ -101,8 +101,8 @@ self.handlers[id_] = self.window keys=['<Control>f', '<Control>g', '<Control>h', '<Control>i', - '<Control>l', '<Control>L', '<Control>n', '<Control>u', - '<Control>b', '<Control><Shift>Tab', '<Control>Tab', '<Control>F4', + '<Control>l', '<Control>L', '<Control><Shift>n', '<Control>u', + '<Control>b', '<Control>F4', '<Control>w', '<Control>Page_Up', '<Control>Page_Down', '<Alt>Right', '<Alt>Left', '<Alt>d', '<Alt>c', '<Alt>m', '<Alt>t', 'Escape'] + \ ['<Alt>'+str(i) for i in xrange(10)] @@ -352,19 +352,12 @@ control._on_contact_information_menuitem_activate(None) elif keyval == gtk.keysyms.l or keyval == gtk.keysyms.L: # CTRL + l|L control.conv_textview.clear() - elif control.type_id == message_control.TYPE_GC and \ - keyval == gtk.keysyms.n: # CTRL + n - control._on_change_nick_menuitem_activate(None) elif keyval == gtk.keysyms.u: # CTRL + u: emacs style clear line control.clear(control.msg_textview) elif control.type_id == message_control.TYPE_GC and \ keyval == gtk.keysyms.b: # CTRL + b control._on_bookmark_room_menuitem_activate(None) # Tab switch bindings - elif keyval == gtk.keysyms.ISO_Left_Tab: # CTRL + SHIFT + TAB - self.move_to_next_unread_tab(False) - elif keyval == gtk.keysyms.Tab: # CTRL + TAB - self.move_to_next_unread_tab(True) elif keyval == gtk.keysyms.F4: # CTRL + F4 self.remove_tab(control, self.CLOSE_CTRL_KEY) elif keyval == gtk.keysyms.w: # CTRL + w @@ -383,6 +376,11 @@ event.keyval = int(keyval) self.notebook.emit('key_press_event', event) + if modifier & gtk.gdk.SHIFT_MASK: + # CTRL + SHIFT + if control.type_id == message_control.TYPE_GC and \ + keyval == gtk.keysyms.n: # CTRL + SHIFT + n + control._on_change_nick_menuitem_activate(None) # MOD1 (ALT) mask elif modifier & gtk.gdk.MOD1_MASK: # Tab switch bindings

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2010