Matthew Barnes
17 years ago
parent
8ff2abe35e
commit
3bd4a1a8f5
@ -1 +1 @@
|
||||
evolution-data-server-2.23.2.tar.bz2
|
||||
evolution-data-server-2.23.3.tar.bz2
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
diff -up evolution-data-server-2.23.2/libedataserverui/e-passwords.c.gpg-passphrases evolution-data-server-2.23.2/libedataserverui/e-passwords.c
|
||||
--- evolution-data-server-2.23.2/libedataserverui/e-passwords.c.gpg-passphrases 2008-05-12 01:33:57.000000000 -0400
|
||||
+++ evolution-data-server-2.23.2/libedataserverui/e-passwords.c 2008-05-18 23:40:19.000000000 -0400
|
||||
@@ -193,19 +193,29 @@ ep_keyring_error_domain (void)
|
||||
}
|
||||
|
||||
static EUri *
|
||||
-ep_keyring_uri_new (const gchar *string)
|
||||
+ep_keyring_uri_new (const gchar *string,
|
||||
+ GError **error)
|
||||
{
|
||||
EUri *uri;
|
||||
|
||||
uri = e_uri_new (string);
|
||||
- if (uri == NULL)
|
||||
- return NULL;
|
||||
+ g_return_val_if_fail (uri != NULL, NULL);
|
||||
|
||||
/* LDAP URIs do not have usernames, so use the URI as the username. */
|
||||
if (uri->user == NULL && uri->protocol != NULL &&
|
||||
(strcmp (uri->protocol, "ldap") == 0|| strcmp (uri->protocol, "google") == 0))
|
||||
uri->user = g_strdelimit (g_strdup (string), "/=", '_');
|
||||
|
||||
+ /* Make sure the URI has the required components. */
|
||||
+ if (uri->user == NULL && uri->host == NULL) {
|
||||
+ g_set_error (
|
||||
+ error, EP_KEYRING_ERROR,
|
||||
+ GNOME_KEYRING_RESULT_BAD_ARGUMENTS,
|
||||
+ _("Keyring key is unusable: no user or host name"));
|
||||
+ e_uri_free (uri);
|
||||
+ uri = NULL;
|
||||
+ }
|
||||
+
|
||||
return uri;
|
||||
}
|
||||
|
||||
@@ -618,8 +628,9 @@ ep_remember_password_keyring (EPassMsg *
|
||||
return;
|
||||
}
|
||||
|
||||
- uri = ep_keyring_uri_new (msg->key);
|
||||
- g_return_if_fail (uri != NULL);
|
||||
+ uri = ep_keyring_uri_new (msg->key, &msg->error);
|
||||
+ if (uri == NULL)
|
||||
+ return;
|
||||
|
||||
/* Only remove the password from the session hash
|
||||
* if the keyring insertion was successful. */
|
||||
@@ -681,8 +692,9 @@ ep_forget_password_keyring (EPassMsg *ms
|
||||
EUri *uri;
|
||||
GError *error = NULL;
|
||||
|
||||
- uri = ep_keyring_uri_new (msg->key);
|
||||
- g_return_if_fail (uri != NULL);
|
||||
+ uri = ep_keyring_uri_new (msg->key, &msg->error);
|
||||
+ if (uri == NULL)
|
||||
+ return;
|
||||
|
||||
/* Find all Evolution passwords matching the URI and delete them. */
|
||||
passwords = ep_keyring_lookup_passwords (uri->user, uri->host, &error);
|
||||
@@ -754,8 +766,9 @@ ep_get_password_keyring (EPassMsg *msg)
|
||||
EUri *uri;
|
||||
GError *error = NULL;
|
||||
|
||||
- uri = ep_keyring_uri_new (msg->key);
|
||||
- g_return_if_fail (uri != NULL);
|
||||
+ uri = ep_keyring_uri_new (msg->key, &msg->error);
|
||||
+ if (uri == NULL)
|
||||
+ return;
|
||||
|
||||
/* Find the first Evolution password that matches the URI. */
|
||||
passwords = ep_keyring_lookup_passwords (uri->user, uri->host, &error);
|
||||
@ -1,32 +0,0 @@
|
||||
diff -up evolution-data-server-2.23.2/addressbook/libedata-book/libedata-book.pc.in.libebackend-breakage evolution-data-server-2.23.2/addressbook/libedata-book/libedata-book.pc.in
|
||||
--- evolution-data-server-2.23.2/addressbook/libedata-book/libedata-book.pc.in.libebackend-breakage 2008-04-11 07:10:27.000000000 -0400
|
||||
+++ evolution-data-server-2.23.2/addressbook/libedata-book/libedata-book.pc.in 2008-05-13 12:52:00.000000000 -0400
|
||||
@@ -13,6 +13,6 @@ privincludedir=@privincludedir@
|
||||
Name: libedatabook
|
||||
Description: Backend library for evolution address books
|
||||
Version: @VERSION@
|
||||
-Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.2 libebook-1.2
|
||||
+Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.2 libebackend-1.2 libebook-1.2
|
||||
Libs: -L${libdir} -ledata-book-1.2
|
||||
Cflags: -I${privincludedir}
|
||||
diff -up evolution-data-server-2.23.2/calendar/libedata-cal/libedata-cal.pc.in.libebackend-breakage evolution-data-server-2.23.2/calendar/libedata-cal/libedata-cal.pc.in
|
||||
--- evolution-data-server-2.23.2/calendar/libedata-cal/libedata-cal.pc.in.libebackend-breakage 2008-04-18 01:48:20.000000000 -0400
|
||||
+++ evolution-data-server-2.23.2/calendar/libedata-cal/libedata-cal.pc.in 2008-05-13 12:52:00.000000000 -0400
|
||||
@@ -13,6 +13,6 @@ privincludedir=@privincludedir@
|
||||
Name: libedata-cal
|
||||
Description: Backend library for evolution calendars
|
||||
Version: @VERSION@
|
||||
-Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libedataserver-1.2 libecal-1.2 gio-2.0
|
||||
+Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libedataserver-1.2 libebackend-1.2 libecal-1.2 gio-2.0
|
||||
Libs: -L${libdir} -ledata-cal-1.2 -lecal-1.2
|
||||
Cflags: -I${privincludedir}
|
||||
diff -up evolution-data-server-2.23.2/libebackend/libebackend.pc.in.libebackend-breakage evolution-data-server-2.23.2/libebackend/libebackend.pc.in
|
||||
--- evolution-data-server-2.23.2/libebackend/libebackend.pc.in.libebackend-breakage 2008-05-12 01:33:56.000000000 -0400
|
||||
+++ evolution-data-server-2.23.2/libebackend/libebackend.pc.in 2008-05-13 12:51:59.000000000 -0400
|
||||
@@ -11,5 +11,5 @@ Name: libebackend
|
||||
Description: Utility library for Evolution Data Server Backends
|
||||
Version: @VERSION@
|
||||
Requires: glib-2.0
|
||||
-Libs: -L${libdir} -lbackend-@API_VERSION@
|
||||
+Libs: -L${libdir} -lebackend-@API_VERSION@
|
||||
Cflags: -I${privincludedir}
|
||||
Loading…
Reference in new issue