aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/component/select-names/e-select-names.c9
2 files changed, 16 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 52e264864d..4cc68a114f 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-12 Jon Trowbridge <trow@ximian.com>
+
+ * gui/component/select-names/e-select-names.c
+ (addressbook_model_set_uri): Check to see if the uri we are
+ setting is the same as the current uri. If so, do nothing.
+ (Bug #11324)
+
2001-10-11 Jon Trowbridge <trow@ximian.com>
* backend/ebook/e-destination.c
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index 0befe02ffc..e915b20edf 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -139,6 +139,15 @@ static void
addressbook_model_set_uri(EAddressbookModel *model, char *uri)
{
EBook *book;
+
+ /* If uri == the current uri, then we don't have to do anything */
+ book = e_addressbook_model_get_ebook (model);
+ if (book) {
+ const gchar *current_uri = e_book_get_uri (book);
+ if (uri && current_uri && !strcmp (uri, current_uri))
+ return;
+ }
+
book = e_book_new();
gtk_object_ref(GTK_OBJECT(model));
addressbook_load_uri(book, uri, (EBookCallback) set_book, model);