Commits January 2009

commits@gajim.org

7 participants
115 discussions

[commit-gajim] r11047 - trunk/src
by asterix＠gajim.org 30 Jan '09

30 Jan '09

Author: asterix Date: 2009-01-30 17:48:15 +0100 (Fri, 30 Jan 2009) New Revision: 11047 Modified: trunk/src/chat_control.py Log: negotiate esession only if enable_esessions is activated. Fixes #4738 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2009-01-30 09:09:54 UTC (rev 11046) +++ trunk/src/chat_control.py 2009-01-30 16:48:15 UTC (rev 11047) @@ -2409,10 +2409,10 @@ e2e_is_active = self.session and \ self.session.enable_encryption - e2e_pref = gajim.config.get_per('accounts', - self.account, 'autonegotiate_esessions') and \ - gajim.config.get_per('contacts', - self.contact.jid, 'autonegotiate_esessions') + e2e_pref = gajim.config.get_per('accounts', self.account, + 'enable_esessions') and gajim.config.get_per('accounts', + self.account, 'autonegotiate_esessions') and gajim.config.get_per( + 'contacts', self.contact.jid, 'autonegotiate_esessions') want_e2e = not e2e_is_active and not self.gpg_is_active \ and e2e_pref

1 0

[commit-gajim] r11046 - trunk/src/common
by asterix＠gajim.org 30 Jan '09

30 Jan '09

Author: asterix Date: 2009-01-30 10:09:54 +0100 (Fri, 30 Jan 2009) New Revision: 11046 Modified: trunk/src/common/latex.py Log: fix decode error in latex errors. Fixes #4744 Modified: trunk/src/common/latex.py =================================================================== --- trunk/src/common/latex.py 2009-01-30 07:53:26 UTC (rev 11045) +++ trunk/src/common/latex.py 2009-01-30 09:09:54 UTC (rev 11046) @@ -37,6 +37,7 @@ import gajim from exceptions import LatexError +import helpers # some latex commands are really bad blacklist = ['\\def', '\\let', '\\futurelet', @@ -121,7 +122,7 @@ except Exception, e: exitcode = _('Error executing "%(command)s": %(error)s') % { 'command': 'latex --interaction=nonstopmode %s.tex' % tmpfile, - 'error': str(e)} + 'error': helpers.decode_string(e.message)} if exitcode == 0: # convert dvi to png

1 0

[commit-gajim] r11045 - in trunk: data/glade src src/common
by asterix＠gajim.org 30 Jan '09

30 Jan '09

