Commits October 2008

commits@gajim.org

5 participants
128 discussions

[commit-gajim] r10572 - trunk
by js＠gajim.org 24 Oct '08

24 Oct '08

Author: js Date: 2008-10-24 19:24:10 +0200 (Fri, 24 Oct 2008) New Revision: 10572 Added: trunk/TODO.pep Log: Readd TODO.pep, but remove those TODOs that don't conform to the XEP. Added: trunk/TODO.pep =================================================================== --- trunk/TODO.pep (rev 0) +++ trunk/TODO.pep 2008-10-24 17:24:10 UTC (rev 10572) @@ -0,0 +1,8 @@ +• configure access model when changing it in the combobox +• PEP in status change + +Tune use cases: +• on disconnection of an account set Tune to None + +Tooltips use cases: +• Show PEP in GC tooltips

1 0

[commit-gajim] r10571 - trunk/data/activities/default/talking
by js＠gajim.org 24 Oct '08

24 Oct '08

Author: js Date: 2008-10-24 19:19:49 +0200 (Fri, 24 Oct 2008) New Revision: 10571 Added: trunk/data/activities/default/talking/on_video_phone.png Removed: trunk/data/activities/default/talking/on_the_video_phone.png Log: Rename wrongly named activity. Deleted: trunk/data/activities/default/talking/on_the_video_phone.png =================================================================== (Binary files differ) Copied: trunk/data/activities/default/talking/on_video_phone.png (from rev 10567, trunk/data/activities/default/talking/on_the_video_phone.png) =================================================================== (Binary files differ) Property changes on: trunk/data/activities/default/talking/on_video_phone.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:mergeinfo +

1 0

[commit-gajim] r10570 - trunk/src
by js＠gajim.org 24 Oct '08

24 Oct '08

Author: js Date: 2008-10-24 19:18:10 +0200 (Fri, 24 Oct 2008) New Revision: 10570 Modified: trunk/src/dialogs.py Log: Forgot to also sort the activites in the variable after changing them in the glade file. Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-10-24 17:10:30 UTC (rev 10569) +++ trunk/src/dialogs.py 2008-10-24 17:18:10 UTC (rev 10570) @@ -320,9 +320,9 @@ class ChangeActivityDialog: - PAGELIST = ['working', 'eating', 'exercising', 'relaxing', 'talking', - 'doing_chores', 'inactive', 'traveling', 'having_appointment', - 'drinking', 'grooming'] + PAGELIST = ['doing_chores', 'drinking', 'eating', 'exercising', 'grooming', + 'having_appointment', 'inactive', 'relaxing', 'talking', 'traveling', + 'working'] def __init__(self, account): self.account = account

1 0

[commit-gajim] r10569 - trunk/src/common
by js＠gajim.org 24 Oct '08

24 Oct '08

Author: js Date: 2008-10-24 19:10:30 +0200 (Fri, 24 Oct 2008) New Revision: 10569 Modified: trunk/src/common/pep.py Log: A subactivity of other means we have no subactivity. Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-10-24 17:00:39 UTC (rev 10568) +++ trunk/src/common/pep.py 2008-10-24 17:10:30 UTC (rev 10569) @@ -332,7 +332,7 @@ del acc.activity['text'] if activity is not None: acc.activity['activity'] = activity - if subactivity is not None: + if subactivity is not None and subactivity != 'other': acc.activity['subactivity'] = subactivity if text is not None: acc.activity['text'] = text @@ -355,7 +355,7 @@ del contact.activity['text'] if activity is not None: contact.activity['activity'] = activity - if subactivity is not None: + if subactivity is not None and subactivity != 'other': contact.activity['subactivity'] = subactivity if text is not None: contact.activity['text'] = text

1 0

[commit-gajim] r10568 - trunk/src
by js＠gajim.org 24 Oct '08

24 Oct '08

