aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/component/addressbook-config.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 06ee86f527..d8f4ad2c3e 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,10 @@
2001-05-11 Chris Toshok <toshok@ximian.com>
+ * gui/component/addressbook-config.c (addressbook_source_dialog):
+ correct bug causing the Ok button to never be enabled.
+
+2001-05-11 Chris Toshok <toshok@ximian.com>
+
* gui/component/addressbook-component.c (populate_context_menu):
example.
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 9af3b2fa61..08fff54cb6 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -650,8 +650,8 @@ addressbook_source_dialog (AddressbookSource *source, GtkWidget *parent)
GtkWidget *vbox, *dialog_vbox;
#ifdef INCLUDE_FILE_SOURCE
GtkWidget *menu;
- AddressbookSourcePageItem *first_item = NULL;
#endif
+ AddressbookSourcePageItem *first_item = NULL;
GtkWidget *area;
int i;
int row = 0;
@@ -712,10 +712,10 @@ addressbook_source_dialog (AddressbookSource *source, GtkWidget *parent)
#ifdef INCLUDE_FILE_SOURCE
item->item = gtk_menu_item_new_with_label (addressbook_config_source_label (i));
+#endif
if (!first_item)
first_item = item;
-#endif
gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook),
item->vbox, NULL);
@@ -732,7 +732,9 @@ addressbook_source_dialog (AddressbookSource *source, GtkWidget *parent)
#ifdef INCLUDE_FILE_SOURCE
gtk_option_menu_set_menu (GTK_OPTION_MENU (dialog->source_option), menu);
+#endif
source_type_menuitem_activate (first_item->item, first_item);
+#ifdef INCLUDE_FILE_SOURCE
gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->source_option), 0);
#endif