aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2004-02-25 05:48:50 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-02-25 05:48:50 +0800
commit3b0f3efe44bf506fdc788e8dab56ec1b685bf013 (patch)
tree49533ed4c7f32874323ecdc7d0457365e775cf4f
parent2d5d15a0f30b9c9c68f12c28365045cbf5a2a3a9 (diff)
downloadgsoc2013-evolution-3b0f3efe44bf506fdc788e8dab56ec1b685bf013.tar
gsoc2013-evolution-3b0f3efe44bf506fdc788e8dab56ec1b685bf013.tar.gz
gsoc2013-evolution-3b0f3efe44bf506fdc788e8dab56ec1b685bf013.tar.bz2
gsoc2013-evolution-3b0f3efe44bf506fdc788e8dab56ec1b685bf013.tar.lz
gsoc2013-evolution-3b0f3efe44bf506fdc788e8dab56ec1b685bf013.tar.xz
gsoc2013-evolution-3b0f3efe44bf506fdc788e8dab56ec1b685bf013.tar.zst
gsoc2013-evolution-3b0f3efe44bf506fdc788e8dab56ec1b685bf013.zip
don't init the dialog here (addressbook_migrate): init it here
2004-02-24 JP Rosevear <jpr@ximian.com> * gui/component/addressbook-migrate.c (migration_context_new): don't init the dialog here (addressbook_migrate): init it here svn path=/trunk/; revision=24853
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/component/addressbook-migrate.c5
2 files changed, 8 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 5289f2e667..fd51a8d0fc 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,10 @@
-2004-02-20 Chris Toshok <toshok@ximian.com>
+2004-02-24 JP Rosevear <jpr@ximian.com>
+
+ * gui/component/addressbook-migrate.c (migration_context_new):
+ don't init the dialog here
+ (addressbook_migrate): init it here
+2004-02-20 Chris Toshok <toshok@ximian.com>
* gui/contact-editor/e-contact-editor.c (phone_entry_changed):
remove some spew.
diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c
index 4076e04de0..1878b6504b 100644
--- a/addressbook/gui/component/addressbook-migrate.c
+++ b/addressbook/gui/component/addressbook-migrate.c
@@ -745,9 +745,6 @@ migration_context_new (AddressbookComponent *component)
context->source_list = addressbook_component_peek_source_list (component);
- /* initialize our dialog */
- setup_progress_dialog (context);
-
context->component = component;
return context;
@@ -786,6 +783,8 @@ addressbook_migrate (AddressbookComponent *component, int major, int minor, int
||
/* we're 0.x */
(major == 0)) {
+ /* initialize our dialog */
+ setup_progress_dialog (context);
if (on_this_computer) {
migrate_local_folders (context, on_this_computer, personal_source);