aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog9
-rw-r--r--addressbook/gui/component/select-names/e-select-names.c7
-rw-r--r--addressbook/gui/component/select-names/select-names.glade2
3 files changed, 15 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 94cde4eefb..bd18a4b5e7 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,14 @@
2001-06-29 Christopher James Lahey <clahey@ximian.com>
+ * gui/component/select-names/e-select-names.c
+ (e_select_names_option_activated): Change the uri here to have
+ addressbook.db at the end.
+
+ * gui/component/select-names/select-names.glade: Changed the name
+ of the folder option menu here to match the name used in the code.
+
+2001-06-29 Christopher James Lahey <clahey@ximian.com>
+
* gui/component/select-names/e-select-names.c (update_query):
Change the query when the "Update List" button is pushed.
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index 56f5cd0817..7d36676bcd 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -127,6 +127,7 @@ set_book(EBook *book, EBookStatus status, EAddressbookModel *model)
"book", book,
NULL);
gtk_object_unref(GTK_OBJECT(book));
+ gtk_object_unref(GTK_OBJECT(model));
}
static void
@@ -135,7 +136,6 @@ addressbook_model_set_uri(EAddressbookModel *model, char *uri)
EBook *book;
book = e_book_new();
gtk_object_ref(GTK_OBJECT(model));
- gtk_object_ref(GTK_OBJECT(book));
e_book_load_uri(book, uri, (EBookCallback) set_book, model);
}
@@ -230,8 +230,11 @@ static void
e_select_names_option_activated(GtkWidget *widget, ESelectNames *e_select_names)
{
ESelectNamesFolder *e_folder = gtk_object_get_data (GTK_OBJECT (widget), "EsnChoiceFolder");
+ gchar *uri;
- addressbook_model_set_uri(e_select_names->model, e_folder->physical_uri);
+ uri = g_strdup_printf ("%s/addressbook.db", e_folder->physical_uri);
+ addressbook_model_set_uri(e_select_names->model, uri);
+ g_free (uri);
}
typedef struct {
diff --git a/addressbook/gui/component/select-names/select-names.glade b/addressbook/gui/component/select-names/select-names.glade
index 6f36bb4f67..46804fc334 100644
--- a/addressbook/gui/component/select-names/select-names.glade
+++ b/addressbook/gui/component/select-names/select-names.glade
@@ -242,7 +242,7 @@
<widget>
<class>GtkOptionMenu</class>
- <name>optionmenu1</name>
+ <name>optionmenu-folder</name>
<can_focus>True</can_focus>
<items></items>
<initial_choice>0</initial_choice>