From 7ee643c02e0a1119229afd93f9709aea2252b604 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Fri, 7 Oct 2005 14:46:10 +0000 Subject: [PATCH] comments to help code not become a beast; clean and adhere to coding style --- src/common/connection.py | 8 ++++---- src/roster_window.py | 13 +++++++++---- src/tabbed_chat_window.py | 20 ++++++++++---------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/common/connection.py b/src/common/connection.py index 3d6b00f27..95f3f0de8 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -1378,7 +1378,7 @@ class Connection: use_srv = gajim.config.get_per('accounts', self.name, 'use_srv') if usessl: p = 5223 - secur = 1 #1 means force SSL no matter what the port will be + secur = 1 # 1 means force SSL no matter what the port will be use_srv = False # wants ssl? disable srv lookup if gajim.config.get_per('accounts', self.name, 'use_custom_host'): h = gajim.config.get_per('accounts', self.name, 'custom_host') @@ -1400,7 +1400,7 @@ class Connection: elif HAVE_PYDNS: # ensure we haven't cached an old configuration DNS.ParseResolvConf() - response = DNS.Request().req(query, qtype='SRV') + response = DNS.Request().req(query, qtype = 'SRV') answers = response.answers if len(answers) > 0: # ignore the priority and weight for now @@ -1412,11 +1412,11 @@ class Connection: gajim.log.debug('An error occurred while looking up %s' % query) # end of SRV resolver - con_type = con.connect((h, p), proxy=proxy, secure=secur) + con_type = con.connect((h, p), proxy = proxy, secure = secur) if not self.connected: # We went offline during connecting process return None if not con_type: - gajim.log.debug("Couldn't connect to %s" % self.name) + gajim.log.debug('Could not connect to %s' % self.name) if not self.retrycount: self.connected = 0 self.dispatch('STATUS', 'offline') diff --git a/src/roster_window.py b/src/roster_window.py index e7ae1988c..e94364f49 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -862,12 +862,17 @@ class RosterWindow: information_menuitem = childs[12] history_menuitem = childs[13] - if not contact.resource: - send_file_menuitem.hide() - send_file_menuitem.set_no_show_all(True) - else: + + if contact.resource: send_file_menuitem.connect('activate', self.on_send_file_menuitem_activate, account, contact) + else: # if we do not have resource we cannot send file + send_file_menuitem.hide() + send_file_menuitem.set_no_show_all(True) + # FIXME: drag_unset() to clear DND stuff + # FIXME: and drag_set (see new_tab() in TC) + # for when we get resource for the first time + start_chat_menuitem.connect('activate', self.on_roster_treeview_row_activated, path) send_single_message_menuitem.connect('activate', diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py index c613a1bf9..b78e1e31a 100644 --- a/src/tabbed_chat_window.py +++ b/src/tabbed_chat_window.py @@ -42,7 +42,7 @@ gtk.glade.textdomain(APP) GTKGUI_GLADE = 'gtkgui.glade' class TabbedChatWindow(chat.Chat): - """Class for tabbed chat window""" + '''Class for tabbed chat window''' def __init__(self, contact, plugin, account): # we check that on opening new windows self.always_compact_view = gajim.config.get('always_compact_view_chat') @@ -151,8 +151,8 @@ class TabbedChatWindow(chat.Chat): self.bigger_avatar_window.hide() def draw_widgets(self, contact): - """draw the widgets in a tab (f.e. gpg togglebutton) - according to the the information in the contact variable""" + '''draw the widgets in a tab (f.e. gpg togglebutton) + according to the the information in the contact variable''' jid = contact.jid self.set_state_image(jid) tb = self.xmls[jid].get_widget('gpg_togglebutton') @@ -335,7 +335,7 @@ class TabbedChatWindow(chat.Chat): dialogs.AddNewContactWindow(self.plugin, self.account, jid) def on_send_button_clicked(self, widget): - """When send button is pressed: send the current message""" + '''When send button is pressed: send the current message''' jid = self.get_active_jid() message_textview = self.xmls[jid].get_widget('message_textview') message_buffer = message_textview.get_buffer() @@ -505,9 +505,9 @@ class TabbedChatWindow(chat.Chat): self.kbd_activity_in_last_30_secs = False def on_message_textview_key_press_event(self, widget, event): - """When a key is pressed: + '''When a key is pressed: if enter is pressed without the shift key, message (if not empty) is sent - and printed in the conversation""" + and printed in the conversation''' jid = self.get_active_jid() conversation_textview = self.xmls[jid].get_widget('conversation_textview') @@ -635,7 +635,7 @@ class TabbedChatWindow(chat.Chat): self.reset_kbd_mouse_timeout_vars() def send_message(self, message): - """Send the given message to the active tab""" + '''Send the given message to the active tab''' if not message: return @@ -717,7 +717,7 @@ class TabbedChatWindow(chat.Chat): self.plugin.roster.on_info(widget, contact, self.account) def read_queue(self, jid): - """read queue and print messages containted in it""" + '''read queue and print messages containted in it''' l = gajim.awaiting_messages[self.account][jid] contact = self.contacts[jid] # Is it a pm ? @@ -764,11 +764,11 @@ class TabbedChatWindow(chat.Chat): def print_conversation(self, text, jid, frm = '', tim = None, encrypted = False, subject = None): - """Print a line in the conversation: + '''Print a line in the conversation: if contact is set to status: it's a status message if contact is set to another value: it's an outgoing message if contact is set to print_queue: it is incomming from queue - if contact is not set: it's an incomming message""" + if contact is not set: it's an incomming message''' contact = self.contacts[jid] if frm == 'status': kind = 'status'