Author: asterix Date: 2009-01-30 08:53:26 +0100 (Fri, 30 Jan 2009) New Revision: 11045 Modified: trunk/data/glade/roster_window.glade trunk/src/common/config.py trunk/src/roster_window.py Log: new show_only_active_contact option. Fixes #3497 Modified: trunk/data/glade/roster_window.glade =================================================================== --- trunk/data/glade/roster_window.glade 2009-01-30 00:52:48 UTC (rev 11044) +++ trunk/data/glade/roster_window.glade 2009-01-30 07:53:26 UTC (rev 11045) @@ -215,6 +215,15 @@ </widget> </child> <child> + <widget class="GtkCheckMenuItem" id="show_only_active_contacts_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Show Only _Active Contacts</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_show_only_active_contacts_menuitem_activate"/> + <accelerator key="Y" modifiers="GDK_CONTROL_MASK" signal="activate"/> + </widget> + </child> + <child> <widget class="GtkCheckMenuItem" id="show_transports_menuitem"> <property name="visible">True</property> <property name="label" translatable="yes">Show Trans_ports</property> Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2009-01-30 00:52:48 UTC (rev 11044) +++ trunk/src/common/config.py 2009-01-30 07:53:26 UTC (rev 11045) @@ -81,6 +81,7 @@ 'autopopupaway': [ opt_bool, False ], 'use_notif_daemon': [ opt_bool, True , _('Use D-Bus and Notification-Daemon to show notifications') ], 'showoffline': [ opt_bool, False ], + 'show_only_chat_and_online': [ opt_bool, False, _('Show only online and free for chat contacts in roster.')], 'show_transports_group': [ opt_bool, True ], 'autoaway': [ opt_bool, True ], 'autoawaytime': [ opt_int, 5, _('Time in minutes, after which your status changes to away.') ], Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2009-01-30 00:52:48 UTC (rev 11044) +++ trunk/src/roster_window.py 2009-01-30 07:53:26 UTC (rev 11045) @@ -1441,6 +1441,9 @@ if contact.jid in gajim.to_be_removed[account]: return True return False + if gajim.config.get('show_only_chat_and_online') and contact.show in ( + 'away', 'xa', 'busy'): + return False return True def _visible_func(self, model, titer): @@ -1500,12 +1503,14 @@ for data in nearby_family: jid = data['jid'] account = data['account'] - contact = gajim.contacts.get_first_contact_from_jid(account, jid) + contact = gajim.contacts.get_contact_with_highest_priority( + account, jid) if contact and self.contact_is_visible(contact, account): return True return False else: - contact = gajim.contacts.get_first_contact_from_jid(account, jid) + contact = gajim.contacts.get_contact_with_highest_priority(account, + jid) return self.contact_is_visible(contact, account) if type_ == 'agent': return gajim.config.get('show_transports_group') and \ @@ -3674,11 +3679,29 @@ redraw the treeview''' gajim.config.set('showoffline', not gajim.config.get('showoffline')) self.refilter_shown_roster_items() + w = self.xml.get_widget('show_only_active_contacts_menuitem') if gajim.config.get('showoffline'): # We need to filter twice to show groups with no contacts inside # in the correct expand state self.refilter_shown_roster_items() + w.set_sensitive(False) + else: + w.set_sensitive(True) + def on_show_only_active_contacts_menuitem_activate(self, widget): + '''when show only active contact option is changed: + redraw the treeview''' + gajim.config.set('show_only_chat_and_online', not gajim.config.get( + 'show_only_chat_and_online')) + self.refilter_shown_roster_items() + w = self.xml.get_widget('show_offline_contacts_menuitem') + if gajim.config.get('show_only_chat_and_online'): + # We need to filter twice to show groups with no contacts inside + # in the correct expand state + self.refilter_shown_roster_items() + w.set_sensitive(False) + else: + w.set_sensitive(True) def on_view_menu_activate(self, widget): # Hide the show roster menu if we are not in the right windowing mode. @@ -6240,9 +6263,18 @@ self.previous_status_combobox_active = number_of_menuitem showOffline = gajim.config.get('showoffline') - self.xml.get_widget('show_offline_contacts_menuitem').set_active( - showOffline) + showOnlyChatAndOnline = gajim.config.get('show_only_chat_and_online') + w = self.xml.get_widget('show_offline_contacts_menuitem') + w.set_active(showOffline) + if showOnlyChatAndOnline: + w.set_sensitive(False) + + w = self.xml.get_widget('show_only_active_contacts_menuitem') + w.set_active(showOnlyChatAndOnline) + if showOffline: + w.set_sensitive(False) + show_transports_group = gajim.config.get('show_transports_group') self.xml.get_widget('show_transports_menuitem').set_active( show_transports_group)

1 0

[commit-gajim] r11044 - trunk/src
by vardo＠gajim.org 30 Jan '09

30 Jan '09

Author: vardo Date: 2009-01-30 01:52:48 +0100 (Fri, 30 Jan 2009) New Revision: 11044 Modified: trunk/src/groupchat_control.py Log: Removed premature triple-dots in contact's status message (MUC). Fixes #4741 (caused by changeset [11042]). Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2009-01-29 20:16:34 UTC (rev 11043) +++ trunk/src/groupchat_control.py 2009-01-30 00:52:48 UTC (rev 11044) @@ -1044,8 +1044,8 @@ color = gtkgui_helpers._get_fade_color(self.list_treeview, selected, focus) colorstring = "#%04x%04x%04x" % (color.red, color.green, color.blue) - name += '\n%s \ - ' % (colorstring, gobject.markup_escape_text(status)) + name += ('\n' + '%s') % (colorstring, gobject.markup_escape_text(status)) model[iter_][C_IMG] = image model[iter_][C_TEXT] = name

