From 057159903dc48bfd304bd8e157c446122c880a0d Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 19 Oct 2009 12:06:17 +0100 Subject: empathy_account_settings_get_tp_params: don't raise an error if tp_protocol is NULL --- libempathy/empathy-account-settings.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'libempathy/empathy-account-settings.c') diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index ea5a1e618..ec349ee92 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -31,6 +31,9 @@ #include "empathy-connection-managers.h" #include "empathy-utils.h" +#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT +#include + #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountSettings) G_DEFINE_TYPE(EmpathyAccountSettings, empathy_account_settings, G_TYPE_OBJECT) @@ -453,7 +456,12 @@ empathy_account_settings_get_tp_params (EmpathyAccountSettings *settings) tp_protocol = tp_connection_manager_get_protocol (priv->manager, priv->protocol); - g_return_val_if_fail (tp_protocol != NULL, NULL); + if (tp_protocol == NULL) + { + DEBUG ("Can't retrieve TpConnectionManagerProtocol for protocol '%s'", + priv->protocol); + return NULL; + } return tp_protocol->params; } -- cgit v1.2.3