Author: js Date: 2008-10-24 19:00:39 +0200 (Fri, 24 Oct 2008) New Revision: 10568 Modified: trunk/src/chat_control.py trunk/src/roster_window.py Log: Fix #4140. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-10-24 12:10:05 UTC (rev 10567) +++ trunk/src/chat_control.py 2008-10-24 17:00:39 UTC (rev 10568) @@ -1239,12 +1239,15 @@ if activity is not None: if activity in ACTIVITIES: - self._activity_image.set_from_pixbuf( - gtkgui_helpers.load_activity_icon(activity).get_pixbuf()) # Translate standard activities if subactivity in ACTIVITIES[activity]: - subactivity = ACTIVITIES[activity] \ - [subactivity] + self._activity_image.set_from_pixbuf( + gtkgui_helpers.load_activity_icon(activity, subactivity). \ + get_pixbuf()) + subactivity = ACTIVITIES[activity][subactivity] + else: + self._activity_image.set_from_pixbuf( + gtkgui_helpers.load_activity_icon(activity).get_pixbuf()) activity = ACTIVITIES[activity]['category'] else: self._activity_image.set_from_pixbuf( Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-10-24 12:10:05 UTC (rev 10567) +++ trunk/src/roster_window.py 2008-10-24 17:00:39 UTC (rev 10568) @@ -996,10 +996,19 @@ and 'activity' in gajim.connections[account].activity \ and gajim.connections[account].activity['activity'].strip() \ in ACTIVITIES: - self.model[child_iter][C_ACTIVITY_PIXBUF] = \ - gtkgui_helpers.load_activity_icon( - gajim.connections[account]. \ - activity['activity'].strip()).get_pixbuf() + if 'subactivity' in gajim.connections[account].activity \ + and gajim.connections[account].activity['subactivity'].strip() \ + in ACTIVITIES[gajim.connections[account].activity['activity'].strip()]: + self.model[child_iter][C_ACTIVITY_PIXBUF] = \ + gtkgui_helpers.load_activity_icon( + gajim.connections[account].activity['activity'].strip(), + gajim.connections[account].activity['subactivity'].strip()). \ + get_pixbuf() + else: + self.model[child_iter][C_ACTIVITY_PIXBUF] = \ + gtkgui_helpers.load_activity_icon( + gajim.connections[account].activity['activity'].strip()). \ + get_pixbuf() elif gajim.config.get('show_activity_in_roster') \ and 'activity' in gajim.connections[account].activity: self.model[child_iter][C_ACTIVITY_PIXBUF] = \ @@ -1247,8 +1256,15 @@ contact = gajim.contacts.get_contact(account, jid) if 'activity' in contact.activity \ and contact.activity['activity'].strip() in ACTIVITIES: - pixbuf = gtkgui_helpers.load_activity_icon( - contact.activity['activity'].strip()).get_pixbuf() + if 'subactivity' in contact.activity \ + and contact.activity['subactivity'].strip() in \ + ACTIVITIES[contact.activity['activity'].strip()]: + pixbuf = gtkgui_helpers.load_activity_icon( + contact.activity['activity'].strip(), + contact.activity['subactivity'].strip()).get_pixbuf() + else: + pixbuf = gtkgui_helpers.load_activity_icon( + contact.activity['activity'].strip()).get_pixbuf() elif 'activity' in contact.activity: pixbuf = gtkgui_helpers.load_activity_icon( 'unknown').get_pixbuf()

1 0

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

24 Oct '08

Author: asterix Date: 2008-10-24 14:10:05 +0200 (Fri, 24 Oct 2008) New Revision: 10567 Modified: trunk/src/dialogs.py Log: fix var name. Fixes #4430 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-10-23 17:19:57 UTC (rev 10566) +++ trunk/src/dialogs.py 2008-10-24 12:10:05 UTC (rev 10567) @@ -1586,7 +1586,7 @@ def on_cancelbutton_clicked(self, widget): self.dialog.destroy() - if not cancel_handler: + if not self.cancel_handler: return if isinstance(self.cancel_handler, tuple): self.cancel_handler[0](*self.cancel_handler[1:])

1 0

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

23 Oct '08

Author: asterix Date: 2008-10-23 19:19:57 +0200 (Thu, 23 Oct 2008) New Revision: 10566 Modified: trunk/src/gajim.py Log: fix re-joining a groupchat when control is already opened. Fixes #4425 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-10-23 16:52:29 UTC (rev 10565) +++ trunk/src/gajim.py 2008-10-23 17:19:57 UTC (rev 10566) @@ -2600,12 +2600,11 @@ _('You cannot join a group chat while you are invisible')) return - minimized_control_exists = False - if room_jid in gajim.interface.minimized_controls[account]: - minimized_control_exists = True + minimized_control = gajim.interface.minimized_controls[account].get( + room_jid, None) - if not minimized_control_exists and \ - not self.msg_win_mgr.has_window(room_jid, account): + if minimized_control is None and not self.msg_win_mgr.has_window(room_jid, + account): # Join new groupchat if minimize: contact = gajim.contacts.create_contact(jid=room_jid, name=nick) @@ -2614,12 +2613,14 @@ self.roster.add_groupchat(room_jid, account) else: self.new_room(room_jid, nick, account, is_continued=is_continued) - elif not minimized_control_exists: + elif minimized_control is None: # We are already in that groupchat gc_control = self.msg_win_mgr.get_gc_control(room_jid, account) + gc_control.nick = nick gc_control.parent_win.set_active_tab(gc_control) else: # We are already in this groupchat and it is minimized + minimized_control.nick = nick self.roster.add_groupchat(room_jid, account) # Connect

1 0

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

23 Oct '08

