diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-02-03 17:03:42 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-02-03 17:03:42 +0800 |
| commit | 2690df7f5e8837b7240ed75d456894f36c77a8b9 (patch) | |
| tree | fe528ecf9062417d481db9b57c4ff9945f9c7b3f /libempathy | |
| parent | 64a9451336199741bf87c6227a8b50f0aa705e6a (diff) | |
| download | gsoc2013-empathy-2690df7f5e8837b7240ed75d456894f36c77a8b9.tar gsoc2013-empathy-2690df7f5e8837b7240ed75d456894f36c77a8b9.tar.gz gsoc2013-empathy-2690df7f5e8837b7240ed75d456894f36c77a8b9.tar.bz2 gsoc2013-empathy-2690df7f5e8837b7240ed75d456894f36c77a8b9.tar.lz gsoc2013-empathy-2690df7f5e8837b7240ed75d456894f36c77a8b9.tar.xz gsoc2013-empathy-2690df7f5e8837b7240ed75d456894f36c77a8b9.tar.zst gsoc2013-empathy-2690df7f5e8837b7240ed75d456894f36c77a8b9.zip | |
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
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-call-factory.c | 16 | ||||
| -rw-r--r-- | libempathy/empathy-call-factory.h | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/libempathy/empathy-call-factory.c b/libempathy/empathy-call-factory.c index 9e7272409..565f1d03f 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 36866e743..28b3f0c3e 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 |