1 0

[commit-gajim] r11043 - in trunk/src: . common
by asterix＠gajim.org 29 Jan '09

29 Jan '09

Author: asterix Date: 2009-01-29 21:16:34 +0100 (Thu, 29 Jan 2009) New Revision: 11043 Modified: trunk/src/chat_control.py trunk/src/common/connection_handlers.py trunk/src/common/stanza_session.py trunk/src/session.py Log: [Dicson] option have moved per account. Fixes #4748 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2009-01-28 16:50:32 UTC (rev 11042) +++ trunk/src/chat_control.py 2009-01-29 20:16:34 UTC (rev 11043) @@ -1622,7 +1622,8 @@ ChatControlBase.print_conversation_line(self, msg, 'status', '', None) - loggable = gajim.config.get('log_encrypted_sessions') + loggable = gajim.config.get_per('accounts', self.account, + 'log_encrypted_sessions') if self.session: self.session.loggable = loggable Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2009-01-28 16:50:32 UTC (rev 11042) +++ trunk/src/common/connection_handlers.py 2009-01-29 20:16:34 UTC (rev 11043) @@ -1550,7 +1550,7 @@ qp = iq_obj.getTag('query') qp.setTagData('name', 'Gajim') qp.setTagData('version', gajim.version) - send_os = gajim.config.get('send_os_info') + send_os = gajim.config.get_per('accounts', self.name, 'send_os_info') if send_os: qp.setTagData('os', helpers.get_os_info()) self.connection.send(iq_obj) Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2009-01-28 16:50:32 UTC (rev 11042) +++ trunk/src/common/stanza_session.py 2009-01-29 20:16:34 UTC (rev 11043) @@ -246,7 +246,7 @@ return crypto.encode_mpi(gajim.pubkey.sign(hash_, '')[0]) def encrypt_stanza(self, stanza): - encryptable = [x for x in stanza.getChildren() if x.getName() not in + encryptable = [x for x in stanza.getChildren() if x.getName() not in ('error', 'amp', 'thread')] # FIXME can also encrypt contents of <error/> elements in stanzas @type = @@ -353,7 +353,8 @@ return self.decrypter.decrypt(ciphertext) def logging_preference(self): - if gajim.config.get('log_encrypted_sessions'): + if gajim.config.get_per('accounts', self.conn.name, + 'log_encrypted_sessions'): return ['may', 'mustnot'] else: return ['mustnot', 'may'] @@ -989,7 +990,7 @@ def fail_bad_negotiation(self, reason, fields=None): ''' Sends an error and cancels everything. - + If fields is None, the remote party has given us a bad cryptographic value of some kind. Otherwise, list the fields we haven't implemented ''' Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2009-01-28 16:50:32 UTC (rev 11042) +++ trunk/src/session.py 2009-01-29 20:16:34 UTC (rev 11043) @@ -184,8 +184,9 @@ if not msgtxt: # empty message text return - if gajim.config.get('ignore_unknown_contacts') and \ - not gajim.contacts.get_contacts(self.conn.name, jid) and not pm: + if gajim.config.get_per('accounts', self.conn.name, + 'ignore_unknown_contacts') and not gajim.contacts.get_contacts( + self.conn.name, jid) and not pm: return if not contact:

1 0

[commit-gajim] r11042 - trunk/src
by vardo＠gajim.org 28 Jan '09

28 Jan '09

Author: vardo Date: 2009-01-28 17:50:32 +0100 (Wed, 28 Jan 2009) New Revision: 11042 Modified: trunk/src/groupchat_control.py Log: [dicson] fix #4741 (removed TBs in MUC) Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2009-01-28 13:16:45 UTC (rev 11041) +++ trunk/src/groupchat_control.py 2009-01-28 16:50:32 UTC (rev 11042) @@ -1044,8 +1044,8 @@ color = gtkgui_helpers._get_fade_color(self.list_treeview, selected, focus) colorstring = "#%04x%04x%04x" % (color.red, color.green, color.blue) - name += '\n%s' - '' % (colorstring, gobject.markup_escape_text(status)) + name += '\n%s \ + ' % (colorstring, gobject.markup_escape_text(status)) model[iter_][C_IMG] = image model[iter_][C_TEXT] = name

