Commits May 2011

commits@gajim.org

3 participants
119 discussions

gajim: use shutil.move instead of os.rename to move files. Fixes...
by Yann Leboulanger 20 May '11

20 May '11

changeset 351105e31243 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=351105e31243 description: use shutil.move instead of os.rename to move files. Fixes #6770 diffstat: src/common/check_paths.py | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diffs (56 lines): diff -r 375d3d2a65dc -r 351105e31243 src/common/check_paths.py --- a/src/common/check_paths.py Sat Mar 05 09:40:01 2011 +0100 +++ b/src/common/check_paths.py Sun Jan 23 11:31:29 2011 +0100 @@ -24,6 +24,7 @@ ## import os +import shutil import sys import stat @@ -248,13 +249,11 @@ if not os.path.exists(src): continue print 'moving %s to %s' % (src, dst) - os.renames(src, dst) + shutil.move(src, dst) gajim.logger.init_vars() gajim.logger.attach_cache_database() def check_and_possibly_create_paths(): - check_and_possibly_move_config() - LOG_DB_PATH = logger.LOG_DB_PATH LOG_DB_FOLDER, LOG_DB_FILE = os.path.split(LOG_DB_PATH) @@ -310,6 +309,15 @@ print _('Gajim will now exit') sys.exit() + if not os.path.exists(CACHE_DB_FOLDER): + create_path(CACHE_DB_FOLDER) + elif os.path.isfile(CACHE_DB_FOLDER): + print _('%s is a file but it should be a directory') % CACHE_DB_FOLDER + print _('Gajim will now exit') + sys.exit() + + check_and_possibly_move_config() + if not os.path.exists(LOG_DB_PATH): create_log_db() gajim.logger.init_vars() @@ -318,13 +326,6 @@ print _('Gajim will now exit') sys.exit() - if not os.path.exists(CACHE_DB_FOLDER): - create_path(CACHE_DB_FOLDER) - elif os.path.isfile(CACHE_DB_FOLDER): - print _('%s is a file but it should be a directory') % CACHE_DB_FOLDER - print _('Gajim will now exit') - sys.exit() - if not os.path.exists(CACHE_DB_PATH): create_cache_db() gajim.logger.attach_cache_database()

1 0

gajim: don't remove false values from sent dataforms. Fixes #676...
by Yann Leboulanger 20 May '11

20 May '11

changeset 375d3d2a65dc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=375d3d2a65dc description: don't remove false values from sent dataforms. Fixes #6765, see #6113 diffstat: src/common/dataforms.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 3e98fd816fdf -r 375d3d2a65dc src/common/dataforms.py --- a/src/common/dataforms.py Wed Jan 12 22:47:36 2011 +0100 +++ b/src/common/dataforms.py Sat Mar 05 09:40:01 2011 +0100 @@ -628,8 +628,8 @@ f.values = [''] # Keep all required fields continue - if (hasattr(f, 'value') and not f.value) or (hasattr(f, 'values') \ - and len(f.values) == 0): + if (hasattr(f, 'value') and not f.value and f.value != 0) or ( + hasattr(f, 'values') and len(f.values) == 0): to_be_removed.append(f) else: del f.label

1 0

gajim: prevent Traceback when there is an empty secret file. Fix...
by Yann Leboulanger 20 May '11

20 May '11

changeset 3e98fd816fdf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3e98fd816fdf description: prevent Traceback when there is an empty secret file. Fixes #6752 diffstat: src/secrets.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 31348a3e6d87 -r 3e98fd816fdf src/secrets.py --- a/src/secrets.py Wed Jan 12 06:56:28 2011 +0100 +++ b/src/secrets.py Wed Jan 12 22:47:36 2011 +0100 @@ -99,7 +99,7 @@ try: secrets = pickle.load(f) - except KeyError: + except (KeyError, EOFError): f.close() secrets = Secrets(filename)

1 0

