aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-account-settings.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-10-19 19:06:17 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-10-19 19:10:16 +0800
commit057159903dc48bfd304bd8e157c446122c880a0d (patch)
treeae4faf9decb40800f374d32839dee06438d1caee /libempathy/empathy-account-settings.c
parent98241a08a60d0741e6d00f52775ccad85d6693c3 (diff)
downloadgsoc2013-empathy-057159903dc48bfd304bd8e157c446122c880a0d.tar
gsoc2013-empathy-057159903dc48bfd304bd8e157c446122c880a0d.tar.gz
gsoc2013-empathy-057159903dc48bfd304bd8e157c446122c880a0d.tar.bz2
gsoc2013-empathy-057159903dc48bfd304bd8e157c446122c880a0d.tar.lz
gsoc2013-empathy-057159903dc48bfd304bd8e157c446122c880a0d.tar.xz
gsoc2013-empathy-057159903dc48bfd304bd8e157c446122c880a0d.tar.zst
gsoc2013-empathy-057159903dc48bfd304bd8e157c446122c880a0d.zip
empathy_account_settings_get_tp_params: don't raise an error if tp_protocol is NULL
Diffstat (limited to 'libempathy/empathy-account-settings.c')
-rw-r--r--libempathy/empathy-account-settings.c10
1 files changed, 9 insertions, 1 deletions
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 <libempathy/empathy-debug.h>
+
#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;
}