Commits November 2007

commits@gajim.org

5 participants
146 discussions

[commit-gajim] r9079 - trunk/src
by asterix＠gajim.org 30 Nov '07

30 Nov '07

Author: asterix Date: 2007-11-30 16:25:26 +0100 (Fri, 30 Nov 2007) New Revision: 9079 Modified: trunk/src/config.py Log: typo rajim -> gajim Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-11-30 15:18:26 UTC (rev 9078) +++ trunk/src/config.py 2007-11-30 15:25:26 UTC (rev 9079) @@ -1514,7 +1514,7 @@ # Personal tab gpg_key_label = self.xml.get_widget('gpg_key_label2') - if rajim.connections[gajim.ZEROCONF_ACC_NAME].gpg: + if gajim.connections[gajim.ZEROCONF_ACC_NAME].gpg: self.xml.get_widget('gpg_choose_button2').set_sensitive(True) self.init_account_gpg() else:

1 0

[commit-gajim] r9078 - in trunk/src: . common common/zeroconf
by asterix＠gajim.org 30 Nov '07

30 Nov '07

Author: asterix Date: 2007-11-30 16:18:26 +0100 (Fri, 30 Nov 2007) New Revision: 9078 Modified: trunk/src/common/config.py trunk/src/common/connection.py trunk/src/common/zeroconf/connection_zeroconf.py trunk/src/config.py Log: fix the ability to choose GPG key before we connect remove useless config option usegpg Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2007-11-29 22:10:19 UTC (rev 9077) +++ trunk/src/common/config.py 2007-11-30 15:18:26 UTC (rev 9078) @@ -157,7 +157,6 @@ 'lastfm_username': [ opt_str, '', _('The username used to identify the Last.fm account.')], 'notify_on_new_gmail_email': [ opt_bool, True ], 'notify_on_new_gmail_email_extra': [ opt_bool, False ], - 'usegpg': [ opt_bool, False, '', True ], 'use_gpg_agent': [ opt_bool, False ], 'change_roster_title': [ opt_bool, True, _('Add * and [n] in roster title?')], 'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened.')], Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-11-29 22:10:19 UTC (rev 9077) +++ trunk/src/common/connection.py 2007-11-30 15:18:26 UTC (rev 9078) @@ -107,6 +107,8 @@ self.last_connection = None # last ClientCommon instance self.is_zeroconf = False self.gpg = None + if USE_GPG: + self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) self.status = '' self.priority = gajim.get_priority(name, 'offline') self.old_show = '' @@ -767,9 +769,6 @@ }) if USE_GPG and not self.gpg: self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) - gajim.config.set('usegpg', True) - else: - gajim.config.set('usegpg', False) self.connect_and_init(show, msg, sign_msg) elif show == 'offline': @@ -1036,9 +1035,6 @@ return if USE_GPG: self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) - gajim.config.set('usegpg', True) - else: - gajim.config.set('usegpg', False) gajim.connections[self.name] = self self.dispatch('ACC_OK', (self.new_account_info)) self.new_account_info = None Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2007-11-29 22:10:19 UTC (rev 9077) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2007-11-30 15:18:26 UTC (rev 9078) @@ -62,6 +62,8 @@ self.connected = 0 # offline self.connection = None self.gpg = None + if USE_GPG: + self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) self.is_zeroconf = True self.privacy_rules_supported = False self.blocked_contacts = [] @@ -87,10 +89,7 @@ # Do we continue connection when we get roster (send presence,get vcard...) self.continue_connect_info = None if USE_GPG: - self.gpg = GnuPG.GnuPG() - gajim.config.set('usegpg', True) - else: - gajim.config.set('usegpg', False) + self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) self.get_config_values_or_default() Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-11-29 22:10:19 UTC (rev 9077) +++ trunk/src/config.py 2007-11-30 15:18:26 UTC (rev 9078) @@ -1514,7 +1514,7 @@ # Personal tab gpg_key_label = self.xml.get_widget('gpg_key_label2') - if gajim.config.get('usegpg'): + if rajim.connections[gajim.ZEROCONF_ACC_NAME].gpg: self.xml.get_widget('gpg_choose_button2').set_sensitive(True) self.init_account_gpg() else: @@ -1542,7 +1542,7 @@ use_gpg_agent_checkbutton = self.xml.get_widget( 'use_gpg_agent_checkbutton' + widget_name_add) - if not keyid or not gajim.config.get('usegpg'): + if not keyid or not gajim.connections[account].gpg: use_gpg_agent_checkbutton.set_sensitive(False) gpg_key_label.set_text(_('No key selected')) gpg_name_label.set_text('') @@ -1605,7 +1605,7 @@ # Personal tab gpg_key_label = self.xml.get_widget('gpg_key_label1') - if gajim.config.get('usegpg'): + if gajim.connections[account].gpg: self.xml.get_widget('gpg_choose_button1').set_sensitive(True) self.init_account_gpg() else:

