|
|
|
@ -1,5 +1,5 @@
|
|
|
|
--- evolution-data-server-1.10.0/libedataserverui/e-passwords.h.e-passwords 2007-01-03 05:09:27.000000000 -0500
|
|
|
|
--- evolution-data-server-1.11.2/libedataserverui/e-passwords.h.e-passwords 2007-04-18 06:10:16.000000000 -0400
|
|
|
|
+++ evolution-data-server-1.10.0/libedataserverui/e-passwords.h 2007-03-14 18:05:55.000000000 -0400
|
|
|
|
+++ evolution-data-server-1.11.2/libedataserverui/e-passwords.h 2007-05-18 12:03:54.000000000 -0400
|
|
|
|
@@ -28,45 +28,65 @@
|
|
|
|
@@ -28,45 +28,65 @@
|
|
|
|
|
|
|
|
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
@ -97,8 +97,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
G_END_DECLS
|
|
|
|
G_END_DECLS
|
|
|
|
|
|
|
|
|
|
|
|
--- evolution-data-server-1.10.0/libedataserverui/e-passwords.c.e-passwords 2007-02-09 03:38:09.000000000 -0500
|
|
|
|
--- evolution-data-server-1.11.2/libedataserverui/e-passwords.c.e-passwords 2007-04-18 06:10:16.000000000 -0400
|
|
|
|
+++ evolution-data-server-1.10.0/libedataserverui/e-passwords.c 2007-03-14 20:27:01.000000000 -0400
|
|
|
|
+++ evolution-data-server-1.11.2/libedataserverui/e-passwords.c 2007-05-18 12:03:54.000000000 -0400
|
|
|
|
@@ -23,18 +23,29 @@
|
|
|
|
@@ -23,18 +23,29 @@
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
@ -139,7 +139,7 @@
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
@@ -42,159 +53,384 @@
|
|
|
|
@@ -42,159 +53,381 @@
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
#include <string.h>
|
|
|
|
@ -157,7 +157,7 @@
|
|
|
|
+#include "libedataserver/e-flag.h"
|
|
|
|
+#include "libedataserver/e-flag.h"
|
|
|
|
#include "libedataserver/e-url.h"
|
|
|
|
#include "libedataserver/e-url.h"
|
|
|
|
|
|
|
|
|
|
|
|
#if WITH_GNOME_KEYRING
|
|
|
|
#ifdef WITH_GNOME_KEYRING
|
|
|
|
#include <gnome-keyring.h>
|
|
|
|
#include <gnome-keyring.h>
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
@ -439,10 +439,7 @@
|
|
|
|
static void
|
|
|
|
static void
|
|
|
|
-ep_msg_free(EPassMsg *msg)
|
|
|
|
-ep_msg_free(EPassMsg *msg)
|
|
|
|
+ep_msg_dispatch (EPassMsg *msg)
|
|
|
|
+ep_msg_dispatch (EPassMsg *msg)
|
|
|
|
{
|
|
|
|
+{
|
|
|
|
- e_msgport_destroy(msg->msg.reply_port);
|
|
|
|
|
|
|
|
- g_free(msg->password);
|
|
|
|
|
|
|
|
- g_free(msg);
|
|
|
|
|
|
|
|
+ msg->callback (msg);
|
|
|
|
+ msg->callback (msg);
|
|
|
|
+ e_flag_set (msg->done);
|
|
|
|
+ e_flag_set (msg->done);
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
@ -460,13 +457,14 @@
|
|
|
|
+ g_async_queue_unlock (express_queue);
|
|
|
|
+ g_async_queue_unlock (express_queue);
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ return success;
|
|
|
|
+ return success;
|
|
|
|
}
|
|
|
|
+}
|
|
|
|
|
|
|
|
+
|
|
|
|
static void
|
|
|
|
+static void
|
|
|
|
-ep_msg_send(EPassMsg *msg)
|
|
|
|
|
|
|
|
+ep_msg_send (EPassMsg *msg)
|
|
|
|
+ep_msg_send (EPassMsg *msg)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
- int needidle = 0;
|
|
|
|
- e_msgport_destroy(msg->msg.reply_port);
|
|
|
|
|
|
|
|
- g_free(msg->password);
|
|
|
|
|
|
|
|
- g_free(msg);
|
|
|
|
+ GMainContext *context;
|
|
|
|
+ GMainContext *context;
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ context = g_main_context_default ();
|
|
|
|
+ context = g_main_context_default ();
|
|
|
|
@ -476,14 +474,6 @@
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ if (!(msg->expedite && ep_msg_expedite (msg)))
|
|
|
|
+ if (!(msg->expedite && ep_msg_expedite (msg)))
|
|
|
|
+ g_thread_pool_push (dispatcher, msg, NULL);
|
|
|
|
+ g_thread_pool_push (dispatcher, msg, NULL);
|
|
|
|
|
|
|
|
|
|
|
|
- LOCK();
|
|
|
|
|
|
|
|
- e_dlist_addtail(&request_list, (EDListNode *)&msg->msg);
|
|
|
|
|
|
|
|
- if (!idle_id) {
|
|
|
|
|
|
|
|
- if (!msg->ismain)
|
|
|
|
|
|
|
|
- idle_id = g_idle_add(ep_idle_dispatch, NULL);
|
|
|
|
|
|
|
|
+ g_debug ("%s: in main thread? %d", G_STRFUNC,
|
|
|
|
|
|
|
|
+ g_main_context_is_owner (context));
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ /* Don't block the main loop. */
|
|
|
|
+ /* Don't block the main loop. */
|
|
|
|
+ if (g_main_context_is_owner (context))
|
|
|
|
+ if (g_main_context_is_owner (context))
|
|
|
|
@ -491,9 +481,10 @@
|
|
|
|
+ g_main_context_iteration (context, TRUE);
|
|
|
|
+ g_main_context_iteration (context, TRUE);
|
|
|
|
+ else
|
|
|
|
+ else
|
|
|
|
+ e_flag_wait (msg->done);
|
|
|
|
+ e_flag_wait (msg->done);
|
|
|
|
+}
|
|
|
|
}
|
|
|
|
+
|
|
|
|
|
|
|
|
+static void
|
|
|
|
static void
|
|
|
|
|
|
|
|
-ep_msg_send(EPassMsg *msg)
|
|
|
|
+ep_msg_free (EPassMsg *msg)
|
|
|
|
+ep_msg_free (EPassMsg *msg)
|
|
|
|
+{
|
|
|
|
+{
|
|
|
|
+ e_flag_free (msg->done);
|
|
|
|
+ e_flag_free (msg->done);
|
|
|
|
@ -527,9 +518,15 @@
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+static gboolean
|
|
|
|
+static gboolean
|
|
|
|
+ep_dialog_run (EPassMsg *msg)
|
|
|
|
+ep_dialog_run (EPassMsg *msg)
|
|
|
|
+{
|
|
|
|
{
|
|
|
|
|
|
|
|
- int needidle = 0;
|
|
|
|
+ /* This function must run in the main thread. */
|
|
|
|
+ /* This function must run in the main thread. */
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
- LOCK();
|
|
|
|
|
|
|
|
- e_dlist_addtail(&request_list, (EDListNode *)&msg->msg);
|
|
|
|
|
|
|
|
- if (!idle_id) {
|
|
|
|
|
|
|
|
- if (!msg->ismain)
|
|
|
|
|
|
|
|
- idle_id = g_idle_add(ep_idle_dispatch, NULL);
|
|
|
|
+ EPassDialogData *data = msg->data;
|
|
|
|
+ EPassDialogData *data = msg->data;
|
|
|
|
+ GtkBox *box;
|
|
|
|
+ GtkBox *box;
|
|
|
|
+ GtkWidget *dialog;
|
|
|
|
+ GtkWidget *dialog;
|
|
|
|
@ -619,14 +616,14 @@
|
|
|
|
-/* the functions that actually do the work */
|
|
|
|
-/* the functions that actually do the work */
|
|
|
|
+/* The rest of these static functions must run in the dispatcher thread. */
|
|
|
|
+/* The rest of these static functions must run in the dispatcher thread. */
|
|
|
|
+
|
|
|
|
+
|
|
|
|
#if WITH_GNOME_KEYRING
|
|
|
|
#ifdef WITH_GNOME_KEYRING
|
|
|
|
static void
|
|
|
|
static void
|
|
|
|
-ep_clear_passwords_keyring(EPassMsg *msg)
|
|
|
|
-ep_clear_passwords_keyring(EPassMsg *msg)
|
|
|
|
+ep_clear_passwords_keyring (EPassMsg *msg)
|
|
|
|
+ep_clear_passwords_keyring (EPassMsg *msg)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
GnomeKeyringAttributeList *attributes;
|
|
|
|
GnomeKeyringAttributeList *attributes;
|
|
|
|
GnomeKeyringAttribute attribute;
|
|
|
|
GnomeKeyringAttribute attribute;
|
|
|
|
@@ -205,11 +441,8 @@
|
|
|
|
@@ -205,11 +438,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
result = gnome_keyring_get_default_keyring_sync (&default_keyring);
|
|
|
|
result = gnome_keyring_get_default_keyring_sync (&default_keyring);
|
|
|
|
if (!default_keyring) {
|
|
|
|
if (!default_keyring) {
|
|
|
|
@ -640,7 +637,7 @@
|
|
|
|
default_keyring = g_strdup ("default");
|
|
|
|
default_keyring = g_strdup ("default");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -239,38 +472,44 @@
|
|
|
|
@@ -239,38 +469,44 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
g_free (default_keyring);
|
|
|
|
g_free (default_keyring);
|
|
|
|
@ -686,7 +683,7 @@
|
|
|
|
- memset (value, 0, strlen (value));
|
|
|
|
- memset (value, 0, strlen (value));
|
|
|
|
- g_free (value);
|
|
|
|
- g_free (value);
|
|
|
|
- return TRUE;
|
|
|
|
- return TRUE;
|
|
|
|
+#if WITH_GNOME_KEYRING
|
|
|
|
+#ifdef WITH_GNOME_KEYRING
|
|
|
|
+ if (gnome_keyring_is_available ())
|
|
|
|
+ if (gnome_keyring_is_available ())
|
|
|
|
+ ep_clear_passwords_keyring (msg);
|
|
|
|
+ ep_clear_passwords_keyring (msg);
|
|
|
|
+ else
|
|
|
|
+ else
|
|
|
|
@ -696,14 +693,14 @@
|
|
|
|
+#endif
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#if WITH_GNOME_KEYRING
|
|
|
|
#ifdef WITH_GNOME_KEYRING
|
|
|
|
static void
|
|
|
|
static void
|
|
|
|
-ep_forget_passwords_keyring(EPassMsg *msg)
|
|
|
|
-ep_forget_passwords_keyring(EPassMsg *msg)
|
|
|
|
+ep_forget_passwords_keyring (EPassMsg *msg)
|
|
|
|
+ep_forget_passwords_keyring (EPassMsg *msg)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
GnomeKeyringAttributeList *attributes;
|
|
|
|
GnomeKeyringAttributeList *attributes;
|
|
|
|
GnomeKeyringAttribute attribute;
|
|
|
|
GnomeKeyringAttribute attribute;
|
|
|
|
@@ -281,11 +520,8 @@
|
|
|
|
@@ -281,11 +517,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
result = gnome_keyring_get_default_keyring_sync (&default_keyring);
|
|
|
|
result = gnome_keyring_get_default_keyring_sync (&default_keyring);
|
|
|
|
if (!default_keyring) {
|
|
|
|
if (!default_keyring) {
|
|
|
|
@ -717,7 +714,7 @@
|
|
|
|
default_keyring = g_strdup ("default");
|
|
|
|
default_keyring = g_strdup ("default");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
d(g_print("Get Default %d\n", result));
|
|
|
|
d(g_print("Get Default %d\n", result));
|
|
|
|
@@ -316,69 +552,54 @@
|
|
|
|
@@ -316,69 +549,54 @@
|
|
|
|
g_free (default_keyring);
|
|
|
|
g_free (default_keyring);
|
|
|
|
|
|
|
|
|
|
|
|
/* free up the session passwords */
|
|
|
|
/* free up the session passwords */
|
|
|
|
@ -784,7 +781,7 @@
|
|
|
|
- g_free (keycopy);
|
|
|
|
- g_free (keycopy);
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- return path;
|
|
|
|
- return path;
|
|
|
|
+#if WITH_GNOME_KEYRING
|
|
|
|
+#ifdef WITH_GNOME_KEYRING
|
|
|
|
+ if (gnome_keyring_is_available ())
|
|
|
|
+ if (gnome_keyring_is_available ())
|
|
|
|
+ ep_forget_passwords_keyring (msg);
|
|
|
|
+ ep_forget_passwords_keyring (msg);
|
|
|
|
+ else
|
|
|
|
+ else
|
|
|
|
@ -794,7 +791,7 @@
|
|
|
|
+#endif
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#if WITH_GNOME_KEYRING
|
|
|
|
#ifdef WITH_GNOME_KEYRING
|
|
|
|
static void
|
|
|
|
static void
|
|
|
|
-ep_remember_password_keyring(EPassMsg *msg)
|
|
|
|
-ep_remember_password_keyring(EPassMsg *msg)
|
|
|
|
+ep_remember_password_keyring (EPassMsg *msg)
|
|
|
|
+ep_remember_password_keyring (EPassMsg *msg)
|
|
|
|
@ -814,7 +811,7 @@
|
|
|
|
guint32 item_id;
|
|
|
|
guint32 item_id;
|
|
|
|
|
|
|
|
|
|
|
|
if (!strcmp (uri->protocol, "ldap") && !uri->user) {
|
|
|
|
if (!strcmp (uri->protocol, "ldap") && !uri->user) {
|
|
|
|
@@ -419,48 +640,48 @@
|
|
|
|
@@ -419,48 +637,48 @@
|
|
|
|
|
|
|
|
|
|
|
|
d(g_print("Remember %s: %d/%d\n", msg->key, result, item_id));
|
|
|
|
d(g_print("Remember %s: %d/%d\n", msg->key, result, item_id));
|
|
|
|
/* now remove it from our session hash */
|
|
|
|
/* now remove it from our session hash */
|
|
|
|
@ -882,7 +879,7 @@
|
|
|
|
+static void
|
|
|
|
+static void
|
|
|
|
+ep_remember_password (EPassMsg *msg)
|
|
|
|
+ep_remember_password (EPassMsg *msg)
|
|
|
|
+{
|
|
|
|
+{
|
|
|
|
+#if WITH_GNOME_KEYRING
|
|
|
|
+#ifdef WITH_GNOME_KEYRING
|
|
|
|
+ if (gnome_keyring_is_available ())
|
|
|
|
+ if (gnome_keyring_is_available ())
|
|
|
|
+ ep_remember_password_keyring (msg);
|
|
|
|
+ ep_remember_password_keyring (msg);
|
|
|
|
+ else
|
|
|
|
+ else
|
|
|
|
@ -892,8 +889,8 @@
|
|
|
|
+#endif
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#if WITH_GNOME_KEYRING
|
|
|
|
#ifdef WITH_GNOME_KEYRING
|
|
|
|
@@ -472,7 +693,6 @@
|
|
|
|
@@ -472,7 +690,6 @@
|
|
|
|
GnomeKeyringResult result;
|
|
|
|
GnomeKeyringResult result;
|
|
|
|
GList *matches = NULL, *tmp;
|
|
|
|
GList *matches = NULL, *tmp;
|
|
|
|
char *default_keyring = NULL;
|
|
|
|
char *default_keyring = NULL;
|
|
|
|
@ -901,7 +898,7 @@
|
|
|
|
EUri *uri = e_uri_new (msg->key);
|
|
|
|
EUri *uri = e_uri_new (msg->key);
|
|
|
|
|
|
|
|
|
|
|
|
if (!strcmp (uri->protocol, "ldap") && !uri->user) {
|
|
|
|
if (!strcmp (uri->protocol, "ldap") && !uri->user) {
|
|
|
|
@@ -486,27 +706,17 @@
|
|
|
|
@@ -486,27 +703,17 @@
|
|
|
|
uri->user = keycopy;
|
|
|
|
uri->user = keycopy;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -932,7 +929,7 @@
|
|
|
|
default_keyring = g_strdup ("default");
|
|
|
|
default_keyring = g_strdup ("default");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -567,35 +777,44 @@
|
|
|
|
@@ -567,35 +774,44 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
g_free (default_keyring);
|
|
|
|
g_free (default_keyring);
|
|
|
|
@ -984,7 +981,7 @@
|
|
|
|
+static void
|
|
|
|
+static void
|
|
|
|
+ep_forget_password (EPassMsg *msg)
|
|
|
|
+ep_forget_password (EPassMsg *msg)
|
|
|
|
+{
|
|
|
|
+{
|
|
|
|
+#if WITH_GNOME_KEYRING
|
|
|
|
+#ifdef WITH_GNOME_KEYRING
|
|
|
|
+ if (gnome_keyring_is_available ())
|
|
|
|
+ if (gnome_keyring_is_available ())
|
|
|
|
+ ep_forget_password_keyring (msg);
|
|
|
|
+ ep_forget_password_keyring (msg);
|
|
|
|
+ else
|
|
|
|
+ else
|
|
|
|
@ -994,9 +991,9 @@
|
|
|
|
+#endif
|
|
|
|
+#endif
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
|
|
#if WITH_GNOME_KEYRING
|
|
|
|
#ifdef WITH_GNOME_KEYRING
|
|
|
|
static void
|
|
|
|
static void
|
|
|
|
@@ -605,11 +824,11 @@
|
|
|
|
@@ -605,11 +821,11 @@
|
|
|
|
GnomeKeyringAttributeList *attributes;
|
|
|
|
GnomeKeyringAttributeList *attributes;
|
|
|
|
GnomeKeyringAttribute attribute;
|
|
|
|
GnomeKeyringAttribute attribute;
|
|
|
|
GnomeKeyringResult result;
|
|
|
|
GnomeKeyringResult result;
|
|
|
|
@ -1011,7 +1008,7 @@
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
EUri *uri = e_uri_new (msg->key);
|
|
|
|
EUri *uri = e_uri_new (msg->key);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -683,287 +902,154 @@
|
|
|
|
@@ -683,287 +899,154 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -1105,7 +1102,7 @@
|
|
|
|
- msg->oldpass = msg->password;
|
|
|
|
- msg->oldpass = msg->password;
|
|
|
|
- ep_add_password(msg);
|
|
|
|
- ep_add_password(msg);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
#if WITH_GNOME_KEYRING
|
|
|
|
#ifdef WITH_GNOME_KEYRING
|
|
|
|
- if (*msg->remember && type == E_PASSWORDS_REMEMBER_FOREVER) {
|
|
|
|
- if (*msg->remember && type == E_PASSWORDS_REMEMBER_FOREVER) {
|
|
|
|
- if (gnome_keyring_is_available())
|
|
|
|
- if (gnome_keyring_is_available())
|
|
|
|
- ep_remember_password_keyring(msg);
|
|
|
|
- ep_remember_password_keyring(msg);
|
|
|
|
@ -1136,13 +1133,13 @@
|
|
|
|
- mw = (EPassMsg *)request_list.head;
|
|
|
|
- mw = (EPassMsg *)request_list.head;
|
|
|
|
- mn = (EPassMsg *)mw->msg.ln.next;
|
|
|
|
- mn = (EPassMsg *)mw->msg.ln.next;
|
|
|
|
- while (mn) {
|
|
|
|
- while (mn) {
|
|
|
|
-#if WITH_GNOME_KEYRING
|
|
|
|
-#ifdef WITH_GNOME_KEYRING
|
|
|
|
- if ((mw->dispatch == (gnome_keyring_is_available() ? ep_forget_password_keyring : ep_forget_password_file)
|
|
|
|
- if ((mw->dispatch == (gnome_keyring_is_available() ? ep_forget_password_keyring : ep_forget_password_file)
|
|
|
|
-#else
|
|
|
|
-#else
|
|
|
|
- if ((mw->dispatch == ep_forget_password_file
|
|
|
|
- if ((mw->dispatch == ep_forget_password_file
|
|
|
|
+ ep_get_password_keyfile (msg);
|
|
|
|
+ ep_get_password_keyfile (msg);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
-#if WITH_GNOME_KEYRING
|
|
|
|
-#ifdef WITH_GNOME_KEYRING
|
|
|
|
- || mw->dispatch == (gnome_keyring_is_available() ? ep_get_password_keyring : ep_get_password_file)
|
|
|
|
- || mw->dispatch == (gnome_keyring_is_available() ? ep_get_password_keyring : ep_get_password_file)
|
|
|
|
-#else
|
|
|
|
-#else
|
|
|
|
- || mw->dispatch == ep_get_password_file
|
|
|
|
- || mw->dispatch == ep_get_password_file
|
|
|
|
@ -1255,7 +1252,7 @@
|
|
|
|
- gtk_widget_grab_focus (msg->entry);
|
|
|
|
- gtk_widget_grab_focus (msg->entry);
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- if ((msg->flags & E_PASSWORDS_REPROMPT)) {
|
|
|
|
- if ((msg->flags & E_PASSWORDS_REPROMPT)) {
|
|
|
|
-#if WITH_GNOME_KEYRING
|
|
|
|
-#ifdef WITH_GNOME_KEYRING
|
|
|
|
- if (gnome_keyring_is_available())
|
|
|
|
- if (gnome_keyring_is_available())
|
|
|
|
- ep_get_password_keyring(msg);
|
|
|
|
- ep_get_password_keyring(msg);
|
|
|
|
- else
|
|
|
|
- else
|
|
|
|
@ -1389,7 +1386,7 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Set the offline-state of the application. This is a work-around
|
|
|
|
* Set the offline-state of the application. This is a work-around
|
|
|
|
* for having the backends fully offline aware, and returns a
|
|
|
|
* for having the backends fully offline aware, and returns a
|
|
|
|
@@ -972,10 +1058,11 @@
|
|
|
|
@@ -972,10 +1055,11 @@
|
|
|
|
* FIXME: This is not a permanent api, review post 2.0.
|
|
|
|
* FIXME: This is not a permanent api, review post 2.0.
|
|
|
|
**/
|
|
|
|
**/
|
|
|
|
void
|
|
|
|
void
|
|
|
|
@ -1404,11 +1401,11 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@@ -986,150 +1073,137 @@
|
|
|
|
@@ -986,150 +1070,137 @@
|
|
|
|
void
|
|
|
|
void
|
|
|
|
e_passwords_forget_passwords (void)
|
|
|
|
e_passwords_forget_passwords (void)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
-#if WITH_GNOME_KEYRING
|
|
|
|
-#ifdef WITH_GNOME_KEYRING
|
|
|
|
- EPassMsg *msg = ep_msg_new(gnome_keyring_is_available() ? ep_forget_passwords_keyring : ep_forget_passwords_file);
|
|
|
|
- EPassMsg *msg = ep_msg_new(gnome_keyring_is_available() ? ep_forget_passwords_keyring : ep_forget_passwords_file);
|
|
|
|
-#else
|
|
|
|
-#else
|
|
|
|
- EPassMsg *msg = ep_msg_new(ep_forget_passwords_file);
|
|
|
|
- EPassMsg *msg = ep_msg_new(ep_forget_passwords_file);
|
|
|
|
@ -1434,7 +1431,7 @@
|
|
|
|
-e_passwords_clear_passwords (const char *component_name)
|
|
|
|
-e_passwords_clear_passwords (const char *component_name)
|
|
|
|
+e_passwords_clear_passwords (const gchar *component)
|
|
|
|
+e_passwords_clear_passwords (const gchar *component)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
-#if WITH_GNOME_KEYRING
|
|
|
|
-#ifdef WITH_GNOME_KEYRING
|
|
|
|
- EPassMsg *msg = ep_msg_new(gnome_keyring_is_available() ? ep_clear_passwords_keyring : ep_clear_passwords_file);
|
|
|
|
- EPassMsg *msg = ep_msg_new(gnome_keyring_is_available() ? ep_clear_passwords_keyring : ep_clear_passwords_file);
|
|
|
|
-#else
|
|
|
|
-#else
|
|
|
|
- EPassMsg *msg = ep_msg_new(ep_clear_passwords_file);
|
|
|
|
- EPassMsg *msg = ep_msg_new(ep_clear_passwords_file);
|
|
|
|
@ -1471,7 +1468,7 @@
|
|
|
|
+ g_return_if_fail (component != NULL);
|
|
|
|
+ g_return_if_fail (component != NULL);
|
|
|
|
+ g_return_if_fail (key != NULL);
|
|
|
|
+ g_return_if_fail (key != NULL);
|
|
|
|
|
|
|
|
|
|
|
|
-#if WITH_GNOME_KEYRING
|
|
|
|
-#ifdef WITH_GNOME_KEYRING
|
|
|
|
- msg = ep_msg_new(gnome_keyring_is_available() ? ep_remember_password_keyring : ep_remember_password_file);
|
|
|
|
- msg = ep_msg_new(gnome_keyring_is_available() ? ep_remember_password_keyring : ep_remember_password_file);
|
|
|
|
-#else
|
|
|
|
-#else
|
|
|
|
- msg = ep_msg_new(ep_remember_password_file);
|
|
|
|
- msg = ep_msg_new(ep_remember_password_file);
|
|
|
|
@ -1505,7 +1502,7 @@
|
|
|
|
+ g_return_if_fail (component != NULL);
|
|
|
|
+ g_return_if_fail (component != NULL);
|
|
|
|
+ g_return_if_fail (key != NULL);
|
|
|
|
+ g_return_if_fail (key != NULL);
|
|
|
|
|
|
|
|
|
|
|
|
-#if WITH_GNOME_KEYRING
|
|
|
|
-#ifdef WITH_GNOME_KEYRING
|
|
|
|
- msg = ep_msg_new(gnome_keyring_is_available() ? ep_forget_password_keyring : ep_forget_password_file);
|
|
|
|
- msg = ep_msg_new(gnome_keyring_is_available() ? ep_forget_password_keyring : ep_forget_password_file);
|
|
|
|
-#else
|
|
|
|
-#else
|
|
|
|
- msg = ep_msg_new(ep_forget_password_file);
|
|
|
|
- msg = ep_msg_new(ep_forget_password_file);
|
|
|
|
@ -1542,7 +1539,7 @@
|
|
|
|
+ g_return_val_if_fail (component != NULL, NULL);
|
|
|
|
+ g_return_val_if_fail (component != NULL, NULL);
|
|
|
|
+ g_return_val_if_fail (key != NULL, NULL);
|
|
|
|
+ g_return_val_if_fail (key != NULL, NULL);
|
|
|
|
|
|
|
|
|
|
|
|
-#if WITH_GNOME_KEYRING
|
|
|
|
-#ifdef WITH_GNOME_KEYRING
|
|
|
|
- msg = ep_msg_new(gnome_keyring_is_available() ? ep_get_password_keyring : ep_get_password_file);
|
|
|
|
- msg = ep_msg_new(gnome_keyring_is_available() ? ep_get_password_keyring : ep_get_password_file);
|
|
|
|
-#else
|
|
|
|
-#else
|
|
|
|
- msg = ep_msg_new(ep_get_password_file);
|
|
|
|
- msg = ep_msg_new(ep_get_password_file);
|
|
|
|
@ -1608,7 +1605,7 @@
|
|
|
|
* @key: key to store the password under
|
|
|
|
* @key: key to store the password under
|
|
|
|
* @prompt: prompt string
|
|
|
|
* @prompt: prompt string
|
|
|
|
* @secret: whether or not the password text should be ***ed out
|
|
|
|
* @secret: whether or not the password text should be ***ed out
|
|
|
|
@@ -1146,241 +1220,45 @@
|
|
|
|
@@ -1146,241 +1217,45 @@
|
|
|
|
* return value is non-%NULL and @remember_type is not
|
|
|
|
* return value is non-%NULL and @remember_type is not
|
|
|
|
* E_PASSWORDS_DO_NOT_REMEMBER.
|
|
|
|
* E_PASSWORDS_DO_NOT_REMEMBER.
|
|
|
|
**/
|
|
|
|
**/
|
|
|
|
@ -1879,8 +1876,8 @@
|
|
|
|
- return (char *)plain;
|
|
|
|
- return (char *)plain;
|
|
|
|
+ return password;
|
|
|
|
+ return password;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
--- evolution-data-server-1.10.0/libedataserver/e-msgport.h.e-passwords 2007-02-26 04:52:17.000000000 -0500
|
|
|
|
--- evolution-data-server-1.11.2/libedataserver/e-msgport.h.e-passwords 2007-04-18 06:10:18.000000000 -0400
|
|
|
|
+++ evolution-data-server-1.10.0/libedataserver/e-msgport.h 2007-03-14 18:05:55.000000000 -0400
|
|
|
|
+++ evolution-data-server-1.11.2/libedataserver/e-msgport.h 2007-05-18 12:03:54.000000000 -0400
|
|
|
|
@@ -54,7 +54,7 @@
|
|
|
|
@@ -54,7 +54,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
/* header for any message */
|
|
|
|
/* header for any message */
|
|
|
|
|
Matthew Barnes
18 years ago