Merge branch 'master' into kill-bonobo

This was a particularly messy merge.  Watch out for regressions!

Conflicts:
	ChangeLog
	NEWS
	a11y/ChangeLog
	a11y/widgets/ea-combo-button.c
	a11y/widgets/ea-combo-button.h
	a11y/widgets/ea-widgets.c
	addressbook/ChangeLog
	addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
	addressbook/gui/component/addressbook-component.c
	addressbook/gui/component/addressbook-component.h
	addressbook/gui/component/addressbook-config.c
	addressbook/gui/component/addressbook-migrate.h
	addressbook/gui/component/addressbook-view.c
	addressbook/gui/component/addressbook-view.h
	addressbook/gui/component/addressbook.h
	addressbook/gui/component/autocompletion-config.c
	addressbook/gui/component/autocompletion-config.h
	addressbook/gui/component/component-factory.c
	addressbook/gui/component/e-book-shell-module-migrate.c
	addressbook/gui/component/ldap-config.glade
	addressbook/gui/contact-editor/Makefile.am
	addressbook/gui/contact-editor/contact-editor.glade
	addressbook/gui/contact-editor/e-contact-editor-address.c
	addressbook/gui/contact-editor/e-contact-editor-address.h
	addressbook/gui/contact-editor/e-contact-editor-im.c
	addressbook/gui/contact-editor/e-contact-editor-im.h
	addressbook/gui/contact-editor/e-contact-editor.c
	addressbook/gui/contact-editor/e-contact-editor.h
	addressbook/gui/contact-editor/eab-editor.c
	addressbook/gui/contact-editor/eab-editor.h
	addressbook/gui/contact-editor/test-editor.c
	addressbook/gui/contact-list-editor/Makefile.am
	addressbook/gui/widgets/Makefile.am
	addressbook/gui/widgets/e-addressbook-model.c
	addressbook/gui/widgets/e-addressbook-model.h
	addressbook/gui/widgets/e-addressbook-reflow-adapter.c
	addressbook/gui/widgets/e-addressbook-view.c
	addressbook/gui/widgets/e-addressbook-view.h
	addressbook/gui/widgets/e-minicard-view.c
	addressbook/gui/widgets/eab-contact-display.c
	addressbook/gui/widgets/eab-gui-util.c
	addressbook/gui/widgets/eab-menu.c
	addressbook/gui/widgets/eab-menu.h
	addressbook/gui/widgets/eab-popup-control.c
	addressbook/gui/widgets/eab-popup-control.h
	addressbook/gui/widgets/eab-popup.c
	addressbook/gui/widgets/eab-popup.h
	addressbook/gui/widgets/eab-vcard-control.c
	addressbook/gui/widgets/eab-vcard-control.h
	addressbook/gui/widgets/gal-view-minicard.c
	addressbook/gui/widgets/gal-view-minicard.h
	addressbook/printing/e-contact-print-style-editor.c
	addressbook/printing/e-contact-print-style-editor.h
	addressbook/printing/e-contact-print.glade
	addressbook/printing/test-contact-print-style-editor.c
	addressbook/tools/evolution-addressbook-export.c
	addressbook/util/Makefile.am
	calendar/ChangeLog
	calendar/gui/Makefile.am
	calendar/gui/apps_evolution_calendar.schemas.in
	calendar/gui/calendar-component.c
	calendar/gui/calendar-component.h
	calendar/gui/calendar-config.c
	calendar/gui/comp-editor-factory.c
	calendar/gui/comp-editor-factory.h
	calendar/gui/comp-util.c
	calendar/gui/comp-util.h
	calendar/gui/control-factory.c
	calendar/gui/control-factory.h
	calendar/gui/dialogs/alarm-dialog.c
	calendar/gui/dialogs/cal-prefs-dialog.c
	calendar/gui/dialogs/cal-prefs-dialog.glade
	calendar/gui/dialogs/cal-prefs-dialog.h
	calendar/gui/dialogs/comp-editor.c
	calendar/gui/dialogs/comp-editor.h
	calendar/gui/dialogs/event-editor.c
	calendar/gui/dialogs/event-page.c
	calendar/gui/dialogs/memo-editor.c
	calendar/gui/dialogs/memo-page.c
	calendar/gui/dialogs/recurrence-page.c
	calendar/gui/dialogs/task-details-page.c
	calendar/gui/dialogs/task-details-page.glade
	calendar/gui/dialogs/task-editor.c
	calendar/gui/dialogs/task-page.c
	calendar/gui/e-cal-component-memo-preview.c
	calendar/gui/e-cal-component-memo-preview.h
	calendar/gui/e-cal-component-preview.c
	calendar/gui/e-cal-component-preview.h
	calendar/gui/e-cal-event.h
	calendar/gui/e-cal-model.c
	calendar/gui/e-cal-popup.c
	calendar/gui/e-calendar-table.c
	calendar/gui/e-calendar-view.c
	calendar/gui/e-day-view.c
	calendar/gui/e-itip-control.c
	calendar/gui/e-memo-table.c
	calendar/gui/e-memos.c
	calendar/gui/e-memos.h
	calendar/gui/e-tasks.c
	calendar/gui/e-tasks.h
	calendar/gui/e-week-view.c
	calendar/gui/gnome-cal.c
	calendar/gui/goto.c
	calendar/gui/itip-bonobo-control.c
	calendar/gui/itip-bonobo-control.h
	calendar/gui/itip-utils.c
	calendar/gui/itip-utils.h
	calendar/gui/main.c
	calendar/gui/memos-component.c
	calendar/gui/memos-control.c
	calendar/gui/memos-control.h
	calendar/gui/migration.c
	calendar/gui/migration.h
	calendar/gui/tasks-component.c
	calendar/gui/tasks-control.c
	calendar/importers/main.c
	composer/ChangeLog
	composer/e-composer-actions.c
	composer/e-composer-private.c
	composer/e-msg-composer.c
	composer/e-msg-composer.h
	composer/evolution-composer.ui
	configure.in
	doc/reference/shell/eshell-overrides.txt
	e-util/ChangeLog
	e-util/Makefile.am
	e-util/e-corba-utils.c
	e-util/e-corba-utils.h
	e-util/e-gui-utils.c
	e-util/e-gui-utils.h
	e-util/e-logger.c
	e-util/e-non-intrusive-error-dialog.c
	e-util/e-non-intrusive-error-dialog.h
	e-util/e-plugin-ui.c
	e-util/e-util-labels.c
	e-util/e-util-labels.h
	e-util/e-util.c
	e-util/e-util.h
	filter/ChangeLog
	filter/filter-option.c
	help/C/evolution.xml
	help/ChangeLog
	help/Makefile.am
	help/cs/cs.po
	help/de/de.po
	help/es/es.po
	help/eu/figures/Screenshot-Free-Busy.png
	help/eu/figures/evo_blink.png
	help/eu/figures/evo_dialog-info.png
	help/eu/figures/evo_dialog-warning.png
	help/eu/figures/evo_email_a.png
	help/eu/figures/evo_flag_follow_up_a.png
	help/eu/figures/evo_proxyadd_a.png
	help/eu/figures/evo_shd_memo_a.png
	help/eu/figures/exchange-delegation.png
	help/eu/figures/exchange-identity.png
	help/eu/figures/exchange-receive-options.png
	help/eu/figures/exchange-receive.png
	help/eu/figures/exchg-identity.png
	help/eu/figures/exchng-identity.png
	help/eu/figures/exchng-rec-mail.png
	help/eu/figures/exchng-rec-option.png
	help/eu/figures/exchng-rec-options.png
	help/eu/figures/free_busy.png
	help/eu/figures/full-1.png
	help/eu/figures/full-2.png
	help/eu/figures/full-3.png
	help/eu/figures/full-4.png
	help/eu/figures/full-5.png
	help/eu/figures/full-6.png
	help/eu/figures/full-7.png
	help/eu/figures/mail-druid-pic.png
	help/eu/figures/mail-inbox.png
	help/eu/figures/mail-threaded.png
	help/eu/figures/mainwindow-pic.png
	help/eu/figures/minus.png
	help/eu/figures/plus.png
	help/eu/figures/proxy-cal.png
	help/eu/figures/proxy-login.png
	help/eu/figures/schedule.png
	help/eu/figures/stock_search.png
	help/eu/figures/sub-others-folder.png
	help/eu/figures/sub-pub-fold.png
	help/eu/figures/vfolder-createrule-fig.png
	help/quickref/Makefile.am
	mail/ChangeLog
	mail/Makefile.am
	mail/default/Makefile.am
	mail/e-mail-shell-module-migrate.c
	mail/e-searching-tokenizer.c
	mail/em-account-editor.c
	mail/em-account-prefs.h
	mail/em-composer-prefs.c
	mail/em-composer-prefs.h
	mail/em-composer-utils.c
	mail/em-filter-folder-element.c
	mail/em-folder-browser.c
	mail/em-folder-selection-button.h
	mail/em-folder-selector.c
	mail/em-folder-tree-model.c
	mail/em-folder-tree-model.h
	mail/em-folder-tree.c
	mail/em-folder-tree.h
	mail/em-folder-utils.c
	mail/em-folder-utils.h
	mail/em-folder-view.c
	mail/em-format-html-display.c
	mail/em-format-html-print.c
	mail/em-format-html-print.h
	mail/em-format-html.c
	mail/em-format-quote.h
	mail/em-format.c
	mail/em-format.h
	mail/em-html-stream.h
	mail/em-mailer-prefs.c
	mail/em-mailer-prefs.h
	mail/em-message-browser.c
	mail/em-message-browser.h
	mail/em-migrate.h
	mail/em-network-prefs.h
	mail/em-popup.c
	mail/em-search-context.h
	mail/em-subscribe-editor.c
	mail/em-utils.c
	mail/em-utils.h
	mail/filtertypes.xml
	mail/mail-component-factory.c
	mail/mail-component.c
	mail/mail-config-factory.c
	mail/mail-config-factory.h
	mail/mail-config.c
	mail/mail-config.glade
	mail/mail-crypto.c
	mail/mail-crypto.h
	mail/mail-dialogs.glade
	mail/mail-folder-cache.c
	mail/mail-mt.c
	mail/mail-send-recv.c
	mail/mail-send-recv.h
	mail/mail-session.c
	mail/mail-session.h
	mail/mail-types.h
	mail/mail-vfolder.c
	mail/message-list.c
	mail/message-tag-followup.c
	mail/searchtypes.xml
	mail/vfoldertypes.xml
	plugins/attachment-reminder/Makefile.am
	plugins/audio-inline/org-gnome-audio-inline.eplug.xml
	plugins/caldav/ChangeLog
	plugins/caldav/caldav-source.c
	plugins/calendar-http/ChangeLog
	plugins/calendar-weather/ChangeLog
	plugins/calendar-weather/calendar-weather.c
	plugins/email-custom-header/ChangeLog
	plugins/email-custom-header/email-custom-header.c
	plugins/exchange-operations/ChangeLog
	plugins/google-account-setup/ChangeLog
	plugins/google-account-setup/Makefile.am
	plugins/google-account-setup/google-contacts-source.c
	plugins/google-account-setup/google-source.c
	plugins/import-ics-attachments/ChangeLog
	plugins/import-ics-attachments/Makefile.am
	plugins/import-ics-attachments/icsimporter.c
	plugins/itip-formatter/ChangeLog
	plugins/itip-formatter/itip-view.c
	plugins/mail-account-disable/ChangeLog
	plugins/mail-account-disable/mail-account-disable.c
	plugins/mail-notification/ChangeLog
	plugins/mail-notification/mail-notification.c
	plugins/mail-to-meeting/ChangeLog
	plugins/mail-to-task/ChangeLog
	plugins/mark-all-read/mark-all-read.c
	plugins/publish-calendar/ChangeLog
	plugins/publish-calendar/publish-format-fb.c
	plugins/publish-calendar/publish-format-ical.c
	plugins/save-attachments/ChangeLog
	plugins/save-attachments/Makefile.am
	plugins/save-attachments/save-attachments.c
	plugins/select-one-source/ChangeLog
	plugins/select-one-source/Makefile.am
	plugins/select-one-source/select-one-source.c
	plugins/startup-wizard/ChangeLog
	plugins/startup-wizard/startup-wizard.c
	plugins/webdav-account-setup/ChangeLog
	plugins/webdav-account-setup/Makefile.am
	plugins/webdav-account-setup/webdav-contacts-source.c
	po/ChangeLog
	po/POTFILES.in
	po/ar.po
	po/bg.po
	po/bn_IN.po
	po/ca.po
	po/cs.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/et.po
	po/fr.po
	po/gl.po
	po/gu.po
	po/hi.po
	po/hu.po
	po/it.po
	po/ja.po
	po/kn.po
	po/ko.po
	po/lt.po
	po/ml.po
	po/mr.po
	po/nb.po
	po/nl.po
	po/pa.po
	po/pl.po
	po/pt.po
	po/ru.po
	po/sl.po
	po/sr.po
	po/sr@latin.po
	po/sv.po
	po/ta.po
	po/te.po
	po/th.po
	po/tr.po
	po/zh_HK.po
	po/zh_TW.po
	shell/ChangeLog
	shell/Evolution-Component.idl
	shell/Makefile.am
	shell/apps_evolution_shell.schemas.in
	shell/e-component-registry.c
	shell/e-component-registry.h
	shell/e-component-view.c
	shell/e-component-view.h
	shell/e-corba-config-page.c
	shell/e-corba-config-page.h
	shell/e-shell-constants.h
	shell/e-shell-importer.c
	shell/e-shell-importer.h
	shell/e-shell-nm.c
	shell/e-shell-settings-dialog.c
	shell/e-shell-settings-dialog.h
	shell/e-shell-view.c
	shell/e-shell-view.h
	shell/e-shell-window-commands.c
	shell/e-shell-window-commands.h
	shell/e-shell-window.c
	shell/e-shell-window.h
	shell/e-shell.c
	shell/e-shell.h
	shell/e-sidebar.c
	shell/e-sidebar.h
	shell/e-user-creatable-items-handler.c
	shell/e-user-creatable-items-handler.h
	shell/es-menu.c
	shell/es-menu.h
	shell/evolution-component.c
	shell/evolution-component.h
	shell/evolution-config-control.c
	shell/evolution-config-control.h
	shell/evolution-listener.c
	shell/evolution-listener.h
	shell/evolution-shell-component-utils.c
	shell/evolution-shell-component-utils.h
	shell/importer/evolution-importer-client.c
	shell/importer/evolution-importer-client.h
	shell/importer/evolution-importer-listener.c
	shell/importer/evolution-importer-listener.h
	shell/importer/evolution-importer.c
	shell/importer/evolution-importer.h
	shell/importer/evolution-intelligent-importer.c
	shell/importer/evolution-intelligent-importer.h
	shell/importer/import.glade
	shell/importer/intelligent.c
	shell/importer/intelligent.h
	shell/main.c
	shell/shell.error.xml
	shell/test/evolution-test-component.c
	shell/test/evolution-test-component.h
	smime/ChangeLog
	smime/lib/Makefile.am
	ui/Makefile.am
	ui/evolution-addressbook.xml
	ui/evolution-calendar.xml
	widgets/ChangeLog
	widgets/menus/gal-view-menus.c
	widgets/menus/gal-view-menus.h
	widgets/misc/ChangeLog
	widgets/misc/Makefile.am
	widgets/misc/e-activity-handler.c
	widgets/misc/e-activity-handler.h
	widgets/misc/e-attachment-bar.c
	widgets/misc/e-attachment-bar.h
	widgets/misc/e-attachment.c
	widgets/misc/e-attachment.h
	widgets/misc/e-calendar-item.c
	widgets/misc/e-charset-picker.c
	widgets/misc/e-combo-button.c
	widgets/misc/e-combo-button.h
	widgets/misc/e-config-page.c
	widgets/misc/e-config-page.h
	widgets/misc/e-dropdown-button.c
	widgets/misc/e-dropdown-button.h
	widgets/misc/e-filter-bar.h
	widgets/misc/e-info-label.c
	widgets/misc/e-info-label.h
	widgets/misc/e-multi-config-dialog.c
	widgets/misc/e-multi-config-dialog.h
	widgets/misc/e-online-button.c
	widgets/misc/e-search-bar.c
	widgets/misc/e-search-bar.h
	widgets/misc/e-signature-combo-box.c
	widgets/misc/e-signature-combo-box.h
	widgets/misc/e-signature-editor.c
	widgets/misc/e-signature-editor.h
	widgets/misc/e-task-bar.c
	widgets/misc/e-task-bar.h
	widgets/misc/e-task-widget.c
	widgets/misc/e-task-widget.h
	widgets/misc/test-dropdown-button.c
	widgets/misc/test-info-label.c
	widgets/misc/test-multi-config-dialog.c
	widgets/table/ChangeLog
	widgets/table/e-cell-date.c
	widgets/table/e-table-group-container.c
	widgets/table/e-table-group-leaf.c
	widgets/table/e-table-group.c
	widgets/table/e-table-group.h
	widgets/table/e-table.c
	widgets/table/e-table.h

