Revert r10064 and to it the right way™.

3 files changed, 76 insertions, 89 deletions

diff --git a/data/glade/change_activity_dialog.glade b/data/glade/change_activity_dialog.glade
index 5c99eed79..7c3744dc9 100644
--- a/data/glade/change_activity_dialog.glade
+++ b/data/glade/change_activity_dialog.glade
@@ -63,7 +63,6 @@
             <child>
               <widget class="GtkImage" id="working_image">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Working</property>
                 <property name="stock">gtk-missing-image</property>
                 <property name="icon_size">1</property>
               </widget>
@@ -106,7 +105,6 @@
             <child>
               <widget class="GtkImage" id="eating_image">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Eating</property>
                 <property name="stock">gtk-missing-image</property>
                 <property name="icon_size">1</property>
               </widget>
@@ -150,7 +148,6 @@
             <child>
               <widget class="GtkImage" id="exercising_image">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Exercising</property>
                 <property name="stock">gtk-missing-image</property>
                 <property name="icon_size">1</property>
               </widget>
@@ -194,7 +191,6 @@
             <child>
               <widget class="GtkImage" id="relaxing_image">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Relaxing</property>
                 <property name="stock">gtk-missing-image</property>
                 <property name="icon_size">1</property>
               </widget>
@@ -238,7 +234,6 @@
             <child>
               <widget class="GtkImage" id="talking_image">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Talking</property>
                 <property name="stock">gtk-missing-image</property>
                 <property name="icon_size">1</property>
               </widget>
@@ -282,7 +277,6 @@
             <child>
               <widget class="GtkImage" id="doing_chores_image">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Doing Chores</property>
                 <property name="stock">gtk-missing-image</property>
                 <property name="icon_size">1</property>
               </widget>
@@ -326,7 +320,6 @@
             <child>
               <widget class="GtkImage" id="inactive_image">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Inactive</property>
                 <property name="stock">gtk-missing-image</property>
                 <property name="icon_size">1</property>
               </widget>
@@ -370,7 +363,6 @@
             <child>
               <widget class="GtkImage" id="traveling_image">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Traveling</property>
                 <property name="stock">gtk-missing-image</property>
                 <property name="icon_size">1</property>
               </widget>
@@ -414,7 +406,6 @@
             <child>
               <widget class="GtkImage" id="having_appointment_image">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Having an Appointment</property>
                 <property name="stock">gtk-missing-image</property>
                 <property name="icon_size">1</property>
               </widget>
@@ -458,7 +449,6 @@
             <child>
               <widget class="GtkImage" id="drinking_image">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Drinking</property>
                 <property name="stock">gtk-missing-image</property>
                 <property name="icon_size">1</property>
               </widget>
@@ -502,7 +492,6 @@
             <child>
               <widget class="GtkImage" id="grooming_image">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Grooming</property>
                 <property name="stock">gtk-missing-image</property>
                 <property name="icon_size">1</property>
               </widget>
