Merged default branch with plugin-system branch. Not all elements are fully

functional. This should be considered as sync commit.

6 files changed, 21 insertions, 8 deletions

diff --git a/plugins/banner_tweaks/plugin.py b/plugins/banner_tweaks/plugin.py
index ba059143e..e8b7343ca 100644
--- a/plugins/banner_tweaks/plugin.py
+++ b/plugins/banner_tweaks/plugin.py
@@ -69,13 +69,16 @@ http://trac.gajim.org/attachment/ticket/4133'''
 									  'old_chat_avatar_height' : (52, _('chat_avatar_height value before plugin was activated')),
 									  }
 		
+	@log_calls('BannerTweaksPlugin')
 	def activate(self):
 		self.config['old_chat_avatar_height'] = gajim.config.get('chat_avatar_height')
 		#gajim.config.set('chat_avatar_height', 28)
 		
+	@log_calls('BannerTweaksPlugin')
 	def deactivate(self):
 		gajim.config.set('chat_avatar_height', self.config['old_chat_avatar_height'])
 		
+	@log_calls('BannerTweaksPlugin')
 	def chat_control_base_draw_banner_called(self, chat_control):
 		if not self.config['show_banner_online_msg']:
 			chat_control.banner_status_label.hide()
@@ -158,7 +161,8 @@ http://trac.gajim.org/attachment/ticket/4133'''
 					(font_attrs, name, font_attrs_small, acct_info)
 			
 			banner_name_label.set_markup(label_text)
-			
+
+	@log_calls('BannerTweaksPlugin')
 	def chat_control_base_draw_banner_deactivation(self, chat_control):
 		pass
 		#chat_control.draw_banner()
diff --git a/plugins/dbus_plugin/plugin.py b/plugins/dbus_plugin/plugin.py
index d8c022d27..b497ce45c 100644
--- a/plugins/dbus_plugin/plugin.py
+++ b/plugins/dbus_plugin/plugin.py
@@ -706,13 +706,14 @@ Gajim core but uses new events handling system.'''
 		self.events_handlers = {}
 		self._set_handling_methods()
 		
-		
+	@log_calls('DBusPlugin')	
 	def activate(self):
 		session_bus = dbus_support.session_bus.SessionBus()
 
 		bus_name = dbus.service.BusName(SERVICE, bus=session_bus)
 		self.signal_object = SignalObject(bus_name)
-		
+	
+	@log_calls('DBusPlugin')	
 	def deactivate(self):
 		self.signal_object.remove_from_connection()
 		self.signal_object = None
diff --git a/plugins/events_dump/plugin.py b/plugins/events_dump/plugin.py
index b5d37cd06..4e284aab6 100644
--- a/plugins/events_dump/plugin.py
+++ b/plugins/events_dump/plugin.py
@@ -103,10 +103,11 @@ class EventsDumpPlugin(GajimPlugin):
 		self.events_handlers = {}
 		self._set_handling_methods()
 		
-		
+	@log_calls('DBusPlugin')
 	def activate(self):
 		pass
 		
+	@log_calls('DBusPlugin')
 	def deactivate(self):
 		pass
 
diff --git a/plugins/google_translation/plugin.py b/plugins/google_translation/plugin.py
index 55bf0dd10..faaf56700 100644
--- a/plugins/google_translation/plugin.py
+++ b/plugins/google_translation/plugin.py
@@ -89,10 +89,12 @@ class GoogleTranslationPlugin(GajimPlugin):
 			text = text.replace(char, replacement)
 			
 		return text
-		
+	
+	@log_calls('DBusPlugin')
 	def activate(self):
 		pass
 		
+	@log_calls('DBusPlugin')
 	def deactivate(self):
 		pass
 	
diff --git a/plugins/new_events_example/plugin.py b/plugins/new_events_example/plugin.py
index 451f300c2..496aef04d 100644
--- a/plugins/new_events_example/plugin.py
+++ b/plugins/new_events_example/plugin.py
@@ -79,11 +79,13 @@ class NewEventsExamplePlugin(GajimPlugin):
 	def customized_message_received(self, event_object):
 		pass
 		#print "Event '%s' occured. Event object: %s\n\n===\n"%(event_object.name, 
-														#event_object)
-		
+														#event_object
+														
+	@log_calls('DBusPlugin')
 	def activate(self):
 		pass
-		
+
+	@log_calls('DBusPlugin')
 	def deactivate(self):
 		pass
 	
diff --git a/plugins/snarl_notifications/plugin.py b/plugins/snarl_notifications/plugin.py
index 9835cca28..4d831ee39 100644
--- a/plugins/snarl_notifications/plugin.py
+++ b/plugins/snarl_notifications/plugin.py
@@ -54,12 +54,15 @@ PySnarl bindings are used (http://code.google.com/p/pysnarl/).'''
 		
 		self.events_handlers = {'NewMessage' : (ged.POSTCORE, self.newMessage)}
 
+	@log_calls('SnarlNotificationsPlugin')
 	def activate(self):
 		pass
 		
+	@log_calls('SnarlNotificationsPlugin')
 	def deactivate(self):
 		pass
 	
+	@log_calls('SnarlNotificationsPlugin')
 	def newMessage(self, args):
 		event_name = "NewMessage"
 		data = args