From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Tue, 3 Feb 2009 09:03:42 +0000 (+0000)
Subject: Don't return the handler, so we can unref it after signalling
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=2690df7f5e8837b7240ed75d456894f36c77a8b9

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

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

svn path=/trunk/; revision=2398
---

diff --git a/libempathy/empathy-call-factory.c b/libempathy/empathy-call-factory.c
index 9e727240..565f1d03 100644
--- a/libempathy/empathy-call-factory.c
+++ b/libempathy/empathy-call-factory.c
@@ -141,32 +141,32 @@ empathy_call_factory_get (void)
   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 @@ empathy_call_factory_claim_channel (EmpathyCallFactory *factory,
   g_signal_emit (G_OBJECT (factory), signals[NEW_CALL_HANDLER], 0,
     handler, FALSE);
 
-  return handler;
+  g_object_unref (handler);
 }
 
diff --git a/libempathy/empathy-call-factory.h b/libempathy/empathy-call-factory.h
index 36866e74..28b3f0c3 100644
--- a/libempathy/empathy-call-factory.h
+++ b/libempathy/empathy-call-factory.h
@@ -63,11 +63,11 @@ EmpathyCallFactory *empathy_call_factory_initialise (void);
 
 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