1 files changed, 52 insertions, 28 deletions

diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 7b94a8acea..07bc2f98d5 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -94,7 +94,6 @@ struct _AddressbookSourceDialog {
 	/* Source selection (druid only) */
 	ESourceList *source_list;
 	GSList *menu_source_groups;
-	GtkWidget *group_optionmenu;
 
 	/* ESource we're currently editing */
 	ESource *source;
@@ -106,19 +105,19 @@ struct _AddressbookSourceDialog {
 
 	/* info page fields */
 	GtkWidget *host;
-	GtkWidget *auth_optionmenu;
+	GtkWidget *auth_combobox;
 	AddressbookLDAPAuthType auth;
 	GtkWidget *auth_principal;
 
 	/* connecting page fields */
-	GtkWidget *port_combo;
-	GtkWidget *ssl_optionmenu;
+	GtkWidget *port_comboentry;
+	GtkWidget *ssl_combobox;
 	AddressbookLDAPSSLType ssl;
 
 	/* searching page fields */
 	GtkWidget *rootdn;
 	AddressbookLDAPScopeType scope;
-	GtkWidget *scope_optionmenu;
+	GtkWidget *scope_combobox;
 	GtkWidget *search_filter;
 	GtkWidget *timeout_scale;
 	GtkWidget *limit_spinbutton;
@@ -205,6 +204,21 @@ ldap_parse_ssl (const char *ssl)
 		return ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;
 }
 
+static const char *
+ldap_get_ssl_tooltip (AddressbookLDAPSSLType ssl_type)
+{
+	switch (ssl_type) {
+	case ADDRESSBOOK_LDAP_SSL_ALWAYS:
+		return _("Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL.");
+	case ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE:
+		return _("Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS.");
+	case ADDRESSBOOK_LDAP_SSL_NEVER:
+		return _("Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits.");
+	}
+
+	return NULL;
+}
+
 static gboolean
 source_to_uri_parts (ESource *source, gchar **host, gchar **rootdn, AddressbookLDAPScopeType *scope, gchar **search_filter, gint *port)
 {
@@ -664,7 +678,7 @@ url_changed(AddressbookSourceDialog *sdialog)
 	search_filter = form_ldap_search_filter (sdialog->search_filter);
 	str = g_strdup_printf ("%s:%s/%s?" /* trigraph prevention */ "?%s?%s",
 			       gtk_entry_get_text (GTK_ENTRY (sdialog->host)),
-			       gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (sdialog->port_combo)->entry)),
+			       gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (sdialog->port_comboentry)))),
 			       gtk_entry_get_text (GTK_ENTRY (sdialog->rootdn)),
 			       ldap_unparse_scope (sdialog->scope),
 			       search_filter);
