rpms/evolution-data-server/F-7 evolution-data-server-1.9.92-e-passwords.patch, 1.2, 1.3
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Mon May 21 14:33:40 UTC 2007
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution-data-server/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7248
Modified Files:
evolution-data-server-1.9.92-e-passwords.patch
Log Message:
- Remove a leftover debug message from the e-passwords patch.
evolution-data-server-1.9.92-e-passwords.patch:
Index: evolution-data-server-1.9.92-e-passwords.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-7/evolution-data-server-1.9.92-e-passwords.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-data-server-1.9.92-e-passwords.patch 15 Mar 2007 00:56:56 -0000 1.2
+++ evolution-data-server-1.9.92-e-passwords.patch 21 May 2007 14:33:05 -0000 1.3
@@ -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.10.0/libedataserverui/e-passwords.h 2007-03-14 18:05:55.000000000 -0400
+--- evolution-data-server-1.10.1/libedataserverui/e-passwords.h.e-passwords 2007-04-09 08:42:54.000000000 -0400
++++ evolution-data-server-1.10.1/libedataserverui/e-passwords.h 2007-05-21 10:29:53.000000000 -0400
@@ -28,45 +28,65 @@
G_BEGIN_DECLS
@@ -97,8 +97,8 @@
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.10.0/libedataserverui/e-passwords.c 2007-03-14 20:27:01.000000000 -0400
+--- evolution-data-server-1.10.1/libedataserverui/e-passwords.c.e-passwords 2007-04-09 08:42:54.000000000 -0400
++++ evolution-data-server-1.10.1/libedataserverui/e-passwords.c 2007-05-21 10:31:00.000000000 -0400
@@ -23,18 +23,29 @@
*/
@@ -139,7 +139,7 @@
*/
#ifdef HAVE_CONFIG_H
-@@ -42,159 +53,384 @@
+@@ -42,159 +53,381 @@
#endif
#include <string.h>
@@ -439,10 +439,7 @@
static void
-ep_msg_free(EPassMsg *msg)
+ep_msg_dispatch (EPassMsg *msg)
- {
-- e_msgport_destroy(msg->msg.reply_port);
-- g_free(msg->password);
-- g_free(msg);
++{
+ msg->callback (msg);
+ e_flag_set (msg->done);
+}
@@ -460,13 +457,14 @@
+ g_async_queue_unlock (express_queue);
+
+ return success;
- }
-
- static void
--ep_msg_send(EPassMsg *msg)
++}
++
++static void
+ep_msg_send (EPassMsg *msg)
{
-- int needidle = 0;
+- e_msgport_destroy(msg->msg.reply_port);
+- g_free(msg->password);
+- g_free(msg);
+ GMainContext *context;
+
+ context = g_main_context_default ();
@@ -476,14 +474,6 @@
+
+ if (!(msg->expedite && ep_msg_expedite (msg)))
+ 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. */
+ if (g_main_context_is_owner (context))
@@ -491,9 +481,10 @@
+ g_main_context_iteration (context, TRUE);
+ else
+ e_flag_wait (msg->done);
-+}
-+
-+static void
+ }
+
+ static void
+-ep_msg_send(EPassMsg *msg)
+ep_msg_free (EPassMsg *msg)
+{
+ e_flag_free (msg->done);
@@ -527,9 +518,15 @@
+
+static gboolean
+ep_dialog_run (EPassMsg *msg)
-+{
+ {
+- int needidle = 0;
+ /* 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;
+ GtkBox *box;
+ GtkWidget *dialog;
@@ -626,7 +623,7 @@
{
GnomeKeyringAttributeList *attributes;
GnomeKeyringAttribute attribute;
-@@ -205,11 +441,8 @@
+@@ -205,11 +438,8 @@
result = gnome_keyring_get_default_keyring_sync (&default_keyring);
if (!default_keyring) {
@@ -640,7 +637,7 @@
default_keyring = g_strdup ("default");
}
-@@ -239,38 +472,44 @@
+@@ -239,38 +469,44 @@
}
g_free (default_keyring);
@@ -703,7 +700,7 @@
{
GnomeKeyringAttributeList *attributes;
GnomeKeyringAttribute attribute;
-@@ -281,11 +520,8 @@
+@@ -281,11 +517,8 @@
result = gnome_keyring_get_default_keyring_sync (&default_keyring);
if (!default_keyring) {
@@ -717,7 +714,7 @@
default_keyring = g_strdup ("default");
}
d(g_print("Get Default %d\n", result));
-@@ -316,69 +552,54 @@
+@@ -316,69 +549,54 @@
g_free (default_keyring);
/* free up the session passwords */
@@ -814,7 +811,7 @@
guint32 item_id;
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));
/* now remove it from our session hash */
@@ -893,7 +890,7 @@
}
#if WITH_GNOME_KEYRING
-@@ -472,7 +693,6 @@
+@@ -472,7 +690,6 @@
GnomeKeyringResult result;
GList *matches = NULL, *tmp;
char *default_keyring = NULL;
@@ -901,7 +898,7 @@
EUri *uri = e_uri_new (msg->key);
if (!strcmp (uri->protocol, "ldap") && !uri->user) {
-@@ -486,27 +706,17 @@
+@@ -486,27 +703,17 @@
uri->user = keycopy;
}
@@ -932,7 +929,7 @@
default_keyring = g_strdup ("default");
}
-@@ -567,35 +777,44 @@
+@@ -567,35 +774,44 @@
}
g_free (default_keyring);
@@ -996,7 +993,7 @@
#if WITH_GNOME_KEYRING
static void
-@@ -605,11 +824,11 @@
+@@ -605,11 +821,11 @@
GnomeKeyringAttributeList *attributes;
GnomeKeyringAttribute attribute;
GnomeKeyringResult result;
@@ -1011,7 +1008,7 @@
} else {
EUri *uri = e_uri_new (msg->key);
-@@ -683,287 +902,154 @@
+@@ -683,287 +899,154 @@
}
}
@@ -1389,7 +1386,7 @@
*
* Set the offline-state of the application. This is a work-around
* 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.
**/
void
@@ -1404,7 +1401,7 @@
}
/**
-@@ -986,150 +1073,137 @@
+@@ -986,150 +1070,137 @@
void
e_passwords_forget_passwords (void)
{
@@ -1608,7 +1605,7 @@
* @key: key to store the password under
* @prompt: prompt string
* @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
* E_PASSWORDS_DO_NOT_REMEMBER.
**/
@@ -1879,8 +1876,8 @@
- return (char *)plain;
+ 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.10.0/libedataserver/e-msgport.h 2007-03-14 18:05:55.000000000 -0400
+--- evolution-data-server-1.10.1/libedataserver/e-msgport.h.e-passwords 2007-04-09 08:42:55.000000000 -0400
++++ evolution-data-server-1.10.1/libedataserver/e-msgport.h 2007-05-21 10:29:53.000000000 -0400
@@ -54,7 +54,7 @@
/* header for any message */
More information about the fedora-extras-commits
mailing list