Commits August 2009

commits@gajim.org

4 participants
84 discussions

gajim: when a JID is invalid in member / admin / ... list in MUC...
by Yann Leboulanger 31 Aug '09

31 Aug '09

changeset 1414ce24a45d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1414ce24a45d description: when a JID is invalid in member / admin / ... list in MUC configuration, just ignore this JID and not all others. Fixes #5241 diffstat: src/common/connection_handlers.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 9ef0bfaa101f -r 1414ce24a45d src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Aug 31 21:57:01 2009 +0200 +++ b/src/common/connection_handlers.py Mon Aug 31 23:04:54 2009 +0200 @@ -2482,7 +2482,8 @@ def _MucAdminCB(self, con, iq_obj): log.debug('MucAdminCB') - items = iq_obj.getTag('query', namespace = common.xmpp.NS_MUC_ADMIN).getTags('item') + items = iq_obj.getTag('query', namespace=common.xmpp.NS_MUC_ADMIN).\ + getTags('item') users_dict = {} for item in items: if item.has_attr('jid') and item.has_attr('affiliation'): @@ -2490,7 +2491,7 @@ jid = helpers.parse_jid(item.getAttr('jid')) except common.helpers.InvalidFormat: log.warn('Invalid JID: %s, ignoring it' % item.getAttr('jid')) - return + continue affiliation = item.getAttr('affiliation') users_dict[jid] = {'affiliation': affiliation} if item.has_attr('nick'): @@ -2502,7 +2503,7 @@ users_dict[jid]['reason'] = reason self.dispatch('GC_AFFILIATION', (helpers.get_full_jid_from_iq(iq_obj), - users_dict)) + users_dict)) def _MucErrorCB(self, con, iq_obj): log.debug('MucErrorCB')

1 0

gajim: connect to server even if it doesn't support disco
by Yann Leboulanger 31 Aug '09

31 Aug '09

changeset 9ef0bfaa101f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9ef0bfaa101f description: connect to server even if it doesn't support disco diffstat: src/common/connection_handlers.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r f4239a189c3c -r 9ef0bfaa101f src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Aug 31 21:45:52 2009 +0200 +++ b/src/common/connection_handlers.py Mon Aug 31 21:57:01 2009 +0200 @@ -832,6 +832,11 @@ def _DiscoverInfoErrorCB(self, con, iq_obj): log.debug('DiscoverInfoErrorCB') jid = helpers.get_full_jid_from_iq(iq_obj) + id_ = iq_obj.getID() + if id_[:6] == 'Gajim_': + if not self.privacy_rules_requested: + self.privacy_rules_requested = True + self._request_privacy() self.dispatch('AGENT_ERROR_INFO', (jid)) def _DiscoverInfoCB(self, con, iq_obj):

1 0

gajim: show list-multi in a treeview when there are too much opt...
by Yann Leboulanger 31 Aug '09

31 Aug '09

changeset f4239a189c3c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f4239a189c3c description: show list-multi in a treeview when there are too much options. Fixes #3046 diffstat: src/dataforms_widget.py | 32 +++++++++++++++++++++++++------- src/gtkgui_helpers.py | 20 +++++++++++++++++++- 2 files changed, 44 insertions(+), 8 deletions(-) diffs (73 lines): diff -r 73ef08ed75aa -r f4239a189c3c src/dataforms_widget.py --- a/src/dataforms_widget.py Mon Aug 31 00:11:57 2009 +0200 +++ b/src/dataforms_widget.py Mon Aug 31 21:45:52 2009 +0200 @@ -370,14 +370,32 @@ elif field.type == 'list-multi': # TODO: When more than few choices, make a list - widget = gtk.VBox() - for value, label in field.iter_options(): - check = gtk.CheckButton(label, use_underline=False) - check.set_active(value in field.values) - check.connect('toggled', self.on_list_multi_checkbutton_toggled, - field, value) - widget.set_sensitive(readwrite) + if len(field.options) < 6: + # 5 option max: show checkbutton + widget = gtk.VBox() + for value, label in field.iter_options(): + check = gtk.CheckButton(label, use_underline=False) + check.set_active(value in field.values) + check.connect('toggled', + self.on_list_multi_checkbutton_toggled, field, value) widget.pack_start(check, expand=False) + else: + # more than 5 options: show combobox + def on_list_multi_treeview_changed(selection, f): + def for_selected(treemodel, path, iter): + vals.append(treemodel[iter][1]) + vals = [] + selection.selected_foreach(for_selected) + field.values = vals[:] + widget = gtk.ScrolledWindow() + widget.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + tv = gtkgui_helpers.create_list_multi(field.options, + field.values) + widget.add(tv) + widget.set_size_request(-1, 120) + tv.get_selection().connect('changed', + on_list_multi_treeview_changed, field) + widget.set_sensitive(readwrite) elif field.type == 'jid-single': widget = gtk.Entry() diff -r 73ef08ed75aa -r f4239a189c3c src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Mon Aug 31 00:11:57 2009 +0200 +++ b/src/gtkgui_helpers.py Mon Aug 31 21:45:52 2009 +0200 @@ -863,7 +863,25 @@ combobox.show_all() return combobox -def load_iconset(path, pixbuf2 = None, transport = False): +def create_list_multi(value_list, selected_values=None): + '''Value_list is [(label1, value1), ]''' + liststore = gtk.ListStore(str, str) + treeview = gtk.TreeView(liststore) + treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE) + treeview.set_headers_visible(False) + col = gtk.TreeViewColumn() + treeview.append_column(col) + cell = gtk.CellRendererText() + col.pack_start(cell, True) + col.set_attributes(cell, text=0) + for value in value_list: + iter = liststore.append(value) + if value[1] in selected_values: + treeview.get_selection().select_iter(iter) + treeview.show_all() + return treeview + +def load_iconset(path, pixbuf2=None, transport=False): '''load full iconset from the given path, and add pixbuf2 on top left of each static images''' path += '/'

1 0

gajim: reset shown unread message after database has been updated
by Yann Leboulanger 30 Aug '09

30 Aug '09

changeset 73ef08ed75aa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=73ef08ed75aa description: reset shown unread message after database has been updated diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (19 lines): diff -r 2f1602943519 -r 73ef08ed75aa src/gajim.py --- a/src/gajim.py Sun Aug 30 23:36:36 2009 +0200 +++ b/src/gajim.py Mon Aug 31 00:11:57 2009 +0200 @@ -3247,7 +3247,6 @@ def __init__(self): gajim.interface = self gajim.thread_interface = ThreadInterface - gajim.logger.reset_shown_unread_messages() # This is the manager and factory of message windows set by the module self.msg_win_mgr = None self.jabber_state_images = {'16': {}, '32': {}, 'opened': {}, @@ -3268,6 +3267,7 @@ } cfg_was_read = parser.read() + gajim.logger.reset_shown_unread_messages() # override logging settings from config (don't take care of '-q' option) if gajim.config.get('verbose'): logging_helpers.set_verbose()

1 0

gajim: fix error when inserting unread message
by Yann Leboulanger 30 Aug '09

30 Aug '09

changeset 2f1602943519 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2f1602943519 description: fix error when inserting unread message diffstat: src/common/logger.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r e0b8fb5be8fb -r 2f1602943519 src/common/logger.py --- a/src/common/logger.py Sun Aug 30 23:20:13 2009 +0200 +++ b/src/common/logger.py Sun Aug 30 23:36:36 2009 +0200 @@ -381,7 +381,8 @@ def insert_unread_events(self, message_id, jid_id): ''' add unread message with id: message_id''' - sql = 'INSERT INTO unread_messages VALUES (%d, %d)' % (message_id, jid_id) + sql = 'INSERT INTO unread_messages VALUES (%d, %d, 0)' % (message_id, + jid_id) self.simple_commit(sql) def set_read_messages(self, message_ids):

1 0

gajim: Don't show errors as status change in history viewer. Fix...
by Yann Leboulanger 30 Aug '09

30 Aug '09

changeset e0b8fb5be8fb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e0b8fb5be8fb description: Don't show errors as status change in history viewer. Fixes #2881 diffstat: src/history_window.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (17 lines): diff -r d07ff24ba073 -r e0b8fb5be8fb src/history_window.py --- a/src/history_window.py Sun Aug 30 22:48:45 2009 +0200 +++ b/src/history_window.py Sun Aug 30 23:20:13 2009 +0200 @@ -430,7 +430,12 @@ tag_msg = 'status' else: # 'status' # message here (if not None) is status message - if message: + if show is None: # it means error + if message: + message = _('Error: %s') % message + else: + message = _('Error') + elif message: message = _('Status is now: %(status)s: %(status_msg)s') % \ {'status': helpers.get_uf_show(show), 'status_msg': message} else:

1 0

gajim: show only once unread messages at startup when we have tw...
by Yann Leboulanger 30 Aug '09

30 Aug '09

changeset d07ff24ba073 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d07ff24ba073 description: show only once unread messages at startup when we have twice the same contact in 2 accounts. Fixes #2921 diffstat: configure.ac | 2 +- src/common/check_paths.py | 3 ++- src/common/defs.py | 2 +- src/common/logger.py | 16 ++++++++++++++-- src/common/optparser.py | 22 ++++++++++++++++++++-- src/gajim.py | 1 + src/roster_window.py | 5 ++++- 7 files changed, 43 insertions(+), 8 deletions(-) diffs (149 lines): diff -r 67e1436b24f5 -r d07ff24ba073 configure.ac --- a/configure.ac Sun Aug 30 12:03:29 2009 +0200 +++ b/configure.ac Sun Aug 30 22:48: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.1-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) diff -r 67e1436b24f5 -r d07ff24ba073 src/common/check_paths.py --- a/src/common/check_paths.py Sun Aug 30 12:03:29 2009 +0200 +++ b/src/common/check_paths.py Sun Aug 30 22:48:45 2009 +0200 @@ -64,7 +64,8 @@ CREATE TABLE unread_messages( message_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, - jid_id INTEGER + jid_id INTEGER, + shown BOOLEAN default 0 ); CREATE INDEX idx_unread_messages_jid_id ON unread_messages (jid_id); diff -r 67e1436b24f5 -r d07ff24ba073 src/common/defs.py --- a/src/common/defs.py Sun Aug 30 12:03:29 2009 +0200 +++ b/src/common/defs.py Sun Aug 30 22:48:45 2009 +0200 @@ -27,7 +27,7 @@ datadir = '../' localedir = '../po' -version = '0.12.3.1-dev' +version = '0.12.5.1-dev' import sys, os.path for base in ('.', 'common'): diff -r 67e1436b24f5 -r d07ff24ba073 src/common/logger.py --- a/src/common/logger.py Sun Aug 30 12:03:29 2009 +0200 +++ b/src/common/logger.py Sun Aug 30 22:48:45 2009 +0200 @@ -390,17 +390,29 @@ sql = 'DELETE FROM unread_messages WHERE message_id IN (%s)' % ids self.simple_commit(sql) + def set_shown_unread_msgs(self, msg_id): + ''' mark unread message as shown un GUI ''' + sql = 'UPDATE unread_messages SET shown = 1 where message_id = %s' % \ + msg_id + self.simple_commit(sql) + + def reset_shown_unread_messages(self): + ''' Set shown field to False in unread_messages table ''' + sql = 'UPDATE unread_messages SET shown = 0' + self.simple_commit(sql) + def get_unread_msgs(self): ''' get all unread messages ''' all_messages = [] try: self.cur.execute( - 'SELECT message_id from unread_messages') + 'SELECT message_id, shown from unread_messages') results = self.cur.fetchall() except Exception: pass for message in results: msg_id = message[0] + shown = message[1] # here we get infos for that message, and related jid from jids table # do NOT change order of SELECTed things, unless you change function(s) # that called this function @@ -416,7 +428,7 @@ # Log line is no more in logs table. remove it from unread_messages self.set_read_messages([msg_id]) continue - all_messages.append(results[0]) + all_messages.append(results[0] + (shown,)) return all_messages def write(self, kind, jid, message = None, show = None, tim = None, diff -r 67e1436b24f5 -r d07ff24ba073 src/common/optparser.py --- a/src/common/optparser.py Sun Aug 30 12:03:29 2009 +0200 +++ b/src/common/optparser.py Sun Aug 30 22:48:45 2009 +0200 @@ -200,6 +200,8 @@ self.update_config_to_01215() if old < [0, 12, 3, 1] and new >= [0, 12, 3, 1]: self.update_config_to_01231() + if old < [0, 12, 5, 1] and new >= [0, 12, 5, 1]: + self.update_config_to_01251() gajim.logger.init_vars() gajim.config.set('version', new_version) @@ -705,7 +707,23 @@ con.close() gajim.config.set('version', '0.12.3.1') - - + def update_config_to_01251(self): + back = os.getcwd() + os.chdir(logger.LOG_DB_FOLDER) + con = sqlite.connect(logger.LOG_DB_FILE) + os.chdir(back) + cur = con.cursor() + try: + cur.executescript( + ''' + ALTER TABLE unread_messages + ADD shown BOOLEAN default 0; + ''' + ) + con.commit() + except sqlite.OperationalError: + pass + con.close() + gajim.config.set('version', '0.12.5.1') # vim: se ts=3: diff -r 67e1436b24f5 -r d07ff24ba073 src/gajim.py --- a/src/gajim.py Sun Aug 30 12:03:29 2009 +0200 +++ b/src/gajim.py Sun Aug 30 22:48:45 2009 +0200 @@ -3247,6 +3247,7 @@ def __init__(self): gajim.interface = self gajim.thread_interface = ThreadInterface + gajim.logger.reset_shown_unread_messages() # This is the manager and factory of message windows set by the module self.msg_win_mgr = None self.jabber_state_images = {'16': {}, '32': {}, 'opened': {}, diff -r 67e1436b24f5 -r d07ff24ba073 src/roster_window.py --- a/src/roster_window.py Sun Aug 30 12:03:29 2009 +0200 +++ b/src/roster_window.py Sun Aug 30 22:48:45 2009 +0200 @@ -1654,7 +1654,9 @@ results = gajim.logger.get_unread_msgs() for result in results: jid = result[4] - if gajim.contacts.get_first_contact_from_jid(account, jid): + shown = result[5] + if gajim.contacts.get_first_contact_from_jid(account, jid) and not \ + shown: # We have this jid in our contacts list # XXX unread messages should probably have their session saved with # them @@ -1663,6 +1665,7 @@ tim = time.localtime(float(result[2])) session.roster_message(jid, result[1], tim, msg_type='chat', msg_id=result[0]) + gajim.logger.set_shown_unread_msgs(result[0]) elif (time.time() - result[2]) > 2592000: # ok, here we see that we have a message in unread messages table

