[commit-gajim] r10580 - in trunk: data/moods/default src/common - Commits

30 Oct 2008

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)

    