Commits March 2008

commits@gajim.org

5 participants
80 discussions

[commit-gajim] r9417 - in trunk: data/glade src/common
by asterix＠gajim.org 24 Mar '08

24 Mar '08

Author: asterix Date: 2008-03-24 22:59:39 +0100 (Mon, 24 Mar 2008) New Revision: 9417 Modified: trunk/data/glade/history_window.glade trunk/src/common/config.py Log: [Nico Gulden] typo in some strings Modified: trunk/data/glade/history_window.glade =================================================================== --- trunk/data/glade/history_window.glade 2008-03-24 09:16:03 UTC (rev 9416) +++ trunk/data/glade/history_window.glade 2008-03-24 21:59:39 UTC (rev 9417) @@ -34,7 +34,7 @@ <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="tooltip" translatable="yes">Choose the chatlog you want to view. -Enter the jid of a groupchat or a contact here. For online accounts you can even enter a a contact's nickname.</property> +Enter the jid of a groupchat or a contact here. For online accounts you can even enter a contact's nickname.</property> <signal name="activate" handler="on_jid_entry_activate"/> </widget> </child> Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-03-24 09:16:03 UTC (rev 9416) +++ trunk/src/common/config.py 2008-03-24 21:59:39 UTC (rev 9417) @@ -77,10 +77,10 @@ 'show_transports_group': [ opt_bool, True ], 'autoaway': [ opt_bool, True ], 'autoawaytime': [ opt_int, 5, _('Time in minutes, after which your status changes to away.') ], - 'autoaway_message': [ opt_str, _('$S (Away as a result of being idle more than $T min)'), _('$S with be replaced by current status message, $T by autoaway time.') ], + 'autoaway_message': [ opt_str, _('$S (Away as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoaway time.') ], 'autoxa': [ opt_bool, True ], 'autoxatime': [ opt_int, 15, _('Time in minutes, after which your status changes to not available.') ], - 'autoxa_message': [ opt_str, _('$S (Not available as a result of being idle more than $T min)'), _('$S with be replaced by current status message, $T by autoxa time.') ], + 'autoxa_message': [ opt_str, _('$S (Not available as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoxa time.') ], 'ask_online_status': [ opt_bool, False ], 'ask_offline_status': [ opt_bool, False ], 'last_status_msg_online': [ opt_str, '' ],

1 0

[commit-gajim] r9416 - trunk/src
by asterix＠gajim.org 24 Mar '08

24 Mar '08

Author: asterix Date: 2008-03-24 10:16:03 +0100 (Mon, 24 Mar 2008) New Revision: 9416 Modified: trunk/src/groupchat_control.py Log: update GC_Contact instance when we change our nickname in a room. fixes #3784 Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-03-24 00:45:53 UTC (rev 9415) +++ trunk/src/groupchat_control.py 2008-03-24 09:16:03 UTC (rev 9416) @@ -1017,18 +1017,18 @@ s = _('You are now known as %s') % new_nick else: s = _('%s is now known as %s') % (nick, new_nick) - # We add new nick to muc roster here, so we don't see - # that "new_nick has joined the room" when he just changed nick. - # add_contact_to_roster will be called a second time - # after that, but that doesn't hurt - self.add_contact_to_roster(new_nick, show, role, affiliation, - status, jid) - if nick in self.attention_list: - self.attention_list.remove(nick) - # keep nickname color - if nick in self.gc_custom_colors: - self.gc_custom_colors[new_nick] = \ - self.gc_custom_colors[nick] + # We add new nick to muc roster here, so we don't see + # that "new_nick has joined the room" when he just changed nick. + # add_contact_to_roster will be called a second time + # after that, but that doesn't hurt + self.add_contact_to_roster(new_nick, show, role, affiliation, + status, jid) + if nick in self.attention_list: + self.attention_list.remove(nick) + # keep nickname color + if nick in self.gc_custom_colors: + self.gc_custom_colors[new_nick] = \ + self.gc_custom_colors[nick] # rename vcard / avatar puny_jid = helpers.sanitize_filename(self.room_jid) puny_nick = helpers.sanitize_filename(nick)

1 0

[commit-gajim] r9415 - trunk/src/common
by jim++＠gajim.org 24 Mar '08

24 Mar '08

Author: jim++ Date: 2008-03-24 01:45:53 +0100 (Mon, 24 Mar 2008) New Revision: 9415 Modified: trunk/src/common/logger.py Log: Use appropriate function to remove a line in unread_message table. See #3793. Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2008-03-23 22:52:29 UTC (rev 9414) +++ trunk/src/common/logger.py 2008-03-24 00:45:53 UTC (rev 9415) @@ -371,12 +371,7 @@ results = self.cur.fetchall() if len(results) == 0: # Log line is no more in logs table. remove it from unread_messages - sql = 'DELETE FROM unread_messages WHERE message_id=%s' % msg_id - self.cur.execute(sql) - try: - self.con.commit() - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + self.set_read_messages([msg_id]) continue all_messages.append(results[0]) return all_messages

1 0

[commit-gajim] r9414 - trunk/src/common
by asterix＠gajim.org 23 Mar '08