@@ -686,20 +700,22 @@ port_entry_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
 
 	if (!strcmp (port, LDAPS_PORT_STRING)) {
 		sdialog->ssl = ADDRESSBOOK_LDAP_SSL_ALWAYS;
-		gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->ssl_optionmenu), sdialog->ssl);
-		gtk_widget_set_sensitive (sdialog->ssl_optionmenu, FALSE);
+		gtk_combo_box_set_active (GTK_COMBO_BOX (sdialog->ssl_combobox), sdialog->ssl);
+		gtk_widget_set_sensitive (sdialog->ssl_combobox, FALSE);
 	} else {
-		gtk_widget_set_sensitive (sdialog->ssl_optionmenu, TRUE);
+		gtk_widget_set_sensitive (sdialog->ssl_combobox, TRUE);
 	}
 
 	url_changed(sdialog);
 }
 
 static void
-ssl_optionmenu_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
+ssl_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
 {
-	sdialog->ssl = gtk_option_menu_get_history((GtkOptionMenu *)w);
+	sdialog->ssl = gtk_combo_box_get_active (GTK_COMBO_BOX (w));
 	e_source_set_property (sdialog->source, "ssl", ldap_unparse_ssl (sdialog->ssl));
+
+	gtk_widget_set_tooltip_text (sdialog->ssl_combobox, ldap_get_ssl_tooltip (sdialog->ssl));
 }
 
 
@@ -735,20 +751,24 @@ eabc_general_host(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str
 	gtk_entry_set_text((GtkEntry *)sdialog->host, lud && lud->lud_host ? lud->lud_host : "");
 	g_signal_connect (sdialog->host, "changed", G_CALLBACK (host_changed_cb), sdialog);
 
-	sdialog->port_combo = glade_xml_get_widget (gui, "port-combo");
+	sdialog->port_comboentry = glade_xml_get_widget (gui, "port-comboentry");
+	gtk_widget_set_has_tooltip (sdialog->port_comboentry, TRUE);
+	gtk_widget_set_tooltip_text (sdialog->port_comboentry, _("This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."));
 	sprintf(port, "%u", lud && lud->lud_port? lud->lud_port : LDAP_PORT);
-	gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (sdialog->port_combo)->entry), port);
-	g_signal_connect (GTK_COMBO(sdialog->port_combo)->entry, "changed", G_CALLBACK (port_entry_changed_cb), sdialog);
+	gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (sdialog->port_comboentry))), port);
+	g_signal_connect (gtk_bin_get_child (GTK_BIN (sdialog->port_comboentry)), "changed", G_CALLBACK (port_entry_changed_cb), sdialog);
 
 	if (lud)
 		ldap_free_urldesc (lud);
 
-	sdialog->ssl_optionmenu = glade_xml_get_widget (gui, "ssl-optionmenu");
+	sdialog->ssl_combobox = glade_xml_get_widget (gui, "ssl-combobox");
+	gtk_widget_set_has_tooltip (sdialog->ssl_combobox, TRUE);
 	tmp = e_source_get_property (sdialog->source, "ssl");
 	sdialog->ssl = tmp ? ldap_parse_ssl (tmp) : ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;
-	gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->ssl_optionmenu), sdialog->ssl);
-	gtk_widget_set_sensitive (sdialog->ssl_optionmenu, strcmp (port, LDAPS_PORT_STRING) != 0);
-	g_signal_connect(sdialog->ssl_optionmenu, "changed", G_CALLBACK(ssl_optionmenu_changed_cb), sdialog);
+	gtk_combo_box_set_active (GTK_COMBO_BOX (sdialog->ssl_combobox), sdialog->ssl);
+	gtk_widget_set_tooltip_text (sdialog->ssl_combobox, ldap_get_ssl_tooltip (sdialog->ssl));
+	gtk_widget_set_sensitive (sdialog->ssl_combobox, strcmp (port, LDAPS_PORT_STRING) != 0);
+	g_signal_connect (sdialog->ssl_combobox, "changed", G_CALLBACK (ssl_combobox_changed_cb), sdialog);
 
 	g_object_unref(gui);
 
