diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-08-16 23:25:56 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-09-14 20:09:00 +0800 |
| commit | 777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1 (patch) | |
| tree | dfab9ca8f30c7b1539f86dfe19b8bf761d6a899c /shell/e-shell-migrate.c | |
| parent | 83675abbc2b3a3bc6421094a56651d021fc0cdcd (diff) | |
| download | gsoc2013-evolution-777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1.tar gsoc2013-evolution-777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1.tar.gz gsoc2013-evolution-777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1.tar.bz2 gsoc2013-evolution-777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1.tar.lz gsoc2013-evolution-777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1.tar.xz gsoc2013-evolution-777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1.tar.zst gsoc2013-evolution-777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1.zip | |
Coding style and whitespace cleanup.
Diffstat (limited to 'shell/e-shell-migrate.c')
| -rw-r--r-- | shell/e-shell-migrate.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index f5e1174729..89f94b0f83 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.c @@ -798,7 +798,8 @@ fix_folder_permissions (const gchar *data_dir) } static void -merge_duplicate_local_sources (GConfClient *client, const gchar *gconf_key) +merge_duplicate_local_sources (GConfClient *client, + const gchar *gconf_key) { ESourceList *source_list; GSList *iter, *to_remove = NULL; @@ -933,12 +934,12 @@ e_shell_migrate_attempt (EShell *shell) fix_folder_permissions (e_get_user_data_dir ()); /* Attempt to run migration all the time and let the backend - make the choice */ + * make the choice */ if (!shell_migrate_attempt (shell, major, minor, micro)) _exit (EXIT_SUCCESS); /* The 2.32.x (except of 2.32.2) lefts duplicate On This Computer/Personal sources, - thus clean the mess up */ + * thus clean the mess up */ merge_duplicate_local_sources (client, "/apps/evolution/addressbook/sources"); merge_duplicate_local_sources (client, "/apps/evolution/calendar/sources"); merge_duplicate_local_sources (client, "/apps/evolution/tasks/sources"); |