1 0

[commit-gajim] r9077 - trunk/src
by steve-e＠gajim.org 29 Nov '07

29 Nov '07

Author: steve-e Date: 2007-11-29 23:10:19 +0100 (Thu, 29 Nov 2007) New Revision: 9077 Modified: trunk/src/history_manager.py Log: Import gajim's exceptions module not python's default one. Modified: trunk/src/history_manager.py =================================================================== --- trunk/src/history_manager.py 2007-11-29 21:43:39 UTC (rev 9076) +++ trunk/src/history_manager.py 2007-11-29 22:10:19 UTC (rev 9077) @@ -34,7 +34,7 @@ import common.configpaths common.configpaths.gajimpaths.init() common.configpaths.gajimpaths.init_profile() -import exceptions +from common import exceptions import dialogs import gtkgui_helpers from common.logger import LOG_DB_PATH, constants

1 0

[commit-gajim] r9076 - trunk/src
by steve-e＠gajim.org 29 Nov '07

29 Nov '07

Author: steve-e Date: 2007-11-29 22:43:39 +0100 (Thu, 29 Nov 2007) New Revision: 9076 Modified: trunk/src/groupchat_control.py Log: Remove tooltips when we close a groupchat window. Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-11-29 21:15:44 UTC (rev 9075) +++ trunk/src/groupchat_control.py 2007-11-29 21:43:39 UTC (rev 9076) @@ -1563,6 +1563,8 @@ self.contact.jid, status = self.subject) def shutdown(self, status='offline'): + # destroy banner tooltip - bug #pygtk for that! + self.subject_tooltip.destroy() gajim.connections[self.account].send_gc_status(self.nick, self.room_jid, show='offline', status=status) nick_list = gajim.contacts.get_nick_list(self.account, self.room_jid)

1 0

[commit-gajim] r9075 - trunk/src
by steve-e＠gajim.org 29 Nov '07

29 Nov '07

Author: steve-e Date: 2007-11-29 22:15:44 +0100 (Thu, 29 Nov 2007) New Revision: 9075 Modified: trunk/src/disco.py Log: Remove duplicated functions. Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2007-11-29 21:06:39 UTC (rev 9074) +++ trunk/src/disco.py 2007-11-29 21:15:44 UTC (rev 9075) @@ -1204,26 +1204,6 @@ self.search_button = None AgentBrowser._clean_actions(self) - def cleanup(self): - self.tooltip.hide_tooltip() - AgentBrowser.cleanup(self) - - def update_theme(self): - theme = gajim.config.get('roster_theme') - bgcolor = gajim.config.get_per('themes', theme, 'groupbgcolor') - if bgcolor: - self._renderer.set_property('cell-background', bgcolor) - self.window.services_treeview.queue_draw() - - def on_execute_button_clicked(self, widget = None): - '''When we want to execute a command: - open adhoc command window''' - model, iter = self.window.services_treeview.get_selection().get_selected() - if not iter: - return - service = model[iter][0].decode('utf-8') - adhoc_commands.CommandWindow(self.account, service) - def on_search_button_clicked(self, widget = None): '''When we want to search something: open search window''' @@ -1237,20 +1217,6 @@ gajim.interface.instances[self.account]['search'][service] = \ search_window.SearchWindow(self.account, service) - def on_register_button_clicked(self, widget = None): - '''When we want to register an agent: - request information about registering with the agent and close the - window.''' - model, iter = self.window.services_treeview.get_selection().get_selected() - if not iter: - return - jid = model[iter][0].decode('utf-8') - if jid: - gajim.connections[self.account].request_register_agent_info(jid) - self.window.destroy(chain = True) - - AgentBrowser._clean_actions(self) - def cleanup(self): self.tooltip.hide_tooltip() AgentBrowser.cleanup(self)

