diff options
author | Jonny Lamb <jonnylamb@gnome.org> | 2009-10-17 06:01:25 +0800 |
---|---|---|
committer | Jonny Lamb <jonnylamb@gnome.org> | 2009-10-17 06:01:25 +0800 |
commit | 2dc1a0df073d06fce26efd748ea3619339d90aa5 (patch) | |
tree | ead628ee3cba64665c260b1e2d5a9d2e6004d4a7 | |
parent | c0110e0dcaa72035bae2d7d3aff6d4609efb3df8 (diff) | |
parent | 2d2dee09f6f816b1c7669baad8162b06ba2b1dcb (diff) | |
download | gsoc2013-empathy-2dc1a0df073d06fce26efd748ea3619339d90aa5.tar gsoc2013-empathy-2dc1a0df073d06fce26efd748ea3619339d90aa5.tar.gz gsoc2013-empathy-2dc1a0df073d06fce26efd748ea3619339d90aa5.tar.bz2 gsoc2013-empathy-2dc1a0df073d06fce26efd748ea3619339d90aa5.tar.lz gsoc2013-empathy-2dc1a0df073d06fce26efd748ea3619339d90aa5.tar.xz gsoc2013-empathy-2dc1a0df073d06fce26efd748ea3619339d90aa5.tar.zst gsoc2013-empathy-2dc1a0df073d06fce26efd748ea3619339d90aa5.zip |
Merge branch 'trrrrrrrrrrrrrivia'
-rw-r--r-- | libempathy/empathy-connectivity.c | 4 | ||||
-rw-r--r-- | src/empathy-import-mc4-accounts.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c index c6551ae5c..f6a723ef6 100644 --- a/libempathy/empathy-connectivity.c +++ b/libempathy/empathy-connectivity.c @@ -105,8 +105,8 @@ connectivity_nm_state_change_cb (NMClient *client, new_nm_connected = !(state == NM_STATE_CONNECTING || state == NM_STATE_DISCONNECTED); - DEBUG ("New NetworkManager network state %d (connected: %d", state, - new_nm_connected); + DEBUG ("New NetworkManager network state %d (connected: %s)", state, + new_nm_connected ? "true" : "false"); connectivity_change_state (connectivity, new_nm_connected); } diff --git a/src/empathy-import-mc4-accounts.c b/src/empathy-import-mc4-accounts.c index 17b712832..efbb6f060 100644 --- a/src/empathy-import-mc4-accounts.c +++ b/src/empathy-import-mc4-accounts.c @@ -227,7 +227,7 @@ _create_account_cb (GObject *source, goto out; } - DEBUG ("account created\n"); + DEBUG ("account created"); account = empathy_account_settings_get_account ( EMPATHY_ACCOUNT_SETTINGS (source)); @@ -248,7 +248,7 @@ _get_protocol_from_profile (const gchar *profile) { gint i; - DEBUG ("profile: %s\n", profile); + DEBUG ("profile: %s", profile); for (i = 0; i < G_N_ELEMENTS (profile_protocol_map); i++) if (!tp_strdiff (profile, profile_protocol_map[i].profile)) @@ -394,7 +394,7 @@ import_one_account (const char *path, if (profile == NULL) { - DEBUG ("Account is missing a profile entry\n"); + DEBUG ("Account is missing a profile entry"); goto failed; } @@ -424,7 +424,7 @@ import_one_account (const char *path, if (entries == NULL) { - DEBUG ("Failed to get all entries: %s\n", error->message); + DEBUG ("Failed to get all entries: %s", error->message); g_error_free (error); goto failed; } @@ -491,7 +491,7 @@ empathy_import_mc4_accounts (EmpathyConnectionManagers *managers) if (error != NULL) { - DEBUG ("Failed to get import_mc4_accounts key: %s\n", error->message); + DEBUG ("Failed to get import_mc4_accounts key: %s", error->message); g_error_free (error); goto out; } @@ -502,13 +502,13 @@ empathy_import_mc4_accounts (EmpathyConnectionManagers *managers) goto out; } - DEBUG ("MC 4 accounts are going to be imported\n"); + DEBUG ("MC 4 accounts are going to be imported"); dirs = gconf_client_all_dirs (client, MC_ACCOUNTS_GCONF_BASE, &error); if (error != NULL) { - DEBUG ("Failed to get MC4 account dirs: %s\n", + DEBUG ("Failed to get MC4 account dirs: %s", error->message); g_clear_error (&error); g_object_unref (client); |