[telepathy-gabble/master] Don't assert when there is no update method, wjt will probably fix it rsn

Sjoerd Simons sjoerd.simons at collabora.co.uk
Wed May 6 09:55:35 PDT 2009


---
 src/caps-channel-manager.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/caps-channel-manager.c b/src/caps-channel-manager.c
index b52ab7e..737662a 100644
--- a/src/caps-channel-manager.c
+++ b/src/caps-channel-manager.c
@@ -27,6 +27,9 @@
 #include <telepathy-glib/channel-manager.h>
 
 
+#define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
+#include "debug.h"
+
 GType
 gabble_caps_channel_manager_get_type (void)
 {
@@ -148,8 +151,10 @@ void gabble_caps_channel_manager_update_capabilities (
   GabbleCapsChannelManagerUpdateCapsFunc method = iface->update_caps;
 
   /* cannot be called if not implemented */
-  g_assert (method != NULL);
-  method (caps_manager, specific_caps_out, specific_caps_in);
+  if (method != NULL)
+    method (caps_manager, specific_caps_out, specific_caps_in);
+  else
+    DEBUG (":'( No caps update function");
 }
 
 gboolean gabble_caps_channel_manager_capabilities_diff (
-- 
1.5.6.5



More information about the telepathy-commits mailing list