[Telepathy-commits] [telepathy-gabble/master] caps-channel-manager.c: add assert: update_capabilities cannot be called on channel manager that does not implement the caps interface

Alban Crequy alban.crequy at collabora.co.uk
Fri Dec 5 09:42:33 PST 2008


---
 src/caps-channel-manager.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/caps-channel-manager.c b/src/caps-channel-manager.c
index 4126af3..7fa461a 100644
--- a/src/caps-channel-manager.c
+++ b/src/caps-channel-manager.c
@@ -147,11 +147,9 @@ void gabble_caps_channel_manager_update_capabilities (
     GABBLE_CAPS_CHANNEL_MANAGER_GET_INTERFACE (caps_manager);
   GabbleCapsChannelManagerCopyCapsFunc method = iface->update_caps;
 
-  if (method != NULL)
-    {
-      method (caps_manager, specific_caps_out, specific_caps_in);
-    }
-  /* ... else, do what? */
+  /* cannot be called if not implemented */
+  g_assert (method != NULL);
+  method (caps_manager, specific_caps_out, specific_caps_in);
 }
 
 gboolean gabble_caps_channel_manager_capabilities_diff (
-- 
1.5.6.5




More information about the Telepathy-commits mailing list