mirror of
https://gitlab.gnome.org/GNOME/calls.git
synced 2025-01-07 12:25:31 +00:00
sip: do not auto load accounts when running tests
because `calls_sip_provider_load_accounts ()` looks at the home folder for a configuration file.
This commit is contained in:
parent
19e7f8f119
commit
840ffa4653
1 changed files with 20 additions and 2 deletions
|
@ -63,12 +63,23 @@ static GParamSpec *props[PROP_LAST_PROP];
|
||||||
|
|
||||||
static void calls_sip_provider_message_source_interface_init (CallsMessageSourceInterface *iface);
|
static void calls_sip_provider_message_source_interface_init (CallsMessageSourceInterface *iface);
|
||||||
|
|
||||||
|
#ifdef FOR_TESTING
|
||||||
|
|
||||||
|
G_DEFINE_TYPE_WITH_CODE
|
||||||
|
(CallsSipProvider, calls_sip_provider, CALLS_TYPE_PROVIDER,
|
||||||
|
G_IMPLEMENT_INTERFACE (CALLS_TYPE_MESSAGE_SOURCE,
|
||||||
|
calls_sip_provider_message_source_interface_init))
|
||||||
|
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
G_DEFINE_DYNAMIC_TYPE_EXTENDED
|
G_DEFINE_DYNAMIC_TYPE_EXTENDED
|
||||||
(CallsSipProvider, calls_sip_provider, CALLS_TYPE_PROVIDER, 0,
|
(CallsSipProvider, calls_sip_provider, CALLS_TYPE_PROVIDER, 0,
|
||||||
G_IMPLEMENT_INTERFACE_DYNAMIC (CALLS_TYPE_MESSAGE_SOURCE,
|
G_IMPLEMENT_INTERFACE_DYNAMIC (CALLS_TYPE_MESSAGE_SOURCE,
|
||||||
calls_sip_provider_message_source_interface_init));
|
calls_sip_provider_message_source_interface_init));
|
||||||
|
|
||||||
|
#endif /* FOR_TESTING */
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
check_required_keys (GKeyFile *key_file,
|
check_required_keys (GKeyFile *key_file,
|
||||||
const gchar *group_name)
|
const gchar *group_name)
|
||||||
|
@ -304,9 +315,16 @@ calls_sip_provider_constructed (GObject *object)
|
||||||
{
|
{
|
||||||
CallsSipProvider *self = CALLS_SIP_PROVIDER (object);
|
CallsSipProvider *self = CALLS_SIP_PROVIDER (object);
|
||||||
g_autoptr (GError) error = NULL;
|
g_autoptr (GError) error = NULL;
|
||||||
|
gboolean auto_load_accounts = TRUE;
|
||||||
|
|
||||||
if (calls_sip_provider_init_sofia (self, &error))
|
#ifdef FOR_TESTING
|
||||||
calls_sip_provider_load_accounts (self);
|
auto_load_accounts = FALSE;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (calls_sip_provider_init_sofia (self, &error)) {
|
||||||
|
if (auto_load_accounts)
|
||||||
|
calls_sip_provider_load_accounts (self);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
g_warning ("Could not initalize sofia stack: %s", error->message);
|
g_warning ("Could not initalize sofia stack: %s", error->message);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue