From 732fcfec9d8288b3ad36cc42c095bfc9ec43f7ec Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 8 Apr 2003 15:31:53 +0000 Subject: Remove color specifications from the druid so it will use theme colors. * gui/component/ldap-config.glade: Remove color specifications from the druid so it will use theme colors. * gui/component/addressbook-config.c (addressbook_add_server_druid): Use g_signal_connect_after for "prepare" signal (to work around b.g.o 81869) svn path=/trunk/; revision=20756 --- addressbook/ChangeLog | 9 +++++++++ addressbook/gui/component/addressbook-config.c | 16 ++++++++-------- addressbook/gui/component/ldap-config.glade | 22 ---------------------- 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 8f48b7135e..528df7db6a 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,12 @@ +2003-04-08 Dan Winship + + * gui/component/ldap-config.glade: Remove color specifications + from the druid so it will use theme colors. + + * gui/component/addressbook-config.c + (addressbook_add_server_druid): Use g_signal_connect_after for + "prepare" signal (to work around b.g.o 81869) + 2003-04-07 Chris Toshok [ fixes #7103 ] diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 8d0e7b1be5..e2855ac7f4 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -1066,30 +1066,30 @@ addressbook_add_server_druid (AddressbookDialog *dialog) page = glade_xml_get_widget (sdialog->gui, "add-server-druid-info-page"); reparent_to_vbox (sdialog, "account-druid-general-vbox", "general-tab"); setup_general_tab (sdialog, druid_info_page_modify_cb); - g_signal_connect (page, "prepare", - G_CALLBACK(druid_info_page_prepare), sdialog); + g_signal_connect_after (page, "prepare", + G_CALLBACK(druid_info_page_prepare), sdialog); /* connecting page */ page = glade_xml_get_widget (sdialog->gui, "add-server-druid-connecting-page"); reparent_to_vbox (sdialog, "account-druid-connecting-vbox", "connecting-tab"); setup_connecting_tab (sdialog, druid_connecting_page_modify_cb); - g_signal_connect (page, "prepare", - G_CALLBACK(druid_connecting_page_prepare), sdialog); + g_signal_connect_after (page, "prepare", + G_CALLBACK(druid_connecting_page_prepare), sdialog); /* searching page */ page = glade_xml_get_widget (sdialog->gui, "add-server-druid-searching-page"); reparent_to_vbox (sdialog, "account-druid-searching-vbox", "searching-tab"); setup_searching_tab (sdialog, NULL); - g_signal_connect (page, "prepare", - G_CALLBACK(druid_searching_page_prepare), sdialog); + g_signal_connect_after (page, "prepare", + G_CALLBACK(druid_searching_page_prepare), sdialog); /* display name page */ page = glade_xml_get_widget (sdialog->gui, "add-server-druid-display-name-page"); sdialog->display_name = glade_xml_get_widget (sdialog->gui, "druid-display-name-entry"); g_signal_connect (sdialog->display_name, "changed", G_CALLBACK(druid_display_name_page_modify_cb), sdialog); - g_signal_connect (page, "prepare", - G_CALLBACK(display_name_page_prepare), sdialog); + g_signal_connect_after (page, "prepare", + G_CALLBACK(display_name_page_prepare), sdialog); page = glade_xml_get_widget (sdialog->gui, "add-server-druid-finish-page"); g_signal_connect (page, "finish", diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade index 57938c3e59..d741aca697 100644 --- a/addressbook/gui/component/ldap-config.glade +++ b/addressbook/gui/component/ldap-config.glade @@ -300,11 +300,6 @@ using LDAP (Lightweight Directory Access Protocol) servers. Adding a new LDAP server requires some specialized information about the server. Please contact your system administrator if you need help finding this information. - #ffffffffffff - #000000000000 - #000000000000 - #000000000000 - #ffffffffffff @@ -312,9 +307,6 @@ need help finding this information. True Step 1: Server Information - #e6e0bfffe498 - #3c280811e498 - #2758081dc8cc @@ -378,9 +370,6 @@ information. Please ask your system administrator if you are unsure of this info True Step 2: Connecting to Server - #e6e0bfffe498 - #3c280811e498 - #2758081dc8cc @@ -445,9 +434,6 @@ your connection. Ask your system administrator if your LDAP server uses these pr True Step 3: Searching the Directory - #e6e0bfffe498 - #3c280811e498 - #2758081dc8cc @@ -512,9 +498,6 @@ need to change these options. True Step 4: Display Name - #e6e0bfffe498 - #3c280811e498 - #2758081dc8cc @@ -743,11 +726,6 @@ searches, and for creating and editing contacts. are now ready to access this directory. Please click the "Finish" button to save the settings you have entered here. - #ffffffffffff - #000000000000 - #000000000000 - #000000000000 - #ffffffffffff -- cgit v1.2.3