Commits May 2011

commits@gajim.org

3 participants
119 discussions

gajim: [Darlan] Fix typo
by Yann Leboulanger 22 May '11

22 May '11

changeset d84fab330dc2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d84fab330dc2 description: [Darlan] Fix typo diffstat: src/features_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6303371c459c -r d84fab330dc2 src/features_window.py --- a/src/features_window.py Sat May 21 23:34:31 2011 +0400 +++ b/src/features_window.py Sun May 22 13:05:39 2011 +0200 @@ -47,7 +47,7 @@ # {name: (available_function, unix_text, windows_text)} self.features = { - _('SSL certificat validation'): (self.pyopenssl_available, + _('SSL certificate validation'): (self.pyopenssl_available, _('A library used to validate server certificates to ensure a secure connection.'), _('Requires python-pyopenssl.'), _('Requires python-pyopenssl.')),

1 0

gajim: Use the logging module instead wanings in htmlview.py
by Denis Fomin 21 May '11

21 May '11

changeset a74f1ba1574a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a74f1ba1574a description: Use the logging module instead wanings in htmlview.py diffstat: src/htmltextview.py | 48 +++++++++++++++++++----------------------------- 1 files changed, 19 insertions(+), 29 deletions(-) diffs (178 lines): diff -r ca2800ac665f -r a74f1ba1574a src/htmltextview.py --- a/src/htmltextview.py Fri Nov 26 22:57:32 2010 +0300 +++ b/src/htmltextview.py Sat Nov 27 00:43:13 2010 +0300 @@ -40,7 +40,6 @@ import gtk import xml.sax, xml.sax.handler import re -import warnings from cStringIO import StringIO import socket import time @@ -56,7 +55,8 @@ from common import gajim import tooltips - +import logging +log = logging.getLogger('gajim.htmlview') __all__ = ['HtmlTextView'] @@ -302,7 +302,7 @@ val = sign*max(minl, min(abs(val), maxl)) callback(val, *args) except Exception: - warnings.warn('Unable to parse length value "%s"' % value) + log.warning('Unable to parse length value "%s"' % value) def __parse_font_size_cb(length, tag): tag.set_property('size-points', length/display_resolution) @@ -348,7 +348,7 @@ 'oblique': pango.STYLE_OBLIQUE, } [value] except KeyError: - warnings.warn('unknown font-style %s' % value) + log.warning('unknown font-style %s' % value) else: tag.set_property('style', style) @@ -386,7 +386,7 @@ 'bold': pango.WEIGHT_BOLD, } [value] except KeyError: - warnings.warn('unknown font-style %s' % value) + log.warning('unknown font-style %s' % value) else: tag.set_property('weight', weight) @@ -402,7 +402,7 @@ 'justify': gtk.JUSTIFY_FILL, } [value] except KeyError: - warnings.warn('Invalid text-align:%s requested' % value) + log.warning('Invalid text-align:%s requested' % value) else: tag.set_property('justification', align) @@ -420,9 +420,9 @@ else: tag.set_property('strikethrough', False) if 'blink' in values: - warnings.warn('text-decoration:blink not implemented') + log.warning('text-decoration:blink not implemented') if 'overline' in values: - warnings.warn('text-decoration:overline not implemented') + log.warning('text-decoration:overline not implemented') def _parse_style_white_space(self, tag, value): if value == 'pre': @@ -436,7 +436,7 @@ try: tag.set_property(propname, value) except Exception: - gajim.log.warn( "Error with prop: " + propname + " for tag: " + str(tag)) + log.warning( "Error with prop: " + propname + " for tag: " + str(tag)) def _parse_style_width(self, tag, value): @@ -460,7 +460,7 @@ try: method = locals()['_parse_style_%s' % style.replace('-', '_')] except KeyError: - warnings.warn('Style attribute "%s" not yet implemented' % style) + log.warning('Style attribute "%s" not yet implemented' % style) else: __style_methods[style] = method del style @@ -496,7 +496,7 @@ req.add_header('User-Agent', 'Gajim ' + gajim.version) f = urllib2.urlopen(req) except Exception, ex: - gajim.log.debug('Error loading image %s ' % attrs['src'] + str(ex)) + log.debug('Error loading image %s ' % attrs['src'] + str(ex)) pixbuf = None alt = attrs.get('alt', 'Broken image') else: @@ -509,7 +509,7 @@ deadline = time.time() + 3 while True: if time.time() > deadline: - gajim.log.debug(str('Timeout loading image %s ' % \ + log.debug(str('Timeout loading image %s ' % \ attrs['src'] + ex)) mem = '' alt = attrs.get('alt', '') @@ -520,7 +520,7 @@ try: temp = f.read(100) except socket.timeout, ex: - gajim.log.debug('Timeout loading image %s ' % \ + log.debug('Timeout loading image %s ' % \ attrs['src'] + str(ex)) alt = attrs.get('alt', '') if alt: @@ -596,7 +596,7 @@ else: self._insert_text('[IMG: %s]' % alt) except Exception, ex: - gajim.log.error('Error loading image ' + str(ex)) + log.error('Error loading image ' + str(ex)) pixbuf = None alt = attrs.get('alt', 'Broken image') try: @@ -620,7 +620,7 @@ try: method = self.__style_methods[attr] except KeyError: - warnings.warn('Style attribute "%s" requested ' + log.warning('Style attribute "%s" requested ' 'but not yet implemented' % attr) else: method(self, tag, val) @@ -755,7 +755,7 @@ elif name in INLINE: self._jump_line() else: - warnings.warn('Unhandled element "%s"' % name) + log.warning('Unhandled element "%s"' % name) def endElement(self, name): endPreserving = False @@ -771,7 +771,7 @@ #self._insert_text(u'\u2550'*40) self._jump_line() except Exception, e: - gajim.log.debug(str('Error in hr'+e)) + log.debug(str('Error in hr'+e)) elif name in LIST_ELEMS: self.list_counters.pop() elif name == 'li': @@ -790,7 +790,7 @@ if name == 'pre': endPreserving = True else: - warnings.warn("Unhandled element '%s'" % name) + log.warning("Unhandled element '%s'" % name) self._flush_text() if endPreserving: self.preserve = False @@ -935,17 +935,7 @@ from conversation_textview import ConversationTextview import gajim as gaj - class log(object): - - def debug(self, text): - print "debug:", text - def warn(self, text): - print "warn;", text - def error(self, text): - print "error;", text - - gajim.log=log() - + log = logging.getLogger() gaj.Interface() htmlview = ConversationTextview(None)

1 0

gajim: Fix special text parsing again
by Denis Fomin 21 May '11

21 May '11

changeset ca2800ac665f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ca2800ac665f description: Fix special text parsing again diffstat: src/conversation_textview.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diffs (30 lines): diff -r 7f9aa1be8e3b -r ca2800ac665f src/conversation_textview.py --- a/src/conversation_textview.py Fri Nov 26 22:10:57 2010 +0300 +++ b/src/conversation_textview.py Fri Nov 26 22:57:32 2010 +0300 @@ -1076,19 +1076,19 @@ self.images.append(img) # add with possible animation self.tv.add_child_at_anchor(img, anchor) - if not is_xhtml_link: - if special_text.startswith('www.') or \ + elif special_text.startswith('www.') or \ special_text.startswith('ftp.') or \ - text_is_valid_uri: + text_is_valid_uri and not is_xhtml_link: tags.append('url') - elif special_text.startswith('mailto:'): + elif special_text.startswith('mailto:') and not is_xhtml_link: tags.append('mail') - elif special_text.startswith('xmpp:'): + elif special_text.startswith('xmpp:') and not is_xhtml_link: tags.append('xmpp') - elif gajim.interface.sth_at_sth_dot_sth_re.match(special_text): + elif gajim.interface.sth_at_sth_dot_sth_re.match(special_text) and\ + not is_xhtml_link: # it's a JID or mail tags.append('sth_at_sth') - if special_text.startswith('*'): # it's a bold text + elif special_text.startswith('*'): # it's a bold text tags.append('bold') if special_text[1] == '/' and special_text[-2] == '/' and\ len(special_text) > 4: # it's also italic

1 0

gajim: Fix special text parsing
by Denis Fomin 21 May '11

21 May '11

changeset 7f9aa1be8e3b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7f9aa1be8e3b description: Fix special text parsing diffstat: src/conversation_textview.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 814fd9d671b5 -r 7f9aa1be8e3b src/conversation_textview.py --- a/src/conversation_textview.py Fri Nov 26 17:55:25 2010 +0300 +++ b/src/conversation_textview.py Fri Nov 26 22:10:57 2010 +0300 @@ -1076,7 +1076,7 @@ self.images.append(img) # add with possible animation self.tv.add_child_at_anchor(img, anchor) - elif not is_xhtml_link: + if not is_xhtml_link: if special_text.startswith('www.') or \ special_text.startswith('ftp.') or \ text_is_valid_uri: @@ -1088,7 +1088,7 @@ elif gajim.interface.sth_at_sth_dot_sth_re.match(special_text): # it's a JID or mail tags.append('sth_at_sth') - elif special_text.startswith('*'): # it's a bold text + if special_text.startswith('*'): # it's a bold text tags.append('bold') if special_text[1] == '/' and special_text[-2] == '/' and\ len(special_text) > 4: # it's also italic

1 0

gajim: Remove unused print
by Denis Fomin 21 May '11

21 May '11

changeset 814fd9d671b5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=814fd9d671b5 description: Remove unused print diffstat: src/conversation_textview.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r cb63dc4d0381 -r 814fd9d671b5 src/conversation_textview.py --- a/src/conversation_textview.py Sat May 21 18:45:38 2011 +0200 +++ b/src/conversation_textview.py Fri Nov 26 17:55:25 2010 +0300 @@ -1371,7 +1371,6 @@ self.tv.display_html(xhtml.encode('utf-8'), self) return except Exception, e: - print e gajim.log.debug('Error processing xhtml' + str(e)) gajim.log.debug('with |' + xhtml + '|')

1 0

gajim: banner_tweaks plugin. Fixed again
by Denis Fomin 21 May '11

21 May '11

changeset 6303371c459c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6303371c459c description: banner_tweaks plugin. Fixed again diffstat: plugins/banner_tweaks/plugin.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (20 lines): diff -r 33350e60b32f -r 6303371c459c plugins/banner_tweaks/plugin.py --- a/plugins/banner_tweaks/plugin.py Sat May 21 23:17:17 2011 +0400 +++ b/plugins/banner_tweaks/plugin.py Sat May 21 23:34:31 2011 +0400 @@ -79,12 +79,12 @@ chat_control.banner_status_label.set_markup(status_text) if not self.config['show_banner_image']: - if chat_control.type_id == 'chat': + if chat_control.TYPE_ID == message_control.TYPE_GC: + banner_status_img = chat_control.xml.get_object( + 'gc_banner_status_image') + else: banner_status_img = chat_control.xml.get_object( 'banner_status_image') - else: - banner_status_img = chat_control.xml.get_object( - 'gc_banner_status_image') banner_status_img.clear() # TODO: part below repeats a lot of code from ChatControl.draw_banner_text()

1 0

gajim: banner_tweaks plugin. prevent Tb in the gc if 'show_bann...
by Denis Fomin 21 May '11

21 May '11

changeset 33350e60b32f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=33350e60b32f description: banner_tweaks plugin. prevent Tb in the gc if 'show_banner_image' is disabled diffstat: plugins/banner_tweaks/plugin.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (17 lines): diff -r 7f5f1b47b261 -r 33350e60b32f plugins/banner_tweaks/plugin.py --- a/plugins/banner_tweaks/plugin.py Sat May 21 19:40:11 2011 +0200 +++ b/plugins/banner_tweaks/plugin.py Sat May 21 23:17:17 2011 +0400 @@ -79,7 +79,12 @@ chat_control.banner_status_label.set_markup(status_text) if not self.config['show_banner_image']: - banner_status_img = chat_control.xml.get_object('banner_status_image') + if chat_control.type_id == 'chat': + banner_status_img = chat_control.xml.get_object( + 'banner_status_image') + else: + banner_status_img = chat_control.xml.get_object( + 'gc_banner_status_image') banner_status_img.clear() # TODO: part below repeats a lot of code from ChatControl.draw_banner_text()

1 0

gajim: change shortcut letter for actions -> send single message
by Yann Leboulanger 21 May '11

21 May '11

changeset 7f5f1b47b261 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7f5f1b47b261 description: change shortcut letter for actions -> send single message diffstat: data/gui/roster_window.ui | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diffs (89 lines): diff -r 776b8b6e190d -r 7f5f1b47b261 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Sat May 21 20:26:00 2011 +0400 +++ b/data/gui/roster_window.ui Sat May 21 19:40:11 2011 +0200 @@ -12,11 +12,11 @@ <accel-groups> <group name="accelgroup1"/> </accel-groups> + <signal name="focus_in_event" handler="on_roster_window_focus_in_event"/> <signal name="key_press_event" handler="on_roster_window_key_press_event"/> + <signal name="delete_event" handler="on_roster_window_delete_event"/> <signal name="focus_out_event" handler="on_roster_window_focus_out_event"/> <signal name="popup_menu" handler="on_roster_window_popup_menu"/> - <signal name="delete_event" handler="on_roster_window_delete_event"/> - <signal name="focus_in_event" handler="on_roster_window_focus_in_event"/> <child> <object class="GtkVBox" id="roster_vbox"> <property name="visible">True</property> @@ -44,7 +44,7 @@ </child> <child> <object class="GtkImageMenuItem" id="send_single_message_menuitem"> - <property name="label" translatable="yes">_Send Single Message...</property> + <property name="label" translatable="yes">Send Single _Message...</property> <property name="use_underline">True</property> <property name="image">image2</property> <property name="use_stock">False</property> @@ -224,7 +224,6 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Show Roster Fi_lter</property> <property name="use_underline">True</property> - <property name="active">False</property> <accelerator key="L" signal="activate" modifiers="GDK_CONTROL_MASK"/> <signal name="toggled" handler="on_show_rfilter_menuitem_toggled"/> </object> @@ -343,22 +342,21 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="orientation">vertical</property> <child> - <object class="GtkEntry" id="rfilter_entry"> - <property name="visible">False</property> - <property name="no_show_all">True</property> - <property name="editable">False</property> - <property name="can_focus">True</property> - <property name="primary_icon_stock">gtk-clear</property> - <property name="primary_icon_activatable">True</property> - <signal name="changed" handler="on_rfilter_entry_changed"/> - <signal name="icon_press" handler="on_rfilter_entry_icon_press"/> - </object> + <object class="GtkEntry" id="rfilter_entry"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="editable">False</property> + <property name="primary_icon_stock">gtk-clear</property> + <property name="primary_icon_activatable">True</property> + <signal name="changed" handler="on_rfilter_entry_changed"/> + <signal name="icon_press" handler="on_rfilter_entry_icon_press"/> + </object> <packing> <property name="expand">False</property> <property name="position">0</property> </packing> - </child> - <child> + </child> + <child> <object class="GtkScrolledWindow" id="scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -370,15 +368,15 @@ <property name="can_focus">True</property> <property name="headers_visible">False</property> <property name="reorderable">True</property> - <signal name="row_collapsed" handler="on_roster_treeview_row_collapsed"/> - <signal name="button_press_event" handler="on_roster_treeview_button_press_event"/> - <signal name="motion_notify_event" handler="on_roster_treeview_motion_notify_event"/> - <signal name="row_activated" handler="on_roster_treeview_row_activated"/> - <signal name="button_release_event" handler="on_roster_treeview_button_release_event"/> <signal name="row_expanded" handler="on_roster_treeview_row_expanded"/> <signal name="key_press_event" handler="on_roster_treeview_key_press_event"/> <signal name="scroll_event" handler="on_roster_treeview_scroll_event"/> <signal name="leave_notify_event" handler="on_roster_treeview_leave_notify_event"/> + <signal name="button_press_event" handler="on_roster_treeview_button_press_event"/> + <signal name="row_activated" handler="on_roster_treeview_row_activated"/> + <signal name="row_collapsed" handler="on_roster_treeview_row_collapsed"/> + <signal name="motion_notify_event" handler="on_roster_treeview_motion_notify_event"/> + <signal name="button_release_event" handler="on_roster_treeview_button_release_event"/> </object> </child> </object>

1 0

gajim: fix traceback when launching Gajim
by Yann Leboulanger 21 May '11

21 May '11

changeset cb63dc4d0381 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cb63dc4d0381 description: fix traceback when launching Gajim diffstat: src/roster_window.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diffs (13 lines): diff -r 87a64faecb33 -r cb63dc4d0381 src/roster_window.py --- a/src/roster_window.py Fri May 20 22:49:45 2011 +0200 +++ b/src/roster_window.py Sat May 21 18:45:38 2011 +0200 @@ -1102,9 +1102,6 @@ return False def draw_contact(self, jid, account, selected=False, focus=False): - gobject.idle_add(self._draw_contact, jid, account, selected, focus) - - def _draw_contact(self, jid, account, selected=False, focus=False): """ Draw the correct state image, name BUT not avatar """

1 0

gajim: add new attribut to MessageOutgoingEvent to allow logging...
by Denis Fomin 21 May '11

21 May '11

changeset 776b8b6e190d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=776b8b6e190d description: add new attribut to MessageOutgoingEvent to allow logging configuration diffstat: src/common/connection.py | 2 ++ src/common/connection_handlers_events.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diffs (25 lines): diff -r 8d65c137c447 -r 776b8b6e190d src/common/connection.py --- a/src/common/connection.py Fri May 20 22:36:10 2011 +0200 +++ b/src/common/connection.py Sat May 21 20:26:00 2011 +0400 @@ -1781,6 +1781,8 @@ if obj.callback: obj.callback(msg_id, *obj.callback_args) + if not obj.is_loggable: + return self.log_message(jid, msg, forward_from, session, original_message, subject, type_) diff -r 8d65c137c447 -r 776b8b6e190d src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri May 20 22:36:10 2011 +0200 +++ b/src/common/connection_handlers_events.py Sat May 21 20:26:00 2011 +0400 @@ -2067,6 +2067,7 @@ self.callback = None self.callback_args = [] self.now = False + self.is_loggable = True def generate(self): - return True \ No newline at end of file + return True

1 0

← Newer
1
2
3
4
5
6
7
...
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2011