23 Mar '08

Author: asterix Date: 2008-03-23 23:52:29 +0100 (Sun, 23 Mar 2008) New Revision: 9414 Modified: trunk/src/common/logger.py Log: remove lines from unread_messages if messages are no more in logs table. Fixes #3793 Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2008-03-23 17:44:47 UTC (rev 9413) +++ trunk/src/common/logger.py 2008-03-23 22:52:29 UTC (rev 9414) @@ -369,8 +369,16 @@ ''' % msg_id ) results = self.cur.fetchall() - if len(results) > 0: - all_messages.append(results[0]) + if len(results) == 0: + # Log line is no more in logs table. remove it from unread_messages + sql = 'DELETE FROM unread_messages WHERE message_id=%s' % msg_id + self.cur.execute(sql) + try: + self.con.commit() + except sqlite.OperationalError, e: + print >> sys.stderr, str(e) + continue + all_messages.append(results[0]) return all_messages def write(self, kind, jid, message = None, show = None, tim = None,

1 0

[commit-gajim] r9413 - trunk/src
by jim++＠gajim.org 23 Mar '08

23 Mar '08

Author: jim++ Date: 2008-03-23 18:44:47 +0100 (Sun, 23 Mar 2008) New Revision: 9413 Modified: trunk/src/chat_control.py trunk/src/roster_window.py Log: chat_control : fix possible var name confusion roster : Fix resource problem, gajim.contacts.get_contact() can return first contact instead of specified resource. Fixes #3789. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-03-23 11:14:50 UTC (rev 9412) +++ trunk/src/chat_control.py 2008-03-23 17:44:47 UTC (rev 9413) @@ -1217,8 +1217,9 @@ if acct_info: # We already found a contact with same nick break for jid in gajim.contacts.get_jid_list(account): - contact_ = gajim.contacts.get_first_contact_from_jid(account, jid) - if contact_.get_shown_name() == self.contact.get_shown_name(): + other_contact_ = \ + gajim.contacts.get_first_contact_from_jid(account, jid) + if other_contact_.get_shown_name() == self.contact.get_shown_name(): acct_info = ' (%s)' % \ gobject.markup_escape_text(self.account) break Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-03-23 11:14:50 UTC (rev 9412) +++ trunk/src/roster_window.py 2008-03-23 17:44:47 UTC (rev 9413) @@ -4350,6 +4350,7 @@ type_ = model[path][C_TYPE] jid = model[path][C_JID].decode('utf-8') resource = None + contact = None iter = model.get_iter(path) if type_ in ('group', 'account'): if self.tree.row_expanded(path): @@ -4386,12 +4387,15 @@ fjid += '/' + resource if self.open_event(account, fjid, first_ev): return - c = gajim.contacts.get_contact(account, jid, resource) - if not c or isinstance(c, list): - c = gajim.contacts.get_contact_with_highest_priority(account, jid) + # else + contact = gajim.contacts.get_contact(account, jid, resource) + if not contact or isinstance(contact, list): + contact = \ + gajim.contacts.get_contact_with_highest_priority(account, jid) if jid == gajim.get_jid_from_account(account): - resource = c.resource - self.on_open_chat_window(widget, c, account, resource = resource, session = session) + resource = contact.resource + self.on_open_chat_window(widget, contact, account, \ + resource = resource, session = session) def on_roster_treeview_row_activated(self, widget, path, col = 0): '''When an iter is double clicked: open the first event window'''

1 0

[commit-gajim] r9412 - trunk/src
by asterix＠gajim.org 23 Mar '08

23 Mar '08

Author: asterix Date: 2008-03-23 12:14:50 +0100 (Sun, 23 Mar 2008) New Revision: 9412 Modified: trunk/src/dialogs.py Log: make About dialog not use run() function. fixes #3788 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-03-23 11:06:51 UTC (rev 9411) +++ trunk/src/dialogs.py 2008-03-23 11:14:50 UTC (rev 9412) @@ -1000,12 +1000,12 @@ artists = ['Anders Ström', 'Christophe Got', 'Dennis Craven', 'Guillaume Morin', 'Josef Vybíral', 'Membris Khan'] dlg.set_artists(artists) - gobject.idle_add(self.dorun, dlg) + # connect close button to destroy() function + for button in dlg.action_area.get_children(): + if button.get_property('label') == gtk.STOCK_CLOSE: + button.connect('clicked', lambda x:dlg.destroy()) + dlg.show_all() - def dorun(self, dlg): - rep = dlg.run() - dlg.destroy() - def tuple2str(self, tuple_): str_ = '' for num in tuple_:

1 0

[commit-gajim] r9411 - trunk/debian
by asterix＠gajim.org 23 Mar '08

23 Mar '08

Author: asterix Date: 2008-03-23 12:06:51 +0100 (Sun, 23 Mar 2008) New Revision: 9411 Modified: trunk/debian/rules Log: fix GnuPGInterface.py removal in debian: remove also .pyc and .pyo Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-03-22 21:02:19 UTC (rev 9410) +++ trunk/debian/rules 2008-03-23 11:06:51 UTC (rev 9411) @@ -13,7 +13,7 @@ DEB_MAKE_INSTALL_TARGET = install PYTHON=python$(PYTHONVER) DESTDIR=$(DEB_DESTDIR) binary-install/gajim:: - rm $(DEB_DESTDIR)/usr/share/gajim/src/common/GnuPGInterface.py + rm $(DEB_DESTDIR)/usr/share/gajim/src/common/GnuPGInterface.py* dh_pysupport -pgajim convert $(DEB_DESTDIR)/usr/share/pixmaps/gajim.png -resize 32x32 $(DEB_DESTDIR)/usr/share/pixmaps/gajim.xpm install -m 0644 debian/gajim.lintian $(DEB_DESTDIR)/usr/share/lintian/overrides/gajim

1 0

[commit-gajim] r9410 - trunk/src
by nicfit＠gajim.org 22 Mar '08

22 Mar '08

Author: nicfit Date: 2008-03-22 22:02:19 +0100 (Sat, 22 Mar 2008) New Revision: 9410 Modified: trunk/src/message_window.py Log: bumped (C) Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-03-22 20:51:19 UTC (rev 9409) +++ trunk/src/message_window.py 2008-03-22 21:02:19 UTC (rev 9410) @@ -6,7 +6,7 @@ ## Vincent Hanquez <tab(a)snarc.org> ## Dimitur Kirov <dkirov(a)gmail.com> ## Norman Rasmussen <norman(a)rasmussen.co.za> -## Copyright (C) 2005-2007 Travis Shirk <travis(a)pobox.com> +## Copyright (C) 2005-2008 Travis Shirk <travis(a)pobox.com> ## Copyright (C) 2006 Geobert Quach <geobert(a)gmail.com> ## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> ## Copyright (C) 2005-2008 Nikos Kouremenos <kourem(a)gmail.com>

1 0

[commit-gajim] r9409 - trunk/src
by nicfit＠gajim.org 22 Mar '08

22 Mar '08

Author: nicfit Date: 2008-03-22 21:51:19 +0100 (Sat, 22 Mar 2008) New Revision: 9409 Modified: trunk/src/message_window.py Log: More sizing fixes. Along with [9408] closes #3713 Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-03-22 18:19:56 UTC (rev 9408) +++ trunk/src/message_window.py 2008-03-22 20:51:19 UTC (rev 9409) @@ -800,7 +800,10 @@ gajim.config.get('msgwin-height')) if self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: parent_size = win.window.get_size() - size = (parent_size[0] + size[0], size[1]) + # Need to add the size of the now visible paned handle, otherwise + # the saved width of the message window decreases by this amount + handle_size = win.parent_paned.style_get_property('handle-size') + size = (parent_size[0] + size[0] + handle_size, size[1]) elif self.mode == self.ONE_MSG_WINDOW_PERACCT: size = (gajim.config.get_per('accounts', acct, 'msgwin-width'), gajim.config.get_per('accounts', acct, 'msgwin-height')) @@ -813,6 +816,8 @@ else: return win.resize(size[0], size[1]) + if win.parent_paned: + win.parent_paned.set_position(parent_size[0]) def _position_window(self, win, acct, type): '''Moves window according to config settings'''

1 0

[commit-gajim] r9408 - trunk/src
by nicfit＠gajim.org 22 Mar '08

22 Mar '08

Author: nicfit Date: 2008-03-22 19:19:56 +0100 (Sat, 22 Mar 2008) New Revision: 9408 Modified: trunk/src/message_window.py Log: Single window mode to any other resulted in the roster being the size of the roster + any chats that were in the orignal window. This fixes that. (#3713) Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-03-22 08:52:46 UTC (rev 9407) +++ trunk/src/message_window.py 2008-03-22 18:19:56 UTC (rev 9408) @@ -993,7 +993,6 @@ for w in self.windows(): self.save_state(w) gajim.interface.save_config() - # Map the mode to a int constant for frequent compares mode = gajim.config.get('one_message_window') if self.mode == common.config.opt_one_window_types.index(mode): # No change @@ -1006,13 +1005,20 @@ # MessageWindow is embedded. if not w.parent_paned: w.window.hide() + else: + # Stash current size so it can be restored if the MessageWindow + # is not longer embedded + roster_width = w.parent_paned.get_child1().allocation.width + gajim.config.set('roster_width', roster_width) + while w.notebook.get_n_pages(): page = w.notebook.get_nth_page(0) ctrl = w._widget_to_control(page) w.notebook.remove_page(0) page.unparent() controls.append(ctrl) - # Must clear _controls from window to prevent MessageControl.shutdown calls + + # Must clear _controls to prevent MessageControl.shutdown calls w._controls = {} if not w.parent_paned: w.window.destroy() @@ -1020,6 +1026,9 @@ # Don't close parent window, just remove the child child = w.parent_paned.get_child2() w.parent_paned.remove(child) + gtkgui_helpers.resize_window(w.window, + gajim.config.get('roster_width'), + gajim.config.get('roster_height')) self._windows = {}

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2008