aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/backend/pas/pas-book-factory.c11
-rw-r--r--addressbook/gui/component/addressbook.c22
3 files changed, 26 insertions, 15 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 4d8859e20e..8878ddfe18 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,13 @@
2000-05-10 Christopher James Lahey <clahey@helixcode.com>
+ * backend/pas/pas-book-factory.c: Send a proper response when you
+ can't find the ldap URI.
+
+ * gui/component/addressbook.c: Cleaned up the open error dialog a
+ bit.
+
+2000-05-10 Christopher James Lahey <clahey@helixcode.com>
+
* gui/component/addressbook.c: Added a dialog for when you can't
open an addressbook.
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
index cd7a8d3ed9..f4012b2adf 100644
--- a/addressbook/backend/pas/pas-book-factory.c
+++ b/addressbook/backend/pas/pas-book-factory.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
*
* Author:
@@ -354,11 +355,11 @@ impl_Evolution_BookFactory_open_book (PortableServer_Servant servant,
backend_factory = pas_book_factory_lookup_backend_factory (factory, uri);
if (backend_factory == NULL) {
- g_warning ("PASBookFactory: No backend found for uri: %s\n", uri);
-
- CORBA_exception_set (
- ev, CORBA_USER_EXCEPTION,
- ex_Evolution_BookFactory_ProtocolNotSupported, NULL);
+ Evolution_BookListener_respond_open_book (
+ listener,
+ Evolution_BookListener_ProtocolNotSupported,
+ CORBA_OBJECT_NIL,
+ &ev);
return;
}
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 35ebe03307..414c2a5688 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -442,16 +442,18 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure)
NULL);
label = gtk_label_new (
- _("We were unable to open this addressbook.\n"
- "This either means you have entered an\n"
- "incorrect URI, or have tried to access an\n"
- "LDAP server and don't have LDAP support"
- "compiled in. If you've entered a URI, check the\n"
- "the URI for correctness and reenter.\n"
- "If not, you probably have attempted to access\n"
- "an LDAP server. If you wish to be able to use\n"
- "use LDAP, you'll need to download and install\n"
+ _("We were unable to open this addressbook. This either\n"
+ "means you have entered an incorrect URI, or have tried\n"
+ "to access an LDAP server and don't have LDAP support\n"
+ "compiled in. If you've entered a URI, check the URI for\n"
+ "correctness and reenter. If not, you probably have\n"
+ "attempted to access an LDAP server. If you wish to be\n"
+ "able to use LDAP, you'll need to download and install\n"
"OpenLDAP and recompile and install evolution.\n"));
+ gtk_misc_set_alignment(GTK_MISC(label),
+ 0, .5);
+ gtk_label_set_justify(GTK_LABEL(label),
+ GTK_JUSTIFY_LEFT);
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox),
label, TRUE, TRUE, 0);
gtk_widget_show (label);
@@ -459,7 +461,7 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure)
href = gnome_href_new ("http://www.openldap.org/", "OpenLDAP at http://www.openldap.org/");
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox),
href, FALSE, FALSE, 0);
- gtk_widget_show (label);
+ gtk_widget_show (href);
gnome_dialog_run (GNOME_DIALOG (warning_dialog));