Commits October 2008

commits@gajim.org

5 participants
128 discussions

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

30 Oct '08

Author: js Date: 2008-10-30 22:49:49 +0100 (Thu, 30 Oct 2008) New Revision: 10582 Modified: trunk/src/common/pep.py Log: D'oh! Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-10-30 21:46:14 UTC (rev 10581) +++ trunk/src/common/pep.py 2008-10-30 21:49:49 UTC (rev 10582) @@ -70,8 +70,8 @@ 'hungry': _('Hungry'), 'hurt': _('Hurt'), 'impressed': _('Impressed'), - 'in_awe': _('In_awe'), - 'in_love': _('In_love'), + 'in_awe': _('In Awe'), + 'in_love': _('In Love'), 'indignant': _('Indignant'), 'interested': _('Interested'), 'intoxicated': _('Intoxicated'),

1 0

[commit-gajim] r10581 - in branches/osx_newbuildsys: data/moods/default src src/common
by js＠gajim.org 30 Oct '08

30 Oct '08

Author: js Date: 2008-10-30 22:46:14 +0100 (Thu, 30 Oct 2008) New Revision: 10581 Added: branches/osx_newbuildsys/data/moods/default/amorous.png branches/osx_newbuildsys/data/moods/default/cautious.png branches/osx_newbuildsys/data/moods/default/confident.png branches/osx_newbuildsys/data/moods/default/contemplative.png branches/osx_newbuildsys/data/moods/default/crazy.png branches/osx_newbuildsys/data/moods/default/creative.png branches/osx_newbuildsys/data/moods/default/dejected.png branches/osx_newbuildsys/data/moods/default/dismayed.png branches/osx_newbuildsys/data/moods/default/envious.png branches/osx_newbuildsys/data/moods/default/grateful.png branches/osx_newbuildsys/data/moods/default/grieving.png branches/osx_newbuildsys/data/moods/default/hopeful.png branches/osx_newbuildsys/data/moods/default/lost.png branches/osx_newbuildsys/data/moods/default/lucky.png branches/osx_newbuildsys/data/moods/default/outraged.png branches/osx_newbuildsys/data/moods/default/relaxed.png branches/osx_newbuildsys/data/moods/default/satisfied.png branches/osx_newbuildsys/data/moods/default/spontaneous.png branches/osx_newbuildsys/data/moods/default/strong.png branches/osx_newbuildsys/data/moods/default/thankful.png branches/osx_newbuildsys/data/moods/default/tired.png branches/osx_newbuildsys/data/moods/default/undefined.png branches/osx_newbuildsys/data/moods/default/weak.png Removed: branches/osx_newbuildsys/data/moods/default/thoughtful.png Modified: branches/osx_newbuildsys/data/moods/default/afraid.png branches/osx_newbuildsys/data/moods/default/amazed.png branches/osx_newbuildsys/data/moods/default/angry.png branches/osx_newbuildsys/data/moods/default/annoyed.png branches/osx_newbuildsys/data/moods/default/anxious.png branches/osx_newbuildsys/data/moods/default/aroused.png branches/osx_newbuildsys/data/moods/default/ashamed.png branches/osx_newbuildsys/data/moods/default/bored.png branches/osx_newbuildsys/data/moods/default/brave.png branches/osx_newbuildsys/data/moods/default/calm.png branches/osx_newbuildsys/data/moods/default/cold.png branches/osx_newbuildsys/data/moods/default/confused.png branches/osx_newbuildsys/data/moods/default/contented.png branches/osx_newbuildsys/data/moods/default/cranky.png branches/osx_newbuildsys/data/moods/default/curious.png branches/osx_newbuildsys/data/moods/default/depressed.png branches/osx_newbuildsys/data/moods/default/disappointed.png branches/osx_newbuildsys/data/moods/default/disgusted.png branches/osx_newbuildsys/data/moods/default/distracted.png branches/osx_newbuildsys/data/moods/default/embarrassed.png branches/osx_newbuildsys/data/moods/default/excited.png branches/osx_newbuildsys/data/moods/default/flirtatious.png branches/osx_newbuildsys/data/moods/default/frustrated.png branches/osx_newbuildsys/data/moods/default/grumpy.png branches/osx_newbuildsys/data/moods/default/guilty.png branches/osx_newbuildsys/data/moods/default/happy.png branches/osx_newbuildsys/data/moods/default/hot.png branches/osx_newbuildsys/data/moods/default/humbled.png branches/osx_newbuildsys/data/moods/default/humiliated.png branches/osx_newbuildsys/data/moods/default/hungry.png branches/osx_newbuildsys/data/moods/default/hurt.png branches/osx_newbuildsys/data/moods/default/impressed.png branches/osx_newbuildsys/data/moods/default/in_awe.png branches/osx_newbuildsys/data/moods/default/in_love.png branches/osx_newbuildsys/data/moods/default/indignant.png branches/osx_newbuildsys/data/moods/default/interested.png branches/osx_newbuildsys/data/moods/default/intoxicated.png branches/osx_newbuildsys/data/moods/default/invincible.png branches/osx_newbuildsys/data/moods/default/jealous.png branches/osx_newbuildsys/data/moods/default/lonely.png branches/osx_newbuildsys/data/moods/default/mean.png branches/osx_newbuildsys/data/moods/default/moody.png branches/osx_newbuildsys/data/moods/default/nervous.png branches/osx_newbuildsys/data/moods/default/neutral.png branches/osx_newbuildsys/data/moods/default/offended.png branches/osx_newbuildsys/data/moods/default/playful.png branches/osx_newbuildsys/data/moods/default/proud.png branches/osx_newbuildsys/data/moods/default/relieved.png branches/osx_newbuildsys/data/moods/default/remorseful.png branches/osx_newbuildsys/data/moods/default/restless.png branches/osx_newbuildsys/data/moods/default/sad.png branches/osx_newbuildsys/data/moods/default/sarcastic.png branches/osx_newbuildsys/data/moods/default/serious.png branches/osx_newbuildsys/data/moods/default/shocked.png branches/osx_newbuildsys/data/moods/default/shy.png branches/osx_newbuildsys/data/moods/default/sick.png branches/osx_newbuildsys/data/moods/default/sleepy.png branches/osx_newbuildsys/data/moods/default/stressed.png branches/osx_newbuildsys/data/moods/default/surprised.png branches/osx_newbuildsys/data/moods/default/thirsty.png branches/osx_newbuildsys/data/moods/default/worried.png branches/osx_newbuildsys/src/chat_control.py branches/osx_newbuildsys/src/common/config.py branches/osx_newbuildsys/src/common/connection_handlers.py branches/osx_newbuildsys/src/common/pep.py branches/osx_newbuildsys/src/music_track_listener.py branches/osx_newbuildsys/src/roster_window.py Log: Merge trunk r10580. Modified: branches/osx_newbuildsys/data/moods/default/afraid.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/amazed.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/amorous.png (from rev 10580, trunk/data/moods/default/amorous.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/angry.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/annoyed.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/anxious.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/aroused.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/ashamed.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/bored.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/brave.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/calm.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/cautious.png (from rev 10580, trunk/data/moods/default/cautious.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/cold.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/confident.png (from rev 10580, trunk/data/moods/default/confident.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/confused.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/contemplative.png (from rev 10580, trunk/data/moods/default/contemplative.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/contented.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/cranky.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/crazy.png (from rev 10580, trunk/data/moods/default/crazy.png) =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/creative.png (from rev 10580, trunk/data/moods/default/creative.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/curious.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/dejected.png (from rev 10580, trunk/data/moods/default/dejected.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/depressed.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/disappointed.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/disgusted.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/dismayed.png (from rev 10580, trunk/data/moods/default/dismayed.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/distracted.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/embarrassed.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/envious.png (from rev 10580, trunk/data/moods/default/envious.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/excited.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/flirtatious.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/frustrated.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/grateful.png (from rev 10580, trunk/data/moods/default/grateful.png) =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/grieving.png (from rev 10580, trunk/data/moods/default/grieving.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/grumpy.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/guilty.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/happy.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/hopeful.png (from rev 10580, trunk/data/moods/default/hopeful.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/hot.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/humbled.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/humiliated.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/hungry.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/hurt.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/impressed.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/in_awe.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/in_love.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/indignant.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/interested.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/intoxicated.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/invincible.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/jealous.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/lonely.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/lost.png (from rev 10580, trunk/data/moods/default/lost.png) =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/lucky.png (from rev 10580, trunk/data/moods/default/lucky.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/mean.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/moody.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/nervous.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/neutral.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/offended.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/outraged.png (from rev 10580, trunk/data/moods/default/outraged.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/playful.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/proud.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/relaxed.png (from rev 10580, trunk/data/moods/default/relaxed.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/relieved.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/remorseful.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/restless.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/sad.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/sarcastic.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/satisfied.png (from rev 10580, trunk/data/moods/default/satisfied.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/serious.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/shocked.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/shy.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/sick.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/sleepy.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/spontaneous.png (from rev 10580, trunk/data/moods/default/spontaneous.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/stressed.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/strong.png (from rev 10580, trunk/data/moods/default/strong.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/surprised.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/thankful.png (from rev 10580, trunk/data/moods/default/thankful.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/thirsty.png =================================================================== (Binary files differ) Deleted: branches/osx_newbuildsys/data/moods/default/thoughtful.png =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/tired.png (from rev 10580, trunk/data/moods/default/tired.png) =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/undefined.png (from rev 10580, trunk/data/moods/default/undefined.png) =================================================================== (Binary files differ) Copied: branches/osx_newbuildsys/data/moods/default/weak.png (from rev 10580, trunk/data/moods/default/weak.png) =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/moods/default/worried.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/src/chat_control.py =================================================================== --- branches/osx_newbuildsys/src/chat_control.py 2008-10-30 19:01:26 UTC (rev 10580) +++ branches/osx_newbuildsys/src/chat_control.py 2008-10-30 21:46:14 UTC (rev 10581) @@ -2583,7 +2583,7 @@ if not self.session: fjid = self.contact.get_full_jid() - new_sess = gajim.connections[self.account].make_new_session(fjid) + new_sess = gajim.connections[self.account].make_new_session(fjid, type_=self.type_id) self.set_session(new_sess) self.session.negotiate_e2e(False) Modified: branches/osx_newbuildsys/src/common/config.py =================================================================== --- branches/osx_newbuildsys/src/common/config.py 2008-10-30 19:01:26 UTC (rev 10580) +++ branches/osx_newbuildsys/src/common/config.py 2008-10-30 21:46:14 UTC (rev 10581) @@ -317,7 +317,7 @@ 'dont_ack_subscription': [opt_bool, False, _('Jabberd2 workaround')], # proxy65 for FT 'file_transfer_proxies': [opt_str, - 'proxy.jabber.org, proxy.netlab.cz, transfer.jabber.freenet.de, proxy.jabber.cd.chalmers.se'], + 'proxy65.talkonaut.com, proxy.jabber.org, proxy.netlab.cz, transfer.jabber.freenet.de, proxy.jabber.cd.chalmers.se'], 'use_ft_proxies': [opt_bool, True, _('If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer.'), True], 'msgwin-x-position': [opt_int, -1], # Default is to let the wm decide 'msgwin-y-position': [opt_int, -1], # Default is to let the wm decide Modified: branches/osx_newbuildsys/src/common/connection_handlers.py =================================================================== --- branches/osx_newbuildsys/src/common/connection_handlers.py 2008-10-30 19:01:26 UTC (rev 10580) +++ branches/osx_newbuildsys/src/common/connection_handlers.py 2008-10-30 21:46:14 UTC (rev 10581) @@ -1350,6 +1350,8 @@ return None def make_new_session(self, jid, thread_id=None, type_='chat', cls=None): + '''create and register a new session. thread_id=None to generate one. + type_ should be 'chat' or 'pm'.''' if not cls: cls = gajim.default_session_type Modified: branches/osx_newbuildsys/src/common/pep.py =================================================================== --- branches/osx_newbuildsys/src/common/pep.py 2008-10-30 19:01:26 UTC (rev 10580) +++ branches/osx_newbuildsys/src/common/pep.py 2008-10-30 21:46:14 UTC (rev 10581) @@ -26,41 +26,91 @@ from common import gajim, xmpp MOODS = { - 'afraid': _('Afraid'), 'amazed': _('Amazed'), - 'angry': _('Angry'), 'annoyed': _('Annoyed'), - 'anxious': _('Anxious'), 'aroused': _('Aroused'), - 'ashamed': _('Ashamed'), 'bored': _('Bored'), - 'brave': _('Brave'), 'calm': _('Calm'), - 'cold': _('Cold'), 'confused': _('Confused'), - 'contented': _('Contented'), 'cranky': _('Cranky'), - 'curious': _('Curious'), 'depressed': _('Depressed'), - 'disappointed': _('Disappointed'), 'disgusted': _('Disgusted'), - 'distracted': _('Distracted'), 'embarrassed': _('Embarrassed'), - 'excited': _('Excited'), 'flirtatious': _('Flirtatious'), - 'frustrated': _('Frustrated'), 'grumpy': _('Grumpy'), - 'guilty': _('Guilty'), 'happy': _('Happy'), - 'hot': _('Hot'), 'humbled': _('Humbled'), - 'humiliated': _('Humiliated'), 'hungry': _('Hungry'), - 'hurt': _('Hurt'), 'impressed': _('Impressed'), - 'in_awe': _('In Awe'), 'in_love': _('In Love'), - 'indignant': _('Indignant'), 'interested': _('Interested'), - 'intoxicated': _('Intoxicated'), 'invincible': _('Invincible'), - 'jealous': _('Jealous'), 'lonely': _('Lonely'), - 'mean': _('Mean'), 'moody': _('Moody'), - 'nervous': _('Nervous'), 'neutral': _('Neutral'), - 'offended': _('Offended'), 'playful': _('Playful'), - 'proud': _('Proud'), 'relieved': _('Relieved'), - 'remorseful': _('Remorseful'), 'restless': _('Restless'), - 'sad': _('Sad'), 'sarcastic': _('Sarcastic'), - 'serious': _('Serious'), 'shocked': _('Shocked'), - 'shy': _('Shy'), 'sick': _('Sick'), - 'sleepy': _('Sleepy'), 'stressed': _('Stressed'), - 'surprised': _('Surprised'), 'thirsty': _('Thirsty'), - 'thoughtful': _('Thoughtful'), 'worried': _('Worried')} + 'afraid': _('Afraid'), + 'amazed': _('Amazed'), + 'amorous': _('Amorous'), + 'angry': _('Angry'), + 'annoyed': _('Annoyed'), + 'anxious': _('Anxious'), + 'aroused': _('Aroused'), + 'ashamed': _('Ashamed'), + 'bored': _('Bored'), + 'brave': _('Brave'), + 'calm': _('Calm'), + 'cautious': _('Cautious'), + 'cold': _('Cold'), + 'confident': _('Confident'), + 'confused': _('Confused'), + 'contemplative': _('Contemplative'), + 'contented': _('Contented'), + 'cranky': _('Cranky'), + 'crazy': _('Crazy'), + 'creative': _('Creative'), + 'curious': _('Curious'), + 'dejected': _('Dejected'), + 'depressed': _('Depressed'), + 'disappointed': _('Disappointed'), + 'disgusted': _('Disgusted'), + 'dismayed': _('Dismayed'), + 'distracted': _('Distracted'), + 'embarrassed': _('Embarrassed'), + 'envious': _('Envious'), + 'excited': _('Excited'), + 'flirtatious': _('Flirtatious'), + 'frustrated': _('Frustrated'), + 'grateful': _('Grateful'), + 'grieving': _('Grieving'), + 'grumpy': _('Grumpy'), + 'guilty': _('Guilty'), + 'happy': _('Happy'), + 'hopeful': _('Hopeful'), + 'hot': _('Hot'), + 'humbled': _('Humbled'), + 'humiliated': _('Humiliated'), + 'hungry': _('Hungry'), + 'hurt': _('Hurt'), + 'impressed': _('Impressed'), + 'in_awe': _('In_awe'), + 'in_love': _('In_love'), + 'indignant': _('Indignant'), + 'interested': _('Interested'), + 'intoxicated': _('Intoxicated'), + 'invincible': _('Invincible'), + 'jealous': _('Jealous'), + 'lonely': _('Lonely'), + 'lost': _('Lost'), + 'lucky': _('Lucky'), + 'mean': _('Mean'), + 'moody': _('Moody'), + 'nervous': _('Nervous'), + 'neutral': _('Neutral'), + 'offended': _('Offended'), + 'outraged': _('Outraged'), + 'playful': _('Playful'), + 'proud': _('Proud'), + 'relaxed': _('Relaxed'), + 'relieved': _('Relieved'), + 'remorseful': _('Remorseful'), + 'restless': _('Restless'), + 'sad': _('Sad'), + 'sarcastic': _('Sarcastic'), + 'satisfied': _('Satisfied'), + 'serious': _('Serious'), + 'shocked': _('Shocked'), + 'shy': _('Shy'), + 'sick': _('Sick'), + 'sleepy': _('Sleepy'), + 'spontaneous': _('Spontaneous'), + 'stressed': _('Stressed'), + 'strong': _('Strong'), + 'surprised': _('Surprised'), + 'thankful': _('Thankful'), + 'thirsty': _('Thirsty'), + 'tired': _('Tired'), + 'undefined': _('Undefined'), + 'weak': _('Weak'), + 'worried': _('Worried')} -# These moods are only available in the Gajim namespace -GAJIM_MOODS = ['thoughtful'] - ACTIVITIES = { 'doing_chores': {'category': _('Doing Chores'), 'buying_groceries': _('Buying Groceries'), @@ -418,11 +468,7 @@ return item = xmpp.Node('mood', {'xmlns': xmpp.NS_MOOD}) if mood != '': - if mood in GAJIM_MOODS: - ns = 'http://gajim.org/moods' - else: - ns = None - item.addChild(mood, namespace = ns) + item.addChild(mood) if message != '': i = item.addChild('text') i.addData(message) Modified: branches/osx_newbuildsys/src/music_track_listener.py =================================================================== --- branches/osx_newbuildsys/src/music_track_listener.py 2008-10-30 19:01:26 UTC (rev 10580) +++ branches/osx_newbuildsys/src/music_track_listener.py 2008-10-30 21:46:14 UTC (rev 10581) @@ -220,6 +220,23 @@ self._last_playing_music = info return info + ## Check Banshee playing track + test = False + if hasattr(bus, 'name_has_owner'): + if bus.name_has_owner('org.bansheeproject.Banshee'): + test = True + elif dbus.dbus_bindings.bus_name_has_owner(bus.get_connection(), + 'org.bansheeproject.Banshee'): + test = True + if test: + banshee = bus.get_object('org.bansheeproject.Banshee', + '/org/bansheeproject/Banshee/PlayerEngine') + currentTrack = banshee.GetCurrentTrack() + if currentTrack: + song = self._banshee_properties_extract(currentTrack) + self._last_playing_music = song + return song + return None # here we test :) Modified: branches/osx_newbuildsys/src/roster_window.py =================================================================== --- branches/osx_newbuildsys/src/roster_window.py 2008-10-30 19:01:26 UTC (rev 10580) +++ branches/osx_newbuildsys/src/roster_window.py 2008-10-30 21:46:14 UTC (rev 10581) @@ -1004,7 +1004,7 @@ gajim.connections[account].activity['activity'].strip(), gajim.connections[account].activity['subactivity'].strip()). \ get_pixbuf() - else: + else: self.model[child_iter][C_ACTIVITY_PIXBUF] = \ gtkgui_helpers.load_activity_icon( gajim.connections[account].activity['activity'].strip()). \ @@ -3291,12 +3291,12 @@ act = widget.get_active() gajim.config.set_per('accounts', account, 'publish_tune', act) if act: + listener = MusicTrackListener.get() if not self.music_track_changed_signal: - listener = MusicTrackListener.get() self.music_track_changed_signal = listener.connect( 'music-track-changed', self.music_track_changed) - track = listener.get_playing_track() - self.music_track_changed(listener, track) + track = listener.get_playing_track() + self.music_track_changed(listener, track) else: # disable it only if no other account use it for acct in gajim.connections:

1 0

[commit-gajim] r10580 - in trunk: data/moods/default src/common
by js＠gajim.org 30 Oct '08

30 Oct '08

Author: js Date: 2008-10-30 20:01:26 +0100 (Thu, 30 Oct 2008) New Revision: 10580 Added: trunk/data/moods/default/amorous.png trunk/data/moods/default/cautious.png trunk/data/moods/default/confident.png trunk/data/moods/default/contemplative.png trunk/data/moods/default/crazy.png trunk/data/moods/default/creative.png trunk/data/moods/default/dejected.png trunk/data/moods/default/dismayed.png trunk/data/moods/default/envious.png trunk/data/moods/default/grateful.png trunk/data/moods/default/grieving.png trunk/data/moods/default/hopeful.png trunk/data/moods/default/lost.png trunk/data/moods/default/lucky.png trunk/data/moods/default/outraged.png trunk/data/moods/default/relaxed.png trunk/data/moods/default/satisfied.png trunk/data/moods/default/spontaneous.png trunk/data/moods/default/strong.png trunk/data/moods/default/thankful.png trunk/data/moods/default/tired.png trunk/data/moods/default/undefined.png trunk/data/moods/default/weak.png Removed: trunk/data/moods/default/thoughtful.png Modified: trunk/data/moods/default/afraid.png trunk/data/moods/default/amazed.png trunk/data/moods/default/angry.png trunk/data/moods/default/annoyed.png trunk/data/moods/default/anxious.png trunk/data/moods/default/aroused.png trunk/data/moods/default/ashamed.png trunk/data/moods/default/bored.png trunk/data/moods/default/brave.png trunk/data/moods/default/calm.png trunk/data/moods/default/cold.png trunk/data/moods/default/confused.png trunk/data/moods/default/contented.png trunk/data/moods/default/cranky.png trunk/data/moods/default/curious.png trunk/data/moods/default/depressed.png trunk/data/moods/default/disappointed.png trunk/data/moods/default/disgusted.png trunk/data/moods/default/distracted.png trunk/data/moods/default/embarrassed.png trunk/data/moods/default/excited.png trunk/data/moods/default/flirtatious.png trunk/data/moods/default/frustrated.png trunk/data/moods/default/grumpy.png trunk/data/moods/default/guilty.png trunk/data/moods/default/happy.png trunk/data/moods/default/hot.png trunk/data/moods/default/humbled.png trunk/data/moods/default/humiliated.png trunk/data/moods/default/hungry.png trunk/data/moods/default/hurt.png trunk/data/moods/default/impressed.png trunk/data/moods/default/in_awe.png trunk/data/moods/default/in_love.png trunk/data/moods/default/indignant.png trunk/data/moods/default/interested.png trunk/data/moods/default/intoxicated.png trunk/data/moods/default/invincible.png trunk/data/moods/default/jealous.png trunk/data/moods/default/lonely.png trunk/data/moods/default/mean.png trunk/data/moods/default/moody.png trunk/data/moods/default/nervous.png trunk/data/moods/default/neutral.png trunk/data/moods/default/offended.png trunk/data/moods/default/playful.png trunk/data/moods/default/proud.png trunk/data/moods/default/relieved.png trunk/data/moods/default/remorseful.png trunk/data/moods/default/restless.png trunk/data/moods/default/sad.png trunk/data/moods/default/sarcastic.png trunk/data/moods/default/serious.png trunk/data/moods/default/shocked.png trunk/data/moods/default/shy.png trunk/data/moods/default/sick.png trunk/data/moods/default/sleepy.png trunk/data/moods/default/stressed.png trunk/data/moods/default/surprised.png trunk/data/moods/default/thirsty.png trunk/data/moods/default/worried.png trunk/src/common/pep.py Log: Updated moods to version 1.2 of the XEP. Modified: trunk/data/moods/default/afraid.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/amazed.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/amorous.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/amorous.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/angry.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/annoyed.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/anxious.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/aroused.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/ashamed.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/bored.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/brave.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/calm.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/cautious.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/cautious.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/cold.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/confident.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/confident.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/confused.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/contemplative.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/contemplative.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/contented.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/cranky.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/crazy.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/crazy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/creative.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/creative.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/curious.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/dejected.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/dejected.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/depressed.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/disappointed.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/disgusted.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/dismayed.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/dismayed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/distracted.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/embarrassed.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/envious.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/envious.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/excited.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/flirtatious.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/frustrated.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/grateful.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/grateful.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/grieving.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/grieving.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/grumpy.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/guilty.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/happy.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/hopeful.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/hopeful.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/hot.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/humbled.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/humiliated.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/hungry.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/hurt.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/impressed.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/in_awe.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/in_love.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/indignant.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/interested.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/intoxicated.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/invincible.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/jealous.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/lonely.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/lost.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/lost.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/lucky.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/lucky.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/mean.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/moody.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/nervous.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/neutral.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/offended.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/outraged.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/outraged.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/playful.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/proud.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/relaxed.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/relaxed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/relieved.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/remorseful.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/restless.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/sad.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/sarcastic.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/satisfied.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/satisfied.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/serious.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/shocked.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/shy.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/sick.png =================================================================== (Binary files differ) Modified: trunk/data/moods/default/sleepy.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/spontaneous.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/spontaneous.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/stressed.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/strong.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/strong.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/surprised.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/thankful.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/thankful.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/thirsty.png =================================================================== (Binary files differ) Deleted: trunk/data/moods/default/thoughtful.png =================================================================== (Binary files differ) Added: trunk/data/moods/default/tired.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/tired.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/undefined.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/undefined.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/weak.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/weak.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/data/moods/default/worried.png =================================================================== (Binary files differ) Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-10-27 22:06:58 UTC (rev 10579) +++ trunk/src/common/pep.py 2008-10-30 19:01:26 UTC (rev 10580) @@ -26,41 +26,91 @@ from common import gajim, xmpp MOODS = { - 'afraid': _('Afraid'), 'amazed': _('Amazed'), - 'angry': _('Angry'), 'annoyed': _('Annoyed'), - 'anxious': _('Anxious'), 'aroused': _('Aroused'), - 'ashamed': _('Ashamed'), 'bored': _('Bored'), - 'brave': _('Brave'), 'calm': _('Calm'), - 'cold': _('Cold'), 'confused': _('Confused'), - 'contented': _('Contented'), 'cranky': _('Cranky'), - 'curious': _('Curious'), 'depressed': _('Depressed'), - 'disappointed': _('Disappointed'), 'disgusted': _('Disgusted'), - 'distracted': _('Distracted'), 'embarrassed': _('Embarrassed'), - 'excited': _('Excited'), 'flirtatious': _('Flirtatious'), - 'frustrated': _('Frustrated'), 'grumpy': _('Grumpy'), - 'guilty': _('Guilty'), 'happy': _('Happy'), - 'hot': _('Hot'), 'humbled': _('Humbled'), - 'humiliated': _('Humiliated'), 'hungry': _('Hungry'), - 'hurt': _('Hurt'), 'impressed': _('Impressed'), - 'in_awe': _('In Awe'), 'in_love': _('In Love'), - 'indignant': _('Indignant'), 'interested': _('Interested'), - 'intoxicated': _('Intoxicated'), 'invincible': _('Invincible'), - 'jealous': _('Jealous'), 'lonely': _('Lonely'), - 'mean': _('Mean'), 'moody': _('Moody'), - 'nervous': _('Nervous'), 'neutral': _('Neutral'), - 'offended': _('Offended'), 'playful': _('Playful'), - 'proud': _('Proud'), 'relieved': _('Relieved'), - 'remorseful': _('Remorseful'), 'restless': _('Restless'), - 'sad': _('Sad'), 'sarcastic': _('Sarcastic'), - 'serious': _('Serious'), 'shocked': _('Shocked'), - 'shy': _('Shy'), 'sick': _('Sick'), - 'sleepy': _('Sleepy'), 'stressed': _('Stressed'), - 'surprised': _('Surprised'), 'thirsty': _('Thirsty'), - 'thoughtful': _('Thoughtful'), 'worried': _('Worried')} + 'afraid': _('Afraid'), + 'amazed': _('Amazed'), + 'amorous': _('Amorous'), + 'angry': _('Angry'), + 'annoyed': _('Annoyed'), + 'anxious': _('Anxious'), + 'aroused': _('Aroused'), + 'ashamed': _('Ashamed'), + 'bored': _('Bored'), + 'brave': _('Brave'), + 'calm': _('Calm'), + 'cautious': _('Cautious'), + 'cold': _('Cold'), + 'confident': _('Confident'), + 'confused': _('Confused'), + 'contemplative': _('Contemplative'), + 'contented': _('Contented'), + 'cranky': _('Cranky'), + 'crazy': _('Crazy'), + 'creative': _('Creative'), + 'curious': _('Curious'), + 'dejected': _('Dejected'), + 'depressed': _('Depressed'), + 'disappointed': _('Disappointed'), + 'disgusted': _('Disgusted'), + 'dismayed': _('Dismayed'), + 'distracted': _('Distracted'), + 'embarrassed': _('Embarrassed'), + 'envious': _('Envious'), + 'excited': _('Excited'), + 'flirtatious': _('Flirtatious'), + 'frustrated': _('Frustrated'), + 'grateful': _('Grateful'), + 'grieving': _('Grieving'), + 'grumpy': _('Grumpy'), + 'guilty': _('Guilty'), + 'happy': _('Happy'), + 'hopeful': _('Hopeful'), + 'hot': _('Hot'), + 'humbled': _('Humbled'), + 'humiliated': _('Humiliated'), + 'hungry': _('Hungry'), + 'hurt': _('Hurt'), + 'impressed': _('Impressed'), + 'in_awe': _('In_awe'), + 'in_love': _('In_love'), + 'indignant': _('Indignant'), + 'interested': _('Interested'), + 'intoxicated': _('Intoxicated'), + 'invincible': _('Invincible'), + 'jealous': _('Jealous'), + 'lonely': _('Lonely'), + 'lost': _('Lost'), + 'lucky': _('Lucky'), + 'mean': _('Mean'), + 'moody': _('Moody'), + 'nervous': _('Nervous'), + 'neutral': _('Neutral'), + 'offended': _('Offended'), + 'outraged': _('Outraged'), + 'playful': _('Playful'), + 'proud': _('Proud'), + 'relaxed': _('Relaxed'), + 'relieved': _('Relieved'), + 'remorseful': _('Remorseful'), + 'restless': _('Restless'), + 'sad': _('Sad'), + 'sarcastic': _('Sarcastic'), + 'satisfied': _('Satisfied'), + 'serious': _('Serious'), + 'shocked': _('Shocked'), + 'shy': _('Shy'), + 'sick': _('Sick'), + 'sleepy': _('Sleepy'), + 'spontaneous': _('Spontaneous'), + 'stressed': _('Stressed'), + 'strong': _('Strong'), + 'surprised': _('Surprised'), + 'thankful': _('Thankful'), + 'thirsty': _('Thirsty'), + 'tired': _('Tired'), + 'undefined': _('Undefined'), + 'weak': _('Weak'), + 'worried': _('Worried')} -# These moods are only available in the Gajim namespace -GAJIM_MOODS = ['thoughtful'] - ACTIVITIES = { 'doing_chores': {'category': _('Doing Chores'), 'buying_groceries': _('Buying Groceries'), @@ -418,11 +468,7 @@ return item = xmpp.Node('mood', {'xmlns': xmpp.NS_MOOD}) if mood != '': - if mood in GAJIM_MOODS: - ns = 'http://gajim.org/moods' - else: - ns = None - item.addChild(mood, namespace = ns) + item.addChild(mood) if message != '': i = item.addChild('text') i.addData(message)

1 0

[commit-gajim] r10579 - trunk/src
by steve-e＠gajim.org 27 Oct '08

27 Oct '08

Author: steve-e Date: 2008-10-27 23:06:58 +0100 (Mon, 27 Oct 2008) New Revision: 10579 Modified: trunk/src/music_track_listener.py trunk/src/roster_window.py Log: Update banshee current track when necessary. Defective by design but working. Fixes #2229 Modified: trunk/src/music_track_listener.py =================================================================== --- trunk/src/music_track_listener.py 2008-10-25 19:48:01 UTC (rev 10578) +++ trunk/src/music_track_listener.py 2008-10-27 22:06:58 UTC (rev 10579) @@ -220,6 +220,23 @@ self._last_playing_music = info return info + ## Check Banshee playing track + test = False + if hasattr(bus, 'name_has_owner'): + if bus.name_has_owner('org.bansheeproject.Banshee'): + test = True + elif dbus.dbus_bindings.bus_name_has_owner(bus.get_connection(), + 'org.bansheeproject.Banshee'): + test = True + if test: + banshee = bus.get_object('org.bansheeproject.Banshee', + '/org/bansheeproject/Banshee/PlayerEngine') + currentTrack = banshee.GetCurrentTrack() + if currentTrack: + song = self._banshee_properties_extract(currentTrack) + self._last_playing_music = song + return song + return None # here we test :) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-10-25 19:48:01 UTC (rev 10578) +++ trunk/src/roster_window.py 2008-10-27 22:06:58 UTC (rev 10579) @@ -1004,7 +1004,7 @@ gajim.connections[account].activity['activity'].strip(), gajim.connections[account].activity['subactivity'].strip()). \ get_pixbuf() - else: + else: self.model[child_iter][C_ACTIVITY_PIXBUF] = \ gtkgui_helpers.load_activity_icon( gajim.connections[account].activity['activity'].strip()). \ @@ -3285,12 +3285,12 @@ act = widget.get_active() gajim.config.set_per('accounts', account, 'publish_tune', act) if act: + listener = MusicTrackListener.get() if not self.music_track_changed_signal: - listener = MusicTrackListener.get() self.music_track_changed_signal = listener.connect( 'music-track-changed', self.music_track_changed) - track = listener.get_playing_track() - self.music_track_changed(listener, track) + track = listener.get_playing_track() + self.music_track_changed(listener, track) else: # disable it only if no other account use it for acct in gajim.connections:

1 0

[commit-gajim] r10578 - in trunk/src: . common
by bct＠gajim.org 25 Oct '08

25 Oct '08

Author: bct Date: 2008-10-25 21:48:01 +0200 (Sat, 25 Oct 2008) New Revision: 10578 Modified: trunk/src/chat_control.py trunk/src/common/connection_handlers.py Log: partial fix for renegotiating pm e2e sessions after one party disconnects Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-10-25 18:43:45 UTC (rev 10577) +++ trunk/src/chat_control.py 2008-10-25 19:48:01 UTC (rev 10578) @@ -2583,7 +2583,7 @@ if not self.session: fjid = self.contact.get_full_jid() - new_sess = gajim.connections[self.account].make_new_session(fjid) + new_sess = gajim.connections[self.account].make_new_session(fjid, type_=self.type_id) self.set_session(new_sess) self.session.negotiate_e2e(False) Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-10-25 18:43:45 UTC (rev 10577) +++ trunk/src/common/connection_handlers.py 2008-10-25 19:48:01 UTC (rev 10578) @@ -1350,6 +1350,8 @@ return None def make_new_session(self, jid, thread_id=None, type_='chat', cls=None): + '''create and register a new session. thread_id=None to generate one. + type_ should be 'chat' or 'pm'.''' if not cls: cls = gajim.default_session_type

1 0

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

25 Oct '08

Author: js Date: 2008-10-25 20:43:45 +0200 (Sat, 25 Oct 2008) New Revision: 10577 Modified: trunk/src/common/config.py Log: Add proxy65.talkonaut.com to default list of proxies. Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-10-25 15:11:32 UTC (rev 10576) +++ trunk/src/common/config.py 2008-10-25 18:43:45 UTC (rev 10577) @@ -317,7 +317,7 @@ 'dont_ack_subscription': [opt_bool, False, _('Jabberd2 workaround')], # proxy65 for FT 'file_transfer_proxies': [opt_str, - 'proxy.jabber.org, proxy.netlab.cz, transfer.jabber.freenet.de, proxy.jabber.cd.chalmers.se'], + 'proxy65.talkonaut.com, proxy.jabber.org, proxy.netlab.cz, transfer.jabber.freenet.de, proxy.jabber.cd.chalmers.se'], 'use_ft_proxies': [opt_bool, True, _('If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer.'), True], 'msgwin-x-position': [opt_int, -1], # Default is to let the wm decide 'msgwin-y-position': [opt_int, -1], # Default is to let the wm decide

1 0

[commit-gajim] r10576 - branches/osx_newbuildsys
by js＠gajim.org 25 Oct '08

25 Oct '08

Author: js Date: 2008-10-25 17:11:32 +0200 (Sat, 25 Oct 2008) New Revision: 10576 Modified: branches/osx_newbuildsys/TODO.osx Log: Remove README.osx and setup_osx.py, updated TODO.osx. Modified: branches/osx_newbuildsys/TODO.osx =================================================================== --- branches/osx_newbuildsys/TODO.osx 2008-10-25 14:32:31 UTC (rev 10575) +++ branches/osx_newbuildsys/TODO.osx 2008-10-25 15:11:32 UTC (rev 10576) @@ -1,36 +1,40 @@ The bits that work ------------------ --idle checking --dbus and gajim-remote, using dbus from GTK+.framework. --systray icon --app bundle with universal binaries. Depends on the GTK+.framework. --notifications through growl, internal fallback works fine as well --spell checking --running apps and opening files/urls --playing sounds --Network monitoring --Mostly everything else except for whats below. +- idle checking +- dbus and gajim-remote, using dbus from GTK+.framework. +- notifications through growl, internal fallback works fine as well +- spell checking +- running apps and opening files/urls +- playing sounds +- Network monitoring +- Mostly everything else except for whats below. +The bits that don't really work as expected +------------------------------------------- +- systray icon +- app bundle with universal binaries. Depends on the GTK+.framework. + + The bits that dont work ----------------------- --Application start/stop/doc/DnD handling --finish the .app bundle +- Application start/stop/doc/DnD handling +- finish the .app bundle - setup gajim-remote, maybe install it to /usr/local - fix user session management --integrate the Gajim and gajim-remote scripts with autoconf and add GTK - framework detection --Maybe setup the pasteboard services for an OS/X alternative to the - gajim_remote --CFBundleDocumentTypes.NSDocument --zeroconf has a parsing problem with the MDNS result. +- integrate the Gajim and gajim-remote scripts with autoconf and add GTK + framework detection +- Maybe setup the pasteboard services for an OS/X alternative to the + gajim_remote +- CFBundleDocumentTypes.NSDocument +- zeroconf has a parsing problem with the MDNS result. Native GTK bugs ---------------- --cut and paste blows up Finder and the os/x GUI server. very very nasty. --with mutiple displays, popup menus show up on the wrong display +- umlauts and other chars generated with Alt don't work +- no fallback on different font if a glyph is missing

1 0

[commit-gajim] r10575 - in branches/osx_newbuildsys/src/osx: growl/growlImage_m growl/growl_c nsapp_m syncmenu/syncmenu_c
by js＠gajim.org 25 Oct '08

25 Oct '08

Author: js Date: 2008-10-25 16:32:31 +0200 (Sat, 25 Oct 2008) New Revision: 10575 Modified: branches/osx_newbuildsys/src/osx/growl/growlImage_m/Makefile branches/osx_newbuildsys/src/osx/growl/growl_c/Makefile branches/osx_newbuildsys/src/osx/nsapp_m/Makefile branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/Makefile Log: Same for syncmenu, growl & nsapp. Modified: branches/osx_newbuildsys/src/osx/growl/growlImage_m/Makefile =================================================================== --- branches/osx_newbuildsys/src/osx/growl/growlImage_m/Makefile 2008-10-25 14:28:43 UTC (rev 10574) +++ branches/osx_newbuildsys/src/osx/growl/growlImage_m/Makefile 2008-10-25 14:32:31 UTC (rev 10575) @@ -5,6 +5,7 @@ include ../../../../buildsys.mk include ../../../../extra.mk -OBJCFLAGS += ${PLUGIN_CFLAGS} ${PYTHON_CFLAGS} +CPPFLAGS += ${PYTHON_CFLAGS} +OBJCFLAGS += ${PLUGIN_CFLAGS} LIBS += ${PYTHON_LIBS} LDFLAGS += ${PLUGIN_LDFLAGS} ${PYTHON_LDFLAGS} -framework CoreFoundation Modified: branches/osx_newbuildsys/src/osx/growl/growl_c/Makefile =================================================================== --- branches/osx_newbuildsys/src/osx/growl/growl_c/Makefile 2008-10-25 14:28:43 UTC (rev 10574) +++ branches/osx_newbuildsys/src/osx/growl/growl_c/Makefile 2008-10-25 14:32:31 UTC (rev 10575) @@ -5,6 +5,7 @@ include ../../../../buildsys.mk include ../../../../extra.mk -CFLAGS += ${PLUGIN_CFLAGS} ${PYTHON_CFLAGS} +CFLAGS += ${PLUGIN_CFLAGS} +CPPFLAGS += ${PYTHON_CFLAGS} LIBS += ${PYTHON_LIBS} LDFLAGS += ${PLUGIN_LDFLAGS} ${PYTHON_LDFLAGS} -framework CoreFoundation Modified: branches/osx_newbuildsys/src/osx/nsapp_m/Makefile =================================================================== --- branches/osx_newbuildsys/src/osx/nsapp_m/Makefile 2008-10-25 14:28:43 UTC (rev 10574) +++ branches/osx_newbuildsys/src/osx/nsapp_m/Makefile 2008-10-25 14:32:31 UTC (rev 10575) @@ -5,6 +5,7 @@ include ../../../buildsys.mk include ../../../extra.mk -OBJCFLAGS += ${PLUGIN_CFLAGS} ${PYTHON_CFLAGS} +CPPFLAGS += ${PYTHON_CFLAGS} +OBJCFLAGS += ${PLUGIN_CFLAGS} LIBS += ${PYTHON_LIBS} LDFLAGS += ${PLUGIN_LDFLAGS} ${PYTHON_LDFLAGS} -framework CoreFoundation Modified: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/Makefile =================================================================== --- branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/Makefile 2008-10-25 14:28:43 UTC (rev 10574) +++ branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/Makefile 2008-10-25 14:32:31 UTC (rev 10575) @@ -7,6 +7,7 @@ include ../../../../extra.mk # FIXME: This should be done properly... -CFLAGS += ${PLUGIN_CFLAGS} ${PYTHON_CFLAGS} $$(pkg-config --cflags gtk+-2.0 pygobject-2.0) +CFLAGS += ${PLUGIN_CFLAGS} +CPPFLAGS += ${PYTHON_CFLAGS} $$(pkg-config --cflags gtk+-2.0 pygobject-2.0) LIBS += ${PYTHON_LIBS} ${PYGTK_LIBS} $$(pkg-config --libs gtk+-2.0 pygobject-2.0) LDFLAGS += ${PLUGIN_LDFLAGS} ${PYTHON_LDFLAGS} -framework CoreFoundation

1 0

[commit-gajim] r10574 - branches/osx_newbuildsys/src/osx/idle_c
by js＠gajim.org 25 Oct '08

25 Oct '08

Author: js Date: 2008-10-25 16:28:43 +0200 (Sat, 25 Oct 2008) New Revision: 10574 Modified: branches/osx_newbuildsys/src/osx/idle_c/Makefile Log: Python's CFLAGS are actually CPPFLAGS. Modified: branches/osx_newbuildsys/src/osx/idle_c/Makefile =================================================================== --- branches/osx_newbuildsys/src/osx/idle_c/Makefile 2008-10-24 17:28:36 UTC (rev 10573) +++ branches/osx_newbuildsys/src/osx/idle_c/Makefile 2008-10-25 14:28:43 UTC (rev 10574) @@ -5,6 +5,7 @@ include ../../../buildsys.mk include ../../../extra.mk -CFLAGS += ${PLUGIN_CFLAGS} ${PYTHON_CFLAGS} +CFLAGS += ${PLUGIN_CFLAGS} +CPPFLAGS += ${PYTHON_CFLAGS} LIBS += ${PYTHON_LIBS} LDFLAGS += ${PLUGIN_LDFLAGS} ${PYTHON_LDFLAGS} -framework CoreFoundation

1 0

[commit-gajim] r10573 - in branches/osx_newbuildsys: . data/activities/default/doing_chores data/activities/default/drinking data/activities/default/eating data/activities/default/exercising data/activities/default/grooming data/activities/default/inactive data/activities/default/talking data/activities/default/traveling src src/common src/common/xmpp
by js＠gajim.org 24 Oct '08

24 Oct '08

Author: js Date: 2008-10-24 19:28:36 +0200 (Fri, 24 Oct 2008) New Revision: 10573 Added: branches/osx_newbuildsys/TODO.pep branches/osx_newbuildsys/data/activities/default/talking/on_video_phone.png Removed: branches/osx_newbuildsys/TODO.pep branches/osx_newbuildsys/data/activities/default/talking/on_the_video_phone.png Modified: branches/osx_newbuildsys/README.html branches/osx_newbuildsys/data/activities/default/doing_chores/buying_groceries.png branches/osx_newbuildsys/data/activities/default/doing_chores/running_an_errand.png branches/osx_newbuildsys/data/activities/default/drinking/category.png branches/osx_newbuildsys/data/activities/default/eating/having_dinner.png branches/osx_newbuildsys/data/activities/default/exercising/working_out.png branches/osx_newbuildsys/data/activities/default/grooming/at_the_spa.png branches/osx_newbuildsys/data/activities/default/grooming/taking_a_shower.png branches/osx_newbuildsys/data/activities/default/inactive/day_off.png branches/osx_newbuildsys/data/activities/default/inactive/on_vacation.png branches/osx_newbuildsys/data/activities/default/inactive/scheduled_holiday.png branches/osx_newbuildsys/data/activities/default/inactive/sleeping.png branches/osx_newbuildsys/data/activities/default/traveling/cycling.png branches/osx_newbuildsys/data/activities/default/traveling/driving.png branches/osx_newbuildsys/data/activities/default/traveling/walking.png branches/osx_newbuildsys/src/chat_control.py branches/osx_newbuildsys/src/common/commands.py branches/osx_newbuildsys/src/common/connection_handlers.py branches/osx_newbuildsys/src/common/pep.py branches/osx_newbuildsys/src/common/xmpp/transports_nb.py branches/osx_newbuildsys/src/dialogs.py branches/osx_newbuildsys/src/gajim.py branches/osx_newbuildsys/src/gtkgui_helpers.py branches/osx_newbuildsys/src/roster_window.py Log: Merge trunk r10572. Modified: branches/osx_newbuildsys/README.html =================================================================== --- branches/osx_newbuildsys/README.html 2008-10-24 17:24:10 UTC (rev 10572) +++ branches/osx_newbuildsys/README.html 2008-10-24 17:28:36 UTC (rev 10573) @@ -142,7 +142,7 @@ -(C) 2003-2006 +(C) 2003-2008 The Gajim Team http://gajim.org Deleted: branches/osx_newbuildsys/TODO.pep =================================================================== --- branches/osx_newbuildsys/TODO.pep 2008-10-24 17:24:10 UTC (rev 10572) +++ branches/osx_newbuildsys/TODO.pep 2008-10-24 17:28:36 UTC (rev 10573) @@ -1,13 +0,0 @@ -• 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 - -Mood/Activity use cases -• on connection of an account set them to None -• on disconnection of an account set them to None -• on explicit set publish them Copied: branches/osx_newbuildsys/TODO.pep (from rev 10572, trunk/TODO.pep) =================================================================== --- branches/osx_newbuildsys/TODO.pep (rev 0) +++ branches/osx_newbuildsys/TODO.pep 2008-10-24 17:28:36 UTC (rev 10573) @@ -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 Modified: branches/osx_newbuildsys/data/activities/default/doing_chores/buying_groceries.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/activities/default/doing_chores/running_an_errand.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/activities/default/drinking/category.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/activities/default/eating/having_dinner.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/activities/default/exercising/working_out.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/activities/default/grooming/at_the_spa.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/activities/default/grooming/taking_a_shower.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/activities/default/inactive/day_off.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/activities/default/inactive/on_vacation.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/activities/default/inactive/scheduled_holiday.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/activities/default/inactive/sleeping.png =================================================================== (Binary files differ) Deleted: branches/osx_newbuildsys/data/activities/default/talking/on_the_video_phone.png =================================================================== (Binary files differ) Added: branches/osx_newbuildsys/data/activities/default/talking/on_video_phone.png =================================================================== (Binary files differ) Property changes on: branches/osx_newbuildsys/data/activities/default/talking/on_video_phone.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/osx_newbuildsys/data/activities/default/traveling/cycling.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/activities/default/traveling/driving.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/data/activities/default/traveling/walking.png =================================================================== (Binary files differ) Modified: branches/osx_newbuildsys/src/chat_control.py =================================================================== --- branches/osx_newbuildsys/src/chat_control.py 2008-10-24 17:24:10 UTC (rev 10572) +++ branches/osx_newbuildsys/src/chat_control.py 2008-10-24 17:28:36 UTC (rev 10573) @@ -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: branches/osx_newbuildsys/src/common/commands.py =================================================================== --- branches/osx_newbuildsys/src/common/commands.py 2008-10-24 17:24:10 UTC (rev 10572) +++ branches/osx_newbuildsys/src/common/commands.py 2008-10-24 17:28:36 UTC (rev 10573) @@ -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 Modified: branches/osx_newbuildsys/src/common/connection_handlers.py =================================================================== --- branches/osx_newbuildsys/src/common/connection_handlers.py 2008-10-24 17:24:10 UTC (rev 10572) +++ branches/osx_newbuildsys/src/common/connection_handlers.py 2008-10-24 17:28:36 UTC (rev 10573) @@ -1837,6 +1837,12 @@ subject=subject) except exceptions.PysqliteOperationalError, e: self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + except exceptions.DatabaseMalformed: + pritext = _('Database Error') + sectext = _('The database file (%s) cannot be read. Try to repair ' + 'it (see http://trac.gajim.org/wiki/DatabaseBackup) or remove ' + 'it (all history will be lost).') % common.logger.LOG_DB_PATH + self.dispatch('ERROR', (pritext, sectext)) self.dispatch('MSGERROR', (frm, msg.getErrorCode(), error_msg, msgtxt, tim, session)) @@ -1877,6 +1883,12 @@ gajim.logger.write('gc_msg', frm, msgtxt, tim=tim) except exceptions.PysqliteOperationalError, e: self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + except exceptions.DatabaseMalformed: + pritext = _('Database Error') + sectext = _('The database file (%s) cannot be read. Try to repair ' + 'it (see http://trac.gajim.org/wiki/DatabaseBackup) or remove ' + 'it (all history will be lost).') % common.logger.LOG_DB_PATH + self.dispatch('ERROR', (pritext, sectext)) def dispatch_invite_message(self, invite, frm): item = invite.getTag('invite') @@ -2059,6 +2071,13 @@ gajim.logger.write('gcstatus', who, st, show) except exceptions.PysqliteOperationalError, e: self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + except exceptions.DatabaseMalformed: + pritext = _('Database Error') + sectext = _('The database file (%s) cannot be read. Try to ' + 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup)' + ' or remove it (all history will be lost).') % \ + common.logger.LOG_DB_PATH + self.dispatch('ERROR', (pritext, sectext)) if avatar_sha or avatar_sha == '': if avatar_sha == '': # contact has no avatar @@ -2178,6 +2197,13 @@ gajim.logger.write('status', jid_stripped, status, show) except exceptions.PysqliteOperationalError, e: self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + except exceptions.DatabaseMalformed: + pritext = _('Database Error') + sectext = _('The database file (%s) cannot be read. Try to ' + 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup) ' + 'or remove it (all history will be lost).') % \ + common.logger.LOG_DB_PATH + self.dispatch('ERROR', (pritext, sectext)) our_jid = gajim.get_jid_from_account(self.name) if jid_stripped == our_jid and resource == self.server_resource: # We got our own presence Modified: branches/osx_newbuildsys/src/common/pep.py =================================================================== --- branches/osx_newbuildsys/src/common/pep.py 2008-10-24 17:24:10 UTC (rev 10572) +++ branches/osx_newbuildsys/src/common/pep.py 2008-10-24 17:28:36 UTC (rev 10573) @@ -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 Modified: branches/osx_newbuildsys/src/common/xmpp/transports_nb.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/transports_nb.py 2008-10-24 17:24:10 UTC (rev 10572) +++ branches/osx_newbuildsys/src/common/xmpp/transports_nb.py 2008-10-24 17:28:36 UTC (rev 10573) @@ -472,7 +472,12 @@ return if received is None: - if errnum != 0: + if self.state == 0 and errnum == errno.ECONNREFUSED: + # We tried to connect to a port that did't listen. + log.error("Connection to %s refused: %s [%d]", self.getName(), errtxt, errnum) + self.pollend(retry=True) + return + elif errnum != 0: self.DEBUG(errtxt, 'error') log.error("Connection to %s lost: %s [%d]", self.getName(), errtxt, errnum) self._owner.disconnected() @@ -565,6 +570,8 @@ return self.fd = self._sock.fileno() self.idlequeue.plug_idle(self, True, False) + self._send = self._sock.send + self._recv = self._sock.recv self.set_timeout(CONNECT_TIMEOUT_SECONDS) self._do_connect() @@ -591,8 +598,6 @@ self._owner.Connection=self self.state = 1 - self._send = self._sock.send - self._recv = self._sock.recv self._plug_idle() if self.on_connect: self.on_connect() Modified: branches/osx_newbuildsys/src/dialogs.py =================================================================== --- branches/osx_newbuildsys/src/dialogs.py 2008-10-24 17:24:10 UTC (rev 10572) +++ branches/osx_newbuildsys/src/dialogs.py 2008-10-24 17:28:36 UTC (rev 10573) @@ -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 @@ -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:]) Modified: branches/osx_newbuildsys/src/gajim.py =================================================================== --- branches/osx_newbuildsys/src/gajim.py 2008-10-24 17:24:10 UTC (rev 10572) +++ branches/osx_newbuildsys/src/gajim.py 2008-10-24 17:28:36 UTC (rev 10573) @@ -175,7 +175,7 @@ from common import gajim except exceptions.DatabaseMalformed: pritext = _('Database Error') - sectext = _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH + sectext = _('The database file (%s) cannot be read. Try to repair it (see http://trac.gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost).') % common.logger.LOG_DB_PATH else: from common import dbus_support if dbus_support.supported: @@ -2607,12 +2607,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) @@ -2621,12 +2620,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 Modified: branches/osx_newbuildsys/src/gtkgui_helpers.py =================================================================== --- branches/osx_newbuildsys/src/gtkgui_helpers.py 2008-10-24 17:24:10 UTC (rev 10572) +++ branches/osx_newbuildsys/src/gtkgui_helpers.py 2008-10-24 17:28:36 UTC (rev 10573) @@ -904,8 +904,6 @@ def load_activity_icon(category, activity = None): '''load an icon from the activity iconset in 16x16''' - print category - print activity iconset = gajim.config.get('activity_iconset') path = os.path.join(helpers.get_activity_iconset_path(iconset), category, '') Modified: branches/osx_newbuildsys/src/roster_window.py =================================================================== --- branches/osx_newbuildsys/src/roster_window.py 2008-10-24 17:24:10 UTC (rev 10572) +++ branches/osx_newbuildsys/src/roster_window.py 2008-10-24 17:28:36 UTC (rev 10573) @@ -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() @@ -2074,9 +2090,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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2008