@@ -779,9 +799,9 @@ auth_entry_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
 }
 
 static void
-auth_optionmenu_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
+auth_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
 {
-	sdialog->auth = gtk_option_menu_get_history((GtkOptionMenu *)w);
+	sdialog->auth = gtk_combo_box_get_active (GTK_COMBO_BOX (w));
 	e_source_set_property (sdialog->source, "auth", ldap_unparse_auth (sdialog->auth));
 
 	/* make sure the right property is set for the auth - ugh, funny api */
@@ -809,11 +829,13 @@ eabc_general_auth(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str
 	w = glade_xml_get_widget(gui, item->label);
 	gtk_box_pack_start((GtkBox *)parent, w, FALSE, FALSE, 0);
 
-	sdialog->auth_optionmenu = glade_xml_get_widget (gui, "auth-optionmenu");
+	sdialog->auth_combobox = glade_xml_get_widget (gui, "auth-combobox");
+	gtk_widget_set_has_tooltip (sdialog->auth_combobox, TRUE);
+	gtk_widget_set_tooltip_text (sdialog->auth_combobox, _("This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."));
 	tmp = e_source_get_property(sdialog->source, "auth");
 	sdialog->auth = tmp ? ldap_parse_auth(tmp) : ADDRESSBOOK_LDAP_AUTH_NONE;
-	gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->auth_optionmenu), sdialog->auth);
-	g_signal_connect(sdialog->auth_optionmenu, "changed", G_CALLBACK(auth_optionmenu_changed_cb), sdialog);
+	gtk_combo_box_set_active (GTK_COMBO_BOX (sdialog->auth_combobox), sdialog->auth);
+	g_signal_connect (sdialog->auth_combobox, "changed", G_CALLBACK(auth_combobox_changed_cb), sdialog);
 
 	sdialog->auth_principal = glade_xml_get_widget (gui, "auth-entry");
 	switch (sdialog->auth) {
@@ -849,9 +871,9 @@ search_filter_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog)
 }
 
 static void
