empathy r2398 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Feb  3 09:03:42 2009
New Revision: 2398
URL: http://svn.gnome.org/viewvc/empathy?rev=2398&view=rev

Log:
Don't return the handler, so we can unref it after signalling

Signed-off-by: Sjoerd Simons <sjoerd simons collabora co uk>

Modified:
   trunk/libempathy/empathy-call-factory.c
   trunk/libempathy/empathy-call-factory.h

Modified: trunk/libempathy/empathy-call-factory.c
==============================================================================
--- trunk/libempathy/empathy-call-factory.c	(original)
+++ trunk/libempathy/empathy-call-factory.c	Tue Feb  3 09:03:42 2009
@@ -141,32 +141,32 @@
   return EMPATHY_CALL_FACTORY (call_factory);
 }
 
-EmpathyCallHandler *
+void
 empathy_call_factory_new_call (EmpathyCallFactory *factory,
   EmpathyContact *contact)
 {
   EmpathyCallHandler *handler;
 
-  g_return_val_if_fail (factory != NULL, NULL);
-  g_return_val_if_fail (contact != NULL, NULL);
+  g_return_if_fail (factory != NULL);
+  g_return_if_fail (contact != NULL);
 
   handler = empathy_call_handler_new_for_contact (contact);
 
   g_signal_emit (G_OBJECT (factory), signals[NEW_CALL_HANDLER], 0,
     handler, TRUE);
 
-  return handler;
+  g_object_unref (handler);
 }
 
-EmpathyCallHandler *
+void
 empathy_call_factory_claim_channel (EmpathyCallFactory *factory,
   EmpathyDispatchOperation *operation)
 {
   EmpathyCallHandler *handler;
   EmpathyTpCall *call;
 
-  g_return_val_if_fail (factory != NULL, NULL);
-  g_return_val_if_fail (operation != NULL, NULL);
+  g_return_if_fail (factory != NULL);
+  g_return_if_fail (operation != NULL);
 
   call = EMPATHY_TP_CALL (
     empathy_dispatch_operation_get_channel_wrapper (operation));
@@ -178,6 +178,6 @@
   g_signal_emit (G_OBJECT (factory), signals[NEW_CALL_HANDLER], 0,
     handler, FALSE);
 
-  return handler;
+  g_object_unref (handler);
 }
 

Modified: trunk/libempathy/empathy-call-factory.h
==============================================================================
--- trunk/libempathy/empathy-call-factory.h	(original)
+++ trunk/libempathy/empathy-call-factory.h	Tue Feb  3 09:03:42 2009
@@ -63,11 +63,11 @@
 
 EmpathyCallFactory *empathy_call_factory_get (void);
 
-EmpathyCallHandler *empathy_call_factory_new_call (
-  EmpathyCallFactory *factory, EmpathyContact *contact);
+void empathy_call_factory_new_call (EmpathyCallFactory *factory,
+  EmpathyContact *contact);
 
-EmpathyCallHandler *empathy_call_factory_claim_channel (
-  EmpathyCallFactory *factory, EmpathyDispatchOperation *operation);
+void empathy_call_factory_claim_channel (EmpathyCallFactory *factory,
+  EmpathyDispatchOperation *operation);
 
 G_END_DECLS