Author: asterix Date: 2008-10-23 18:52:29 +0200 (Thu, 23 Oct 2008) New Revision: 10565 Modified: trunk/src/common/commands.py Log: fix setting free for chat status through adhoc commands. fixes #1910 Modified: trunk/src/common/commands.py =================================================================== --- trunk/src/common/commands.py 2008-10-23 16:17:03 UTC (rev 10564) +++ trunk/src/common/commands.py 2008-10-23 16:52:29 UTC (rev 10565) @@ -97,7 +97,7 @@ var = 'presence-type', label = 'Type of presence:', options = [ - (u'free-for-chat', _('Free for chat')), + (u'chat', _('Free for chat')), (u'online', _('Online')), (u'away', _('Away')), (u'xa', _('Extended away')), @@ -128,7 +128,7 @@ try: presencetype = form['presence-type'].value if not presencetype in \ - ('free-for-chat', 'online', 'away', 'xa', 'dnd', 'offline'): + ('chat', 'online', 'away', 'xa', 'dnd', 'offline'): self.badRequest(request) return False except Exception: # KeyError if there's no presence-type field in form or

1 0

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

23 Oct '08

Author: asterix Date: 2008-10-23 18:17:03 +0200 (Thu, 23 Oct 2008) New Revision: 10564 Modified: trunk/src/roster_window.py Log: revert thorstenp's patch [10510] that breaks setting all contacts offline when we go offline. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-10-23 14:10:34 UTC (rev 10563) +++ trunk/src/roster_window.py 2008-10-23 16:17:03 UTC (rev 10564) @@ -2070,9 +2070,9 @@ for jid in gajim.contacts.get_jid_list(account): lcontact = gajim.contacts.get_contacts(account, jid) ctrl = gajim.interface.msg_win_mgr.get_gc_control(jid, account) - for contact in lcontact: - if (contact.show != 'offline' or contact.is_transport()) and not ctrl: - self.chg_contact_status(contact, 'offline', '', account) + for contact in [c for c in lcontact if ((c.show != 'offline' or \ + c.is_transport()) and not ctrl)]: + self.chg_contact_status(contact, 'offline', '', account) self.actions_menu_needs_rebuild = True self.update_status_combobox() # Force the rebuild now since the on_activates on the menu itself does

1 0

[commit-gajim] r10563 - in trunk/data/activities/default: doing_chores drinking eating exercising grooming inactive traveling
by js＠gajim.org 23 Oct '08

23 Oct '08

Author: js Date: 2008-10-23 16:10:34 +0200 (Thu, 23 Oct 2008) New Revision: 10563 Modified: trunk/data/activities/default/doing_chores/buying_groceries.png trunk/data/activities/default/doing_chores/running_an_errand.png trunk/data/activities/default/drinking/category.png trunk/data/activities/default/eating/having_dinner.png trunk/data/activities/default/exercising/working_out.png trunk/data/activities/default/grooming/at_the_spa.png trunk/data/activities/default/grooming/taking_a_shower.png trunk/data/activities/default/inactive/day_off.png trunk/data/activities/default/inactive/on_vacation.png trunk/data/activities/default/inactive/scheduled_holiday.png trunk/data/activities/default/inactive/sleeping.png trunk/data/activities/default/traveling/cycling.png trunk/data/activities/default/traveling/driving.png trunk/data/activities/default/traveling/walking.png Log: Rederick updated his activity icons. Modified: trunk/data/activities/default/doing_chores/buying_groceries.png =================================================================== (Binary files differ) Modified: trunk/data/activities/default/doing_chores/running_an_errand.png =================================================================== (Binary files differ) Modified: trunk/data/activities/default/drinking/category.png =================================================================== (Binary files differ) Modified: trunk/data/activities/default/eating/having_dinner.png =================================================================== (Binary files differ) Modified: trunk/data/activities/default/exercising/working_out.png =================================================================== (Binary files differ) Modified: trunk/data/activities/default/grooming/at_the_spa.png =================================================================== (Binary files differ) Modified: trunk/data/activities/default/grooming/taking_a_shower.png =================================================================== (Binary files differ) Modified: trunk/data/activities/default/inactive/day_off.png =================================================================== (Binary files differ) Modified: trunk/data/activities/default/inactive/on_vacation.png =================================================================== (Binary files differ) Modified: trunk/data/activities/default/inactive/scheduled_holiday.png =================================================================== (Binary files differ) Modified: trunk/data/activities/default/inactive/sleeping.png =================================================================== (Binary files differ) Modified: trunk/data/activities/default/traveling/cycling.png =================================================================== (Binary files differ) Modified: trunk/data/activities/default/traveling/driving.png =================================================================== (Binary files differ) Modified: trunk/data/activities/default/traveling/walking.png =================================================================== (Binary files differ)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2008