-scope_optionmenu_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
+scope_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
 {
-	sdialog->scope = gtk_option_menu_get_history((GtkOptionMenu *)w);
+	sdialog->scope = gtk_combo_box_get_active (GTK_COMBO_BOX (w));
 	url_changed(sdialog);
 }
 
@@ -886,7 +908,9 @@ eabc_details_search(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, s
 	gtk_entry_set_text((GtkEntry *)sdialog->rootdn, lud && lud->lud_dn ? lud->lud_dn : "");
 	g_signal_connect (sdialog->rootdn, "changed", G_CALLBACK (rootdn_changed_cb), sdialog);
 
-	sdialog->scope_optionmenu = glade_xml_get_widget (gui, "scope-optionmenu");
+	sdialog->scope_combobox = glade_xml_get_widget (gui, "scope-combobox");
+	gtk_widget_set_has_tooltip (sdialog->scope_combobox, TRUE);
+	gtk_widget_set_tooltip_text (sdialog->scope_combobox, _("The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."));
 	if (lud) {
 		switch (lud->lud_scope) {
 		case LDAP_SCOPE_BASE:
@@ -901,8 +925,8 @@ eabc_details_search(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, s
 			break;
 		}
 	}
-	gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->scope_optionmenu), sdialog->scope);
-	g_signal_connect(sdialog->scope_optionmenu, "changed", G_CALLBACK(scope_optionmenu_changed_cb), sdialog);
+	gtk_combo_box_set_active (GTK_COMBO_BOX (sdialog->scope_combobox), sdialog->scope);
+	g_signal_connect (sdialog->scope_combobox, "changed", G_CALLBACK(scope_combobox_changed_cb), sdialog);
 
 	sdialog->search_filter =  glade_xml_get_widget (gui, "search-filter-entry");
 	gtk_entry_set_text((GtkEntry *)sdialog->search_filter, lud && lud->lud_filter ? lud->lud_filter : "");