force the info label to update its contents here if the load was

2004-04-14  Chris Toshok  <toshok@ximian.com>

	* gui/component/addressbook-view.c (book_open_cb): force the info
	label to update its contents here if the load was successful.

	* gui/component/addressbook-migrate.c (migration_context_new): use
	e_book_get_addressbooks instead of getting source_list from the
	component.
	(migration_context_free): unref the source_list.

	* gui/component/addressbook-config.c (dialog_to_source): sync the
	dialog->source_list, since we have it.

svn path=/trunk/; revision=25472

4 files changed, 21 insertions, 3 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index a6183e26c5..98e3f53173 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,18 @@
 2004-04-14  Chris Toshok  <toshok@ximian.com>
 
+	* gui/component/addressbook-view.c (book_open_cb): force the info
+	label to update its contents here if the load was successful.
+
+	* gui/component/addressbook-migrate.c (migration_context_new): use
+	e_book_get_addressbooks instead of getting source_list from the
+	component.
+	(migration_context_free): unref the source_list.
+
+	* gui/component/addressbook-config.c (dialog_to_source): sync the
+	dialog->source_list, since we have it.
+
+2004-04-14  Chris Toshok  <toshok@ximian.com>
+
 	* gui/component/addressbook.c: rip out tons of functions - they
 	all live in addressbook-view.c now.  the only thing left in this
 	file is the addressbook_load* calls that do authentication.
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index ec4a4cb820..ee68884e1e 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -271,8 +271,7 @@ dialog_to_source (AddressbookSourceDialog *dialog, ESource *source, gboolean tem
 		if (!e_source_peek_group (source))
 			e_source_group_add_source (dialog->source_group, source, -1);
 
-		e_source_list_sync (addressbook_component_peek_source_list (
-			addressbook_component_peek ()), NULL);
+		e_source_list_sync (dialog->source_list, NULL);
 	}
 }
 
diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c
index 808342922a..79f54bb66d 100644
--- a/addressbook/gui/component/addressbook-migrate.c
+++ b/addressbook/gui/component/addressbook-migrate.c
@@ -814,7 +814,7 @@ migration_context_new (AddressbookComponent *component)
 	/* set up the mapping from old uris to new uids */
 	context->folder_uid_map = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)g_free);
 
-	context->source_list = addressbook_component_peek_source_list (component);
+	e_book_get_addressbooks (&context->source_list, NULL);
 
 	context->component = component;
 
@@ -827,6 +827,9 @@ migration_context_free (MigrationContext *context)
 	e_source_list_sync (context->source_list, NULL);
 
 	g_hash_table_destroy (context->folder_uid_map);
+
+	g_object_unref (context->source_list);
+
 	g_free (context);
 }
 
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index d25cbe68c6..5cc4e77295 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -1120,6 +1120,9 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure)
 		g_object_set(view,
 			     "book", book,
 			     NULL);
+
+		if (view->model)
+			eab_model_force_folder_bar_message (view->model);
 	}
 	else {
 		eab_load_error_dialog (NULL /* XXX */, source, status);