diff options
| -rw-r--r-- | data/empathy.schemas.in | 17 | ||||
| -rw-r--r-- | src/empathy-import-mc4-accounts.c | 15 |
2 files changed, 15 insertions, 17 deletions
diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in index 7c0f8af20..3c752ad12 100644 --- a/data/empathy.schemas.in +++ b/data/empathy.schemas.in @@ -479,25 +479,22 @@ </schema> <schema> - <key>/schemas/apps/empathy/use_conn</key> - <applyto>/apps/empathy/use_conn</applyto> - <key>/schemas/apps/empathy/accounts/import_mc4_accounts</key> - <applyto>/apps/empathy/accounts/import_mc4_accounts</applyto> + <key>/schemas/apps/empathy/accounts/imported_mc4_accounts</key> + <applyto>/apps/empathy/accounts/imported_mc4_accounts</applyto> <owner>empathy</owner> <type>bool</type> - <default>true</default> + <default>false</default> <locale name="C"> - <short>MC 4 accounts have to be imported</short> + <short>MC 4 accounts were imported</short> <long> - MC 4 accounts have to be importedd on the first - Empathy run. + MC 4 accounts were to be imported. </long> </locale> </schema> <schema> - <key>/schemas/apps/empathy/use_nm</key> - <applyto>/apps/empathy/use_nm</applyto> + <key>/schemas/apps/empathy/use_conn</key> + <applyto>/apps/empathy/use_conn</applyto> <owner>empathy</owner> <type>bool</type> <default>true</default> diff --git a/src/empathy-import-mc4-accounts.c b/src/empathy-import-mc4-accounts.c index 86e2b1a3b..4ce8d4e80 100644 --- a/src/empathy-import-mc4-accounts.c +++ b/src/empathy-import-mc4-accounts.c @@ -32,7 +32,7 @@ #include <libempathy/empathy-debug.h> #define MC_ACCOUNTS_GCONF_BASE "/apps/telepathy/mc/accounts" -#define IMPORT_MC4_ACCOUNTS "/apps/empathy/accounts/import_mc4_accounts" +#define IMPORTED_MC4_ACCOUNTS "/apps/empathy/accounts/imported_mc4_accounts" typedef struct { @@ -436,12 +436,12 @@ void empathy_import_mc4_accounts (void) GConfClient *client; GError *error = NULL; GSList *dir, *dirs, *entries; - gboolean import_mc4_accounts; + gboolean imported_mc4_accounts; client = gconf_client_get_default (); - import_mc4_accounts = gconf_client_get_bool (client, - IMPORT_MC4_ACCOUNTS, &error); + imported_mc4_accounts = gconf_client_get_bool (client, + IMPORTED_MC4_ACCOUNTS, &error); if (error != NULL) { @@ -451,8 +451,9 @@ void empathy_import_mc4_accounts (void) return; } - if (!import_mc4_accounts) + if (imported_mc4_accounts) { + DEBUG ("Mc4 accounts already imported"); g_object_unref (client); return; } @@ -541,7 +542,7 @@ void empathy_import_mc4_accounts (void) } gconf_client_set_bool (client, - IMPORT_MC4_ACCOUNTS, FALSE, &error); + IMPORTED_MC4_ACCOUNTS, TRUE, &error); if (error != NULL) { @@ -551,4 +552,4 @@ void empathy_import_mc4_accounts (void) g_slist_free (dirs); g_object_unref (client); -}
\ No newline at end of file +} |