1 0

[commit-gajim] r11041 - trunk/src/common
by asterix＠gajim.org 28 Jan '09

28 Jan '09

Author: asterix Date: 2009-01-28 14:16:45 +0100 (Wed, 28 Jan 2009) New Revision: 11041 Modified: trunk/src/common/defs.py Log: fix missing commit. see [11033] Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2009-01-28 13:16:02 UTC (rev 11040) +++ trunk/src/common/defs.py 2009-01-28 13:16:45 UTC (rev 11041) @@ -26,7 +26,7 @@ docdir = '../' datadir = '../' -version = '0.12.1.1-svn' +version = '0.12.1.2-svn' import sys, os.path for base in ('.', 'common'):

1 0

[commit-gajim] r11040 - trunk/src
by asterix＠gajim.org 28 Jan '09

28 Jan '09

Author: asterix Date: 2009-01-28 14:16:02 +0100 (Wed, 28 Jan 2009) New Revision: 11040 Modified: trunk/src/chat_control.py trunk/src/config.py trunk/src/dialogs.py Log: set speller language correctly, and show correct error message. Fixes #4737 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2009-01-28 12:12:13 UTC (rev 11039) +++ trunk/src/chat_control.py 2009-01-28 13:16:02 UTC (rev 11040) @@ -275,29 +275,7 @@ # Attach speller if gajim.config.get('use_speller') and HAS_GTK_SPELL: - try: - spell = gtkspell.Spell(self.msg_textview) - # loop removing non-existant dictionaries - # iterating on a copy - for lang in dict(langs): - try: - spell.set_language(langs[lang]) - except Exception: - del langs[lang] - # now set the one the user selected - per_type = 'contacts' - if self.type_id == message_control.TYPE_GC: - per_type = 'rooms' - lang = gajim.config.get_per(per_type, self.contact.jid, - 'speller_language') - if not lang: - # use the default one - lang = gajim.config.get('speller_language') - if lang: - self.msg_textview.lang = lang - spell.set_language(lang) - except (gobject.GError, RuntimeError): - dialogs.AspellDictError(lang) + self.set_speller() self.conv_textview.tv.show() self._paint_banner() @@ -307,6 +285,33 @@ self.smooth = True self.msg_textview.grab_focus() + def set_speller(self): + try: + lang = gajim.config.get('speller_language') + if not lang: + lang = gajim.LANG + spell = gtkspell.Spell(self.msg_textview, lang) + # loop removing non-existant dictionaries + # iterating on a copy + for lang in dict(langs): + try: + spell.set_language(langs[lang]) + except Exception: + del langs[lang] + # now set the one the user selected + per_type = 'contacts' + if self.type_id == message_control.TYPE_GC: + per_type = 'rooms' + lang = gajim.config.get_per(per_type, self.contact.jid, + 'speller_language') + if not lang: + # use the default one + lang = gajim.config.get('speller_language') + if lang: + self.msg_textview.lang = lang + spell.set_language(lang) + except (gobject.GError, RuntimeError): + dialogs.AspellDictError(lang) def on_msg_textview_populate_popup(self, textview, menu): '''we override the default context menu and we prepend an option to switch languages''' def _on_select_dictionary(widget, lang): Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2009-01-28 12:12:13 UTC (rev 11039) +++ trunk/src/config.py 2009-01-28 13:16:02 UTC (rev 11040) @@ -635,7 +635,7 @@ spell_obj = None if not spell_obj: - gtkspell.Spell(ctrl.msg_textview) + ctrl.set_speller() def remove_speller(self): for ctrl in gajim.interface.msg_win_mgr.controls(): Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2009-01-28 12:12:13 UTC (rev 11039) +++ trunk/src/dialogs.py 2009-01-28 13:16:02 UTC (rev 11040) @@ -2195,12 +2195,11 @@ if gajim.config.get('use_speller') and HAS_GTK_SPELL and action == 'send': try: - spell1 = gtkspell.Spell(self.conversation_textview.tv) - spell2 = gtkspell.Spell(self.message_textview) lang = gajim.config.get('speller_language') - if lang: - spell1.set_language(lang) - spell2.set_language(lang) + if not lang: + lang = gajim.LANG + gtkspell.Spell(self.conversation_textview.tv, lang) + gtkspell.Spell(self.message_textview, lang) except gobject.GError: AspellDictError(lang)

1 0

[commit-gajim] r11039 - trunk/src
by asterix＠gajim.org 28 Jan '09

28 Jan '09

Author: asterix Date: 2009-01-28 13:12:13 +0100 (Wed, 28 Jan 2009) New Revision: 11039 Modified: trunk/src/groupchat_control.py Log: coding standards Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2009-01-28 12:10:10 UTC (rev 11038) +++ trunk/src/groupchat_control.py 2009-01-28 12:12:13 UTC (rev 11039) @@ -56,7 +56,7 @@ C_AVATAR, # avatar of the contact ) = range(5) -def set_renderer_color(treeview, renderer, set_background = True): +def set_renderer_color(treeview, renderer, set_background=True): '''set style for group row, using PRELIGHT system color''' if set_background: bgcolor = treeview.style.bg[gtk.STATE_PRELIGHT] @@ -355,7 +355,7 @@ def add_avatar_renderer(): renderer_pixbuf = gtk.CellRendererPixbuf() # avatar image - column.pack_start(renderer_pixbuf, expand = False) + column.pack_start(renderer_pixbuf, expand=False) column.add_attribute(renderer_pixbuf, 'pixbuf', C_AVATAR) column.set_cell_data_func(renderer_pixbuf, tree_cell_data_func, self.list_treeview) @@ -365,13 +365,13 @@ renderer_image = cell_renderer_image.CellRendererImage(0, 0) # status img renderer_image.set_property('width', 26) - column.pack_start(renderer_image, expand = False) + column.pack_start(renderer_image, expand=False) column.add_attribute(renderer_image, 'image', C_IMG) column.set_cell_data_func(renderer_image, tree_cell_data_func, self.list_treeview) renderer_text = gtk.CellRendererText() # nickname - column.pack_start(renderer_text, expand = True) + column.pack_start(renderer_text, expand=True) column.add_attribute(renderer_text, 'markup', C_TEXT) renderer_text.set_property("ellipsize", pango.ELLIPSIZE_END) column.set_cell_data_func(renderer_text, tree_cell_data_func, @@ -385,7 +385,7 @@ # workaround to avoid gtk arrows to be shown column = gtk.TreeViewColumn() # 2nd COLUMN renderer = gtk.CellRendererPixbuf() - column.pack_start(renderer, expand = False) + column.pack_start(renderer, expand=False) self.list_treeview.append_column(column) column.set_visible(False) self.list_treeview.set_expander_column(column) @@ -457,7 +457,7 @@ for nick in sorted(gajim.contacts.get_nick_list(self.account, self.room_jid)): - item = gtk.MenuItem(nick, use_underline = False) + item = gtk.MenuItem(nick, use_underline=False) submenu.append(item) id_ = item.connect('activate', self.append_nick_in_msg_textview, nick) self.handlers[id_] = item @@ -622,7 +622,7 @@ self.name_label.set_markup(text) if self.subject: - subject = helpers.reduce_chars_newlines(self.subject, max_lines = 2) + subject = helpers.reduce_chars_newlines(self.subject, max_lines=2) subject = gobject.markup_escape_text(subject) if gajim.HAVE_PYSEXY: subject_text = self.urlfinder.sub(self.make_href, subject) @@ -643,7 +643,7 @@ self.banner_status_label.set_markup(subject_text) - def prepare_context_menu(self, hide_buttonbar_entries = False): + def prepare_context_menu(self, hide_buttonbar_entries=False): '''sets sensitivity state for configure_room''' ag = gtk.accel_groups_from_object(self.parent_win.window)[0] self.change_nick_menuitem.add_accelerator('activate', ag, gtk.keysyms.n, @@ -720,7 +720,7 @@ self.print_conversation(msg, nick, tim, xhtml) def on_private_message(self, nick, msg, tim, xhtml, session, - msg_id = None, encrypted = False): + msg_id=None, encrypted=False): # Do we have a queue? fjid = self.room_jid + '/' + nick no_queue = len(gajim.events.get_events(self.account, fjid)) == 0 @@ -739,7 +739,7 @@ model = self.list_treeview.get_model() state_images =\ gajim.interface.roster.get_appropriate_state_images( - self.room_jid, icon_name = 'event') + self.room_jid, icon_name='event') image = state_images['event'] model[iter_][C_IMG] = image if self.parent_win: @@ -778,7 +778,7 @@ fin = True return None - def print_old_conversation(self, text, contact = '', tim = None, + def print_old_conversation(self, text, contact='', tim=None, xhtml = None): if isinstance(text, str): text = unicode(text, 'utf-8') @@ -795,9 +795,9 @@ small_attr = [] ChatControlBase.print_conversation_line(self, text, kind, contact, tim, small_attr, small_attr + ['restored_message'], - small_attr + ['restored_message'], count_as_new = False, xhtml = xhtml) + small_attr + ['restored_message'], count_as_new=False, xhtml=xhtml) - def print_conversation(self, text, contact = '', tim = None, xhtml = None): + def print_conversation(self, text, contact='', tim=None, xhtml=None): '''Print a line in the conversation: if contact is set: it's a message from someone or an info message (contact = 'info' in such a case) @@ -860,7 +860,7 @@ self.check_and_possibly_add_focus_out_line() ChatControlBase.print_conversation_line(self, text, kind, contact, tim, - other_tags_for_name, [], other_tags_for_text, xhtml = xhtml) + other_tags_for_name, [], other_tags_for_text, xhtml=xhtml) def get_nb_unread(self): type_events = ['printed_marked_gc_msg'] @@ -883,7 +883,6 @@ text, the second, what sound to play.''' highlight, sound = (None, None) - # Are any of the defined highlighting words in the text? if self.needs_visual_notification(text): highlight = True @@ -1013,7 +1012,8 @@ if self.is_anonymous and gc_contact.affiliation not in ['admin', 'owner']\ and self_contact.affiliation in ['admin', 'owner']: prim_text = _('Really send file?') - sec_text = _('If you send a file to %s, he/she will know your real Jabber ID.') % gc_contact.name + sec_text = _('If you send a file to %s, he/she will know your real ' + 'Jabber ID.') % gc_contact.name dialog = dialogs.NonModalConfirmationDialog(prim_text, sec_text, on_response_ok = (_on_send_files, gc_contact)) dialog.popup() @@ -1039,13 +1039,13 @@ if status and gajim.config.get('show_status_msgs_in_roster'): status = status.strip() if status != '': - status = helpers.reduce_chars_newlines(status, max_lines = 1) + status = helpers.reduce_chars_newlines(status, max_lines=1) # escape markup entities and make them small italic and fg color color = gtkgui_helpers._get_fade_color(self.list_treeview, selected, focus) colorstring = "#%04x%04x%04x" % (color.red, color.green, color.blue) - name += '\n' '%s'\ - % (colorstring, gobject.markup_escape_text(status)) + name += '\n%s' + '' % (colorstring, gobject.markup_escape_text(status)) model[iter_][C_IMG] = image model[iter_][C_TEXT] = name @@ -1082,7 +1082,7 @@ self.draw_role(role) def chg_contact_status(self, nick, show, status, role, affiliation, jid, - reason, actor, statusCode, new_nick, avatar_sha, tim = None): + reason, actor, statusCode, new_nick, avatar_sha, tim=None): '''When an occupant changes his or her status''' if show == 'invisible': return @@ -1131,7 +1131,7 @@ 'nick': nick, 'who': actor, 'reason': reason } - self.print_conversation(s, 'info', tim = tim) + self.print_conversation(s, 'info', tim=tim) elif '301' in statusCode: if actor is None: # do not print 'banned by None' s = _('%(nick)s has been banned: %(reason)s') % { @@ -1142,7 +1142,7 @@ 'nick': nick, 'who': actor, 'reason': reason } - self.print_conversation(s, 'info', tim = tim) + self.print_conversation(s, 'info', tim=tim) elif '303' in statusCode: # Someone changed his or her nick if new_nick == self.new_nick: # We changed our nick self.nick = self.new_nick @@ -1187,17 +1187,17 @@ elif '321' in statusCode: s = _('%(nick)s has been removed from the room (%(reason)s)') % { 'nick': nick, 'reason': _('affiliation changed') } - self.print_conversation(s, 'info', tim = tim) + self.print_conversation(s, 'info', tim=tim) elif '322' in statusCode: s = _('%(nick)s has been removed from the room (%(reason)s)') % { 'nick': nick, 'reason': _('room configuration changed to members-only') } - self.print_conversation(s, 'info', tim = tim) + self.print_conversation(s, 'info', tim=tim) elif '332' in statusCode: s = _('%(nick)s has been removed from the room (%(reason)s)') % { 'nick': nick, 'reason': _('system shutdown') } - self.print_conversation(s, 'info', tim = tim) + self.print_conversation(s, 'info', tim=tim) elif 'destroyed' in statusCode: # Room has been destroyed self.print_conversation(reason, 'info', tim) @@ -1355,9 +1355,9 @@ self.draw_all_roles() iter_ = model.append(role_iter, (None, nick, 'contact', name, None)) if not nick in gajim.contacts.get_nick_list(self.account, self.room_jid): - gc_contact = gajim.contacts.create_gc_contact(room_jid = self.room_jid, - name = nick, show = show, status = status, role = role, - affiliation = affiliation, jid = j, resource = resource) + gc_contact = gajim.contacts.create_gc_contact(room_jid=self.room_jid, + name=nick, show=show, status=status, role=role, + affiliation=affiliation, jid=j, resource=resource) gajim.contacts.add_gc_contact(self.account, gc_contact) self.draw_contact(nick) self.draw_avatar(nick) @@ -1458,7 +1458,7 @@ nicks = gajim.contacts.get_nick_list(self.account, self.room_jid) for nick in (nick0, nick1): if nick in nicks: - self.on_send_pm(nick = nick) + self.on_send_pm(nick=nick) self.clear(self.msg_textview) return True self.print_conversation(_('Nickname not found: %s') % \ @@ -1505,7 +1505,8 @@ message_array = message_array[0].split() invitee = message_array.pop(0) reason = ' '.join(message_array) - gajim.connections[self.account].send_invite(self.room_jid, invitee, reason) + gajim.connections[self.account].send_invite(self.room_jid, invitee, + reason) s = _('Invited %(contact_jid)s to %(room_jid)s.') % { 'contact_jid': invitee, 'room_jid': self.room_jid} @@ -1519,7 +1520,8 @@ if len(message_array): room_jid = message_array[0] if room_jid.find('@') < 0: - room_jid = room_jid + '@' + gajim.get_server_from_jid(self.room_jid) + room_jid = room_jid + '@' + gajim.get_server_from_jid( + self.room_jid) else: room_jid = '@' + gajim.get_server_from_jid(self.room_jid) if room_jid.find('/') >= 0: @@ -1534,7 +1536,7 @@ try: gajim.interface.instances[self.account]['join_gc'] =\ dialogs.JoinGroupchatWindow(self.account, - room_jid = room_jid, nick = nick) + room_jid = room_jid, nick=nick) except GajimGeneralException: pass self.clear(self.msg_textview) @@ -1641,9 +1643,9 @@ self.print_conversation(_('Commands: %s') % GroupchatControl.MUC_CMDS, 'info') elif command == 'ban': - s = _('Usage: /%s <nickname|JID> [reason], bans the JID from the group chat.' - ' The nickname of an occupant may be substituted, but not if it ' - 'contains "@". If the JID is currently in the group chat, ' + s = _('Usage: /%s <nickname|JID> [reason], bans the JID from the group' + ' chat. The nickname of an occupant may be substituted, but not if ' + 'it contains "@". If the JID is currently in the group chat, ' 'he/she/it will also be kicked. Does NOT support spaces in ' 'nickname.') % command self.print_conversation(s, 'info') @@ -1773,7 +1775,8 @@ fjid = self.room_jid + '/' + nick ctrl = gajim.interface.msg_win_mgr.get_gc_control(fjid, self.account) if ctrl: - contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) + contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, + nick) contact.show = 'offline' contact.status = '' ctrl.update_ui() @@ -1876,7 +1879,8 @@ if c.affiliation == 'owner': gajim.connections[self.account].request_gc_config(self.room_jid) elif c.affiliation == 'admin': - if self.room_jid not in gajim.interface.instances[self.account]['gc_config']: + if self.room_jid not in gajim.interface.instances[self.account][ + 'gc_config']: gajim.interface.instances[self.account]['gc_config'][self.room_jid]\ = config.GroupchatConfigWindow(self.account, self.room_jid) @@ -2214,7 +2218,7 @@ nick = model[path][C_NICK].decode('utf-8') self._start_private_message(nick) - def on_list_treeview_row_activated(self, widget, path, col = 0): + def on_list_treeview_row_activated(self, widget, path, col=0): '''When an iter is double clicked: open the chat window''' if not gajim.single_click: self.on_row_activated(widget, path) @@ -2330,7 +2334,6 @@ else: self.tooltip.hide_tooltip() - def grant_voice(self, widget, nick): '''grant voice privilege to a user''' gajim.connections[self.account].gc_set_role(self.room_jid, nick, @@ -2375,7 +2378,8 @@ def grant_admin(self, widget, jid): '''grant administrative privilege to a user''' - gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid, 'admin') + gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid, + 'admin') def revoke_admin(self, widget, jid): '''revoke administrative privilege to a user''' @@ -2384,11 +2388,13 @@ def grant_owner(self, widget, jid): '''grant owner privilege to a user''' - gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid, 'owner') + gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid, + 'owner') def revoke_owner(self, widget, jid): '''revoke owner privilege to a user''' - gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid, 'admin') + gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid, + 'admin') def on_info(self, widget, nick): '''Call vcard_information_window class to display user's information''' @@ -2403,7 +2409,7 @@ def on_history(self, widget, nick): jid = gajim.construct_fjid(self.room_jid, nick) - self._on_history_menuitem_activate(widget = widget, jid = jid) + self._on_history_menuitem_activate(widget=widget, jid=jid) def on_add_to_roster(self, widget, jid): dialogs.AddNewContactWindow(self.account, jid)

1 0

[commit-gajim] r11038 - trunk/src
by asterix＠gajim.org 28 Jan '09

28 Jan '09

Author: asterix Date: 2009-01-28 13:10:10 +0100 (Wed, 28 Jan 2009) New Revision: 11038 Modified: trunk/src/gajim.py Log: fix missing var Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2009-01-28 12:00:31 UTC (rev 11037) +++ trunk/src/gajim.py 2009-01-28 12:10:10 UTC (rev 11038) @@ -1232,6 +1232,8 @@ jids = array[0].split('/', 1) room_jid = jids[0] + msg = array[1] + gc_control = self.msg_win_mgr.get_gc_control(room_jid, account) if not gc_control and \ room_jid in self.minimized_controls[account]: @@ -1250,7 +1252,7 @@ # message from someone nick = jids[1] - gc_control.on_message(nick, array[1], array[2], array[3], xhtml, array[5]) + gc_control.on_message(nick, msg, array[2], array[3], xhtml, array[5]) if self.remote_ctrl: highlight = gc_control.needs_visual_notification(msg)

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 2009