diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mcd-account-manager-default.c | 5 | ||||
| -rw-r--r-- | src/mcd-connection.c | 5 | ||||
| -rw-r--r-- | src/mcd-debug.c | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/mcd-account-manager-default.c b/src/mcd-account-manager-default.c index 7cfdd2aa..9e811045 100644 --- a/src/mcd-account-manager-default.c +++ b/src/mcd-account-manager-default.c @@ -418,7 +418,10 @@ _set (const McpAccountStorage *self, g_key_file_remove_key (amd->removed, account, key, NULL); #else - g_key_file_set_value (amd->keyfile, account, key, val); + if (val != NULL) + g_key_file_set_value (amd->keyfile, account, key, val); + else + g_key_file_remove_key (amd->keyfile, account, key, NULL); #endif diff --git a/src/mcd-connection.c b/src/mcd-connection.c index 9c50dce9..3aaf37cc 100644 --- a/src/mcd-connection.c +++ b/src/mcd-connection.c @@ -2854,7 +2854,10 @@ _mcd_connection_presence_info_is_ready (McdConnection *self) static void clear_emergency_handles (McdConnectionPrivate *priv) { - guint n_handles = tp_intset_size (priv->emergency.handles); + guint n_handles = 0; + + if (priv->emergency.handles != NULL) + n_handles = tp_intset_size (priv->emergency.handles); /* trawl through the handles and unref them */ if (n_handles > 0) diff --git a/src/mcd-debug.c b/src/mcd-debug.c index 2ad57790..350299bc 100644 --- a/src/mcd-debug.c +++ b/src/mcd-debug.c @@ -161,6 +161,7 @@ void mcd_debug_init () } mcp_set_debug ((mcd_debug_level >= 1)); + mcp_debug_init (); tp_debug_divert_messages (g_getenv ("MC_LOGFILE")); |