1 0

[commit-gajim] r9074 - trunk/src
by steve-e＠gajim.org 29 Nov '07

29 Nov '07

Author: steve-e Date: 2007-11-29 22:06:39 +0100 (Thu, 29 Nov 2007) New Revision: 9074 Modified: trunk/src/config.py Log: Remove duplicated function. Fix potential tb on usage of non-existing var. Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-11-29 20:46:45 UTC (rev 9073) +++ trunk/src/config.py 2007-11-29 21:06:39 UTC (rev 9074) @@ -1292,10 +1292,6 @@ def on_close_button_clicked(self, widget): self.window.destroy() - def on_accounts_window_destroy(self, widget): - if gajim.interface.instances.has_key('accounts'): - del gajim.interface.instances['accounts'] - def __init__(self): self.xml = gtkgui_helpers.get_glade('accounts_window.glade') self.window = self.xml.get_widget('accounts_window') @@ -1741,7 +1737,7 @@ # ServiceCache object keep old property account if hasattr(gajim.connections[old_name], 'services_cache'): - gajim.connections[self.account].services_cache.account = new_name + gajim.connections[old_name].services_cache.account = new_name del gajim.interface.instances[old_name] del gajim.interface.minimized_controls[old_name] del gajim.nicks[old_name]

1 0

[commit-gajim] r9073 - branches/gajim_0.11.3-bugfixes/src
by asterix＠gajim.org 29 Nov '07

29 Nov '07

Author: asterix Date: 2007-11-29 21:46:45 +0100 (Thu, 29 Nov 2007) New Revision: 9073 Modified: branches/gajim_0.11.3-bugfixes/src/dialogs.py Log: [Dicson] fix save preset status message behaviour. Fixes #3584 Modified: branches/gajim_0.11.3-bugfixes/src/dialogs.py =================================================================== --- branches/gajim_0.11.3-bugfixes/src/dialogs.py 2007-11-29 20:45:46 UTC (rev 9072) +++ branches/gajim_0.11.3-bugfixes/src/dialogs.py 2007-11-29 20:46:45 UTC (rev 9073) @@ -398,7 +398,7 @@ _('Please type a name for this status message'), is_modal = True) response = dlg.get_response() if response == gtk.RESPONSE_OK: - msg_name = dlg.input_entry.get_text().decode('utf-8') + msg_name = dlg.input_entry.get_text() msg_text = status_message_to_save_as_preset.decode('utf-8') msg_text_1l = helpers.to_one_line(msg_text) if not msg_name: # msg_name was '' @@ -411,13 +411,14 @@ resp = dlg2.run() if resp != gtk.RESPONSE_OK: return + self.preset_messages_dict[msg_name] = msg_text else: + self.preset_messages_dict[msg_name] = msg_text iter_ = self.message_liststore.append((msg_name,)) gajim.config.add_per('statusmsg', msg_name) # select in combobox the one we just saved self.message_combobox.set_active_iter(iter_) gajim.config.set_per('statusmsg', msg_name, 'message', msg_text_1l) - self.preset_messages_dict[msg_name] = msg_text class AddNewContactWindow:

1 0

[commit-gajim] r9072 - trunk/src
by asterix＠gajim.org 29 Nov '07

29 Nov '07

Author: asterix Date: 2007-11-29 21:45:46 +0100 (Thu, 29 Nov 2007) New Revision: 9072 Modified: trunk/src/dialogs.py Log: [Dicson] fix save preset status message behaviour. Fixes #3584 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-11-29 20:33:10 UTC (rev 9071) +++ trunk/src/dialogs.py 2007-11-29 20:45:46 UTC (rev 9072) @@ -484,7 +484,7 @@ _('Please type a name for this status message'), is_modal = True) response = dlg.get_response() if response == gtk.RESPONSE_OK: - msg_name = dlg.input_entry.get_text().decode('utf-8') + msg_name = dlg.input_entry.get_text() msg_text = status_message_to_save_as_preset.decode('utf-8') msg_text_1l = helpers.to_one_line(msg_text) if not msg_name: # msg_name was '' @@ -497,15 +497,15 @@ resp = dlg2.run() if resp != gtk.RESPONSE_OK: return + self.preset_messages_dict[msg_name] = msg_text else: + self.preset_messages_dict[msg_name] = msg_text iter_ = self.message_liststore.append((msg_name,)) gajim.config.add_per('statusmsg', msg_name) # select in combobox the one we just saved self.message_combobox.set_active_iter(iter_) gajim.config.set_per('statusmsg', msg_name, 'message', msg_text_1l) - self.preset_messages_dict[msg_name] = msg_text - class AddNewContactWindow: '''Class for AddNewContactWindow''' uid_labels = {'jabber': _('Jabber ID:'),

1 0

[commit-gajim] r9071 - trunk/src
by steve-e＠gajim.org 29 Nov '07

29 Nov '07

Author: steve-e Date: 2007-11-29 21:33:10 +0100 (Thu, 29 Nov 2007) New Revision: 9071 Modified: trunk/src/chat_control.py trunk/src/groupchat_control.py Log: Hide status/topic label when there is nothing to show. Disable empty tooltips. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-11-28 22:47:33 UTC (rev 9070) +++ trunk/src/chat_control.py 2007-11-29 20:33:10 UTC (rev 9071) @@ -1205,12 +1205,10 @@ status = contact.status if status is not None: - self.status_tooltip.set_tip(banner_eventbox, status) - self.status_tooltip.enable() banner_name_label.set_ellipsize(pango.ELLIPSIZE_END) self.banner_status_label.set_ellipsize(pango.ELLIPSIZE_END) - status = helpers.reduce_chars_newlines(status, max_lines = 1) - status_escaped = gobject.markup_escape_text(status) + status_reduced = helpers.reduce_chars_newlines(status, max_lines = 1) + status_escaped = gobject.markup_escape_text(status_reduced) font_attrs, font_attrs_small = self.get_font_attrs() st = gajim.config.get('displayed_chat_state_notifications') @@ -1246,9 +1244,14 @@ status_text = '<span %s>%s</span>' % (font_attrs_small, status_text) else: status_text = '<span %s>%s</span>' % (font_attrs_small, status_escaped) + self.status_tooltip.set_tip(banner_eventbox, status) + self.banner_status_label.show() + self.banner_status_label.set_no_show_all(False) else: status_text = '' self.status_tooltip.disable() + self.banner_status_label.hide() + self.banner_status_label.set_no_show_all(True) self.banner_status_label.set_markup(status_text) # setup the label that holds name and jid Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-11-28 22:47:33 UTC (rev 9070) +++ trunk/src/groupchat_control.py 2007-11-29 20:33:10 UTC (rev 9071) @@ -517,9 +517,13 @@ # tooltip must always hold ALL the subject self.subject_tooltip.set_tip(self.event_box, self.subject) + self.banner_status_label.show() + self.banner_status_label.set_no_show_all(False) else: subject_text = '' self.subject_tooltip.disable() + self.banner_status_label.hide() + self.banner_status_label.set_no_show_all(True) self.banner_status_label.set_markup(subject_text)

1 0

[commit-gajim] r9070 - trunk/src
by asterix＠gajim.org 28 Nov '07

28 Nov '07

Author: asterix Date: 2007-11-28 23:47:33 +0100 (Wed, 28 Nov 2007) New Revision: 9070 Modified: trunk/src/tooltips.py Log: ton't traceback when showing tooltip of a filetransfer without description Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2007-11-28 22:17:48 UTC (rev 9069) +++ trunk/src/tooltips.py 2007-11-28 22:47:33 UTC (rev 9070) @@ -627,8 +627,10 @@ else: status = _('Not started') properties.append((_('Status: '), status)) - file_desc = file_props['desc'] - properties.append((_('Description: '), gobject.markup_escape_text(file_desc))) + if 'desc' in file_props: + file_desc = file_props['desc'] + properties.append((_('Description: '), gobject.markup_escape_text( + file_desc))) while properties: property = properties.pop(0) current_row += 1

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2007