1 0

gajim: fix typo. fix #5233
by Yann Leboulanger 30 Aug '09

30 Aug '09

changeset 67e1436b24f5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=67e1436b24f5 description: fix typo. fix #5233 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d2d1ac0391f6 -r 67e1436b24f5 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Aug 30 11:58:41 2009 +0200 +++ b/src/common/connection_handlers.py Sun Aug 30 12:03:29 2009 +0200 @@ -898,7 +898,7 @@ track, self.name) break if features.__contains__(common.xmpp.NS_VCARD): - self.vard_supported = True + self.vcard_supported = True if features.__contains__(common.xmpp.NS_PUBSUB): self.pubsub_supported = True if features.__contains__(common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS):

1 0

gajim: disable RST generator only for GPG encrypted messages, no...
by Yann Leboulanger 30 Aug '09

30 Aug '09

changeset d2d1ac0391f6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d2d1ac0391f6 description: disable RST generator only for GPG encrypted messages, not E2E diffstat: src/chat_control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 0f119c9133cb -r d2d1ac0391f6 src/chat_control.py --- a/src/chat_control.py Sun Aug 30 10:51:34 2009 +0200 +++ b/src/chat_control.py Sun Aug 30 11:58:41 2009 +0200 @@ -1989,8 +1989,8 @@ else: kind = 'outgoing' name = gajim.nicks[self.account] - if not xhtml and not encrypted and gajim.config.get( - 'rst_formatting_outgoing_messages'): + if not xhtml and not (encrypted and self.gpg_is_active) and \ + gajim.config.get('rst_formatting_outgoing_messages'): from common.rst_xhtml_generator import create_xhtml xhtml = create_xhtml(text) if xhtml:

1 0

gajim: package docutils folder in windows installer
by Yann Leboulanger 30 Aug '09

30 Aug '09

changeset 0f119c9133cb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0f119c9133cb description: package docutils folder in windows installer diffstat: gajim.nsi | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r 2d2b675bed63 -r 0f119c9133cb gajim.nsi --- a/gajim.nsi Sun Aug 30 00:57:49 2009 +0200 +++ b/gajim.nsi Sun Aug 30 10:51:34 2009 +0200 @@ -184,6 +184,7 @@ File "bin\win32file.pyd" File "bin\winsound.pyd" File "bin\zlib1.dll" + File /r "bin\docutils" WriteRegStr HKCU "Software\Gajim" "" $INSTDIR WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" @@ -695,6 +696,7 @@ Delete "$INSTDIR\bin\win32file.pyd" Delete "$INSTDIR\bin\winsound.pyd" Delete "$INSTDIR\bin\zlib1.dll" + RMDir /r "$INSTDIR\bin\docutils" RMDir "$INSTDIR\bin" RMDir /r "$INSTDIR\data\glade" RMDir /r "$INSTDIR\data\moods"

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2009