aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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);