diff --git a/src/common/pep.py b/src/common/pep.py
index 8ebe57a33..a011db977 100644
--- a/src/common/pep.py
+++ b/src/common/pep.py
@@ -37,78 +37,78 @@ MOODS = {
 GAJIM_MOODS = ['thoughtful']
 
 ACTIVITIES = {
-	'doing_chores': {'category':	_('Doing Chores'),
-		'buying_groceries':	_('Buying Groceries'),
-		'cleaning':		_('Cleaning'),
-		'cooking':		_('Cooking'),
-		'doing_maintenance':	_('Doing Maintenance'),
-		'doing_the_dishes':	_('Doing the Dishes'),
-		'doing_the_laundry':	_('Doing the Laundry'),
-		'gardening':		_('Gardening'),
-		'running_an_errand':	_('Running an Errand'),
-		'walking_the_dog':	_('Walking the Dog')},
-	'drinking': {'category':	_('Drinking'),
-		'having_a_beer':	_('Having a Beer'),
-		'having_coffee':	_('Having Coffee'),
-		'having_tea':		_('Having Tea')},
-	'eating': {'category':		_('Eating'),
-		'having_a_snack':	_('Having a Snack'),
-		'having_breakfast':	_('Having Breakfast'),
-		'having_dinner':	_('Having Dinner'),
-		'having_lunch':		_('Having Lunch')},
-	'exercising': {'category':	_('Exercising'),
-		'cycling':		_('Cycling'),
-		'hiking':		_('Hiking'),
-		'jogging':		_('Jogging'),
-		'playing_sports':	_('Playing Sports'),
-		'running':		_('Running'),
-		'skiing':		_('Skiing'),
-		'swimming':		_('Swimming'),
-		'working_out':		_('Working out')},
-	'grooming': {'category':	_('Grooming'),
-		'at_the_spa':		_('At the Spa'),
-		'brushing_teeth':	_('Brushing Teeth'),
-		'getting_a_haircut':	_('Getting a Haircut'),
-		'shaving':		_('Shaving'),
-		'taking_a_bath':	_('Taking a Bath'),
-		'taking_a_shower':	_('Taking a Shower')},
-	'having_appointment': {'category:': _('Having an Appointment')},
-	'inactive': {'category':	_('Inactive'),
-		'day_off':		_('Day Off'),
-		'hanging_out':		_('Haning out'),
-		'on_vacation':		_('On Vacation'),
-		'scheduled_holiday':	_('Scheduled Holiday'),
-		'sleeping':		_('Sleeping')},
-	'relaxing': {'category':	_('Relaxing'),
-		'gaming':		_('Gaming'),
-		'going_out':		_('Going out'),
-		'partying':		_('Partying'),
-		'reading':		_('Reading'),
-		'rehearsing':		_('Rehearsing'),
-		'shopping':		_('Shopping'),
-		'socializing':		_('Socializing'),
-		'sunbathing':		_('Sunbathing'),
-		'watching_tv':		_('Watching TV'),
-		'watching_a_movie':	_('Watching a Movie')},
-	'talking': {'category':		_('Talking'),
-		'in_real_life':		_('In Real Life'),
-		'on_the_phone':		_('On the Phone'),
-		'on_video_phone':	_('On Video Phone')},
-	'traveling': {'category':	_('Traveling'),
-		'commuting':		_('Commuting'),
-		'cycling':		_('Cycling'),
-		'driving':		_('Driving'),
-		'in_a_car':		_('In a Car'),
-		'on_a_bus':		_('On a Bus'),
-		'on_a_plane':		_('On a Plane'),
-		'on_a_train':		_('On a Train'),
-		'on_a_trip':		_('On a Trip'),
-		'walking':		_('Walking')},
-	'working': {'category':		_('Working'),
-		'coding':		_('Coding'),
-		'in_a_meeting':		_('In a Meeting'),
-		'studying':		_('Studying'),
-		'writing':		_('Writing')}}
+	'doing_chores': {'category':			_('Doing Chores'),
+		'buying_groceries':					_('Buying Groceries'),
+		'cleaning':								_('Cleaning'),
+		'cooking':								_('Cooking'),
+		'doing_maintenance':					_('Doing Maintenance'),
+		'doing_the_dishes':					_('Doing the Dishes'),
+		'doing_the_laundry':					_('Doing the Laundry'),
+		'gardening':							_('Gardening'),
+		'running_an_errand':					_('Running an Errand'),
+		'walking_the_dog':					_('Walking the Dog')},
+	'drinking': {'category':				_('Drinking'),
+		'having_a_beer':						_('Having a Beer'),
+		'having_coffee':						_('Having Coffee'),
+		'having_tea':							_('Having Tea')},
+	'eating': {'category':					_('Eating'),
+		'having_a_snack':						_('Having a Snack'),
+		'having_breakfast':					_('Having Breakfast'),
+		'having_dinner':						_('Having Dinner'),
+		'having_lunch':						_('Having Lunch')},
+	'exercising': {'category':				_('Exercising'),
+		'cycling':								_('Cycling'),
+		'hiking':								_('Hiking'),
+		'jogging':								_('Jogging'),
+		'playing_sports':						_('Playing Sports'),
+		'running':								_('Running'),
+		'skiing':								_('Skiing'),
+		'swimming':								_('Swimming'),
+		'working_out':							_('Working out')},
+	'grooming': {'category':				_('Grooming'),
+		'at_the_spa':							_('At the Spa'),
+		'brushing_teeth':						_('Brushing Teeth'),
+		'getting_a_haircut':					_('Getting a Haircut'),
+		'shaving':								_('Shaving'),
+		'taking_a_bath':						_('Taking a Bath'),
+		'taking_a_shower':					_('Taking a Shower')},
+	'having_appointment': {'category':	_('Having an Appointment')},
+	'inactive': {'category':				_('Inactive'),
+		'day_off':								_('Day Off'),
+		'hanging_out':							_('Haning out'),
+		'on_vacation':							_('On Vacation'),
+		'scheduled_holiday':					_('Scheduled Holiday'),
+		'sleeping':								_('Sleeping')},
+	'relaxing': {'category':				_('Relaxing'),
+		'gaming':								_('Gaming'),
+		'going_out':							_('Going out'),
+		'partying':								_('Partying'),
+		'reading':								_('Reading'),
+		'rehearsing':							_('Rehearsing'),
+		'shopping':								_('Shopping'),
+		'socializing':							_('Socializing'),
+		'sunbathing':							_('Sunbathing'),
+		'watching_tv':							_('Watching TV'),
+		'watching_a_movie':					_('Watching a Movie')},
+	'talking': {'category':					_('Talking'),
+		'in_real_life':						_('In Real Life'),
+		'on_the_phone':						_('On the Phone'),
+		'on_video_phone':						_('On Video Phone')},
+	'traveling': {'category':				_('Traveling'),
+		'commuting':							_('Commuting'),
+		'cycling':								_('Cycling'),
+		'driving':								_('Driving'),
+		'in_a_car':								_('In a Car'),
+		'on_a_bus':								_('On a Bus'),
+		'on_a_plane':							_('On a Plane'),
+		'on_a_train':							_('On a Train'),
+		'on_a_trip':							_('On a Trip'),
+		'walking':								_('Walking')},
+	'working': {'category':					_('Working'),
+		'coding':								_('Coding'),
+		'in_a_meeting':						_('In a Meeting'),
+		'studying':								_('Studying'),
+		'writing':								_('Writing')}}
 
 def user_mood(items, name, jid):
 	has_child = False
diff --git a/src/dialogs.py b/src/dialogs.py
index 53824c3f7..8d40bfc15 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -355,8 +355,8 @@ class ChangeActivityDialog:
 		for category in pep.ACTIVITIES:
 			item = self.xml.get_widget(category + '_image')
 			item.set_from_pixbuf(
-				gtkgui_helpers.load_activity_icon(
-				category).get_pixbuf())
+				gtkgui_helpers.load_activity_icon(category).get_pixbuf())
+			gtk.Tooltips().set_tip(item, pep.ACTIVITIES[category]['category'])
 
 			vbox = self.xml.get_widget(category + '_vbox')
 			for activity in pep.ACTIVITIES[category]:
@@ -370,10 +370,8 @@ class ChangeActivityDialog:
 				else:
 					rbtns[act] = group = gtk.RadioButton()
 
-				rbtns[act].set_label(
-					pep.ACTIVITIES[category][activity])
-				rbtns[act].connect('toggled',
-					self.on_rbtn_toggled,
+				rbtns[act].set_label(pep.ACTIVITIES[category][activity])
+				rbtns[act].connect('toggled', self.on_rbtn_toggled,
 					[category, activity])
 				vbox.pack_start(rbtns[act], False, False, 0)