gajim: fix offset for some timezones computation. Fixes #6749
by Yann Leboulanger 20 May '11

20 May '11

changeset 31348a3e6d87 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=31348a3e6d87 description: fix offset for some timezones computation. Fixes #6749 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0e4097ee80da -r 31348a3e6d87 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed May 11 20:02:16 2011 +0200 +++ b/src/common/connection_handlers.py Wed Jan 12 06:56:28 2011 +0100 @@ -1261,7 +1261,7 @@ namespace=common.xmpp.NS_TIME_REVISED) qp.setTagData('utc', strftime('%Y-%m-%dT%H:%M:%SZ', gmtime())) isdst = localtime().tm_isdst - zone = -(timezone, altzone)[isdst] / 60 + zone = -(timezone, altzone)[isdst] / 60.0 tzo = (zone / 60, abs(zone % 60)) qp.setTagData('tzo', '%+03d:%02d' % (tzo)) self.connection.send(iq_obj)

1 0

gajim: don't fail when we pass gtk / gnome session args to Gajim...
by Yann Leboulanger 20 May '11

20 May '11

changeset 0e4097ee80da in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0e4097ee80da description: don't fail when we pass gtk / gnome session args to Gajim. Fixes #6748 diffstat: src/gajim.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 4a81a7fa2392 -r 0e4097ee80da src/gajim.py --- a/src/gajim.py Tue Dec 21 23:33:45 2010 +0100 +++ b/src/gajim.py Wed May 11 20:02:16 2011 +0200 @@ -109,7 +109,10 @@ try: shortargs = 'hqvl:p:c:' + # add gtk/gnome session option as gtk_get_option_group is not wrapped longargs = 'help quiet verbose loglevel= profile= config_path=' + longargs += ' class= name= screen= gtk-module= sync g-fatal-warnings' + longargs += ' sm-client-id= sm-client-state-file= sm-disable' opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] except getopt.error, msg1: print msg1

1 0

gajim: [steelman] Check sound allowance for contact_connected an...
by Yann Leboulanger 20 May '11

20 May '11

changeset 4a81a7fa2392 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4a81a7fa2392 description: [steelman] Check sound allowance for contact_connected and contact_disconnected events. Fixes #6118 diffstat: src/notify.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (22 lines): diff -r e0b11ed48824 -r 4a81a7fa2392 src/notify.py --- a/src/notify.py Wed Dec 15 12:17:34 2010 +0300 +++ b/src/notify.py Tue Dec 21 23:33:45 2010 +0100 @@ -162,14 +162,16 @@ do_popup = True if gajim.config.get_per('soundevents', 'contact_connected', 'enabled') and not gajim.block_signed_in_notifications[account] and \ - not block_transport: + not block_transport and helpers.allow_sound_notification(account, + event, advanced_notif_num): do_sound = True elif event == 'contact_disconnected': status_message = parameters if helpers.allow_showing_notification(account, 'notify_on_signout'): do_popup = True if gajim.config.get_per('soundevents', 'contact_disconnected', - 'enabled'): + 'enabled') and helpers.allow_sound_notification(account, + event, advanced_notif_num): do_sound = True elif event == 'new_message': message_type = parameters[0]

1 0

gajim: fix 'gajim-remote open_chat' command for minimized gropch...
by Denis Fomin 20 May '11

20 May '11

changeset e0b11ed48824 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e0b11ed48824 description: fix 'gajim-remote open_chat' command for minimized gropchats. Fixes #6107 diffstat: src/remote_control.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (23 lines): diff -r 7dafaee10ac0 -r e0b11ed48824 src/remote_control.py --- a/src/remote_control.py Fri Dec 17 12:09:56 2010 +0100 +++ b/src/remote_control.py Wed Dec 15 12:17:34 2010 +0300 @@ -386,6 +386,8 @@ break # jid is in roster elif contact: + minimized_control = \ + jid in gajim.interface.minimized_controls[acct] connected_account = acct break # we send the message to jid not in roster, because account is @@ -399,6 +401,10 @@ if connected_account is None and first_connected_acct: connected_account = first_connected_acct + if minimized_control: + gajim.interface.roster.on_groupchat_maximized(None, jid, + connected_account) + if connected_account: gajim.interface.new_chat_from_jid(connected_account, jid, message) # preserve the 'steal focus preservation'

1 0

gajim: don't scroll in groupchat when window doesn't have focus....
by Yann Leboulanger 20 May '11

20 May '11

changeset 7dafaee10ac0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7dafaee10ac0 description: don't scroll in groupchat when window doesn't have focus. Fixes #6100 diffstat: src/conversation_textview.py | 8 +++++--- src/groupchat_control.py | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diffs (38 lines): diff -r f8e3bf91879e -r 7dafaee10ac0 src/conversation_textview.py --- a/src/conversation_textview.py Tue Nov 30 23:36:57 2010 +0100 +++ b/src/conversation_textview.py Fri Dec 17 12:09:56 2010 +0100 @@ -522,7 +522,7 @@ del self.xep0184_marks[id_] del self.xep0184_shown[id_] - def show_focus_out_line(self): + def show_focus_out_line(self, scroll=True): if not self.allow_focus_out_line: # if room did not receive focus-in from the last time we added # --- line then do not readd @@ -581,8 +581,10 @@ buffer_.end_user_action() - # scroll to the end (via idle in case the scrollbar has appeared) - gobject.idle_add(self.scroll_to_end) + if scroll: + # scroll to the end (via idle in case the scrollbar has + # appeared) + gobject.idle_add(self.scroll_to_end) def show_xep0184_warning_tooltip(self): pointer = self.tv.get_pointer() diff -r f8e3bf91879e -r 7dafaee10ac0 src/groupchat_control.py --- a/src/groupchat_control.py Tue Nov 30 23:36:57 2010 +0100 +++ b/src/groupchat_control.py Fri Dec 17 12:09:56 2010 +0100 @@ -1041,7 +1041,8 @@ # we have full focus (we are reading it!) return - self.conv_textview.show_focus_out_line() + at_the_end = self.conv_textview.at_the_end() + self.conv_textview.show_focus_out_line(scroll=at_the_end) def needs_visual_notification(self, text): """

1 0

gajim: ignore groupchat invitations from contacts that are not i...
by Yann Leboulanger 20 May '11

20 May '11

changeset f8e3bf91879e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f8e3bf91879e description: ignore groupchat invitations from contacts that are not in roster if ignore_unknown_contacts is enabled. Fixes #6057 diffstat: src/common/connection_handlers.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r e0711a43ae6d -r f8e3bf91879e src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Nov 29 13:25:17 2010 +0300 +++ b/src/common/connection_handlers.py Tue Nov 30 23:36:57 2010 +0100 @@ -1495,6 +1495,10 @@ except common.helpers.InvalidFormat: log.warn('Invalid JID: %s, ignoring it' % xtag.getAttr('jid')) continue + if gajim.config.get_per('accounts', self.name, + 'ignore_unknown_contacts') and not gajim.contacts.get_contacts( + self.name, jid): + return is_continued = False if xtag.getTag('continue'): is_continued = True

1 0

gajim: Fix gtk warning again. Fixed #6053
by Denis Fomin 20 May '11

20 May '11

changeset e0711a43ae6d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e0711a43ae6d description: Fix gtk warning again. Fixed #6053 diffstat: src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r fbbe1cc6ab52 -r e0711a43ae6d src/roster_window.py --- a/src/roster_window.py Fri Nov 26 17:50:20 2010 +0300 +++ b/src/roster_window.py Mon Nov 29 13:25:17 2010 +0300 @@ -1102,6 +1102,9 @@ 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

← Newer
1
...
5
6
7
8
9
10
11
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