garnome r6198 - in trunk: . desktop/evolution-data-server desktop/evolution-data-server/files

[kbrae svn gnome org]

Author: kbrae
Date: Wed Jan 16 17:45:06 2008
New Revision: 6198
URL: http://svn.gnome.org/viewvc/garnome?rev=6198&view=rev

Log:
desktop/evolution-data-server: Add upstream fix for bug #509644.


Added:
   trunk/desktop/evolution-data-server/files/509644-password-dialog.diff
Modified:
   trunk/ChangeLog
   trunk/desktop/evolution-data-server/Makefile
   trunk/desktop/evolution-data-server/checksums

Modified: trunk/desktop/evolution-data-server/Makefile
==============================================================================
--- trunk/desktop/evolution-data-server/Makefile	(original)
+++ trunk/desktop/evolution-data-server/Makefile	Wed Jan 16 17:45:06 2008
@@ -2,7 +2,7 @@
 GARVERSION = 2.21.5
 CATEGORIES = desktop
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-PATCHFILES =  rhel3-support.diff
+PATCHFILES =  rhel3-support.diff 509644-password-dialog.diff
 
 LIBDEPS = platform/gnome-vfs platform/libgnome desktop/libsoup bootstrap/firefox
 

Modified: trunk/desktop/evolution-data-server/checksums
==============================================================================
--- trunk/desktop/evolution-data-server/checksums	(original)
+++ trunk/desktop/evolution-data-server/checksums	Wed Jan 16 17:45:06 2008
@@ -1,2 +1,3 @@
 4887db35e5658c30e4a8653eff19a1e7  download/evolution-data-server-2.21.5.tar.bz2
 51824a587033508dd53304a6b21ed8ff  download/rhel3-support.diff
+9588469ce74600219f9bd906eb7fe506  download/509644-password-dialog.diff

Added: trunk/desktop/evolution-data-server/files/509644-password-dialog.diff
==============================================================================
--- (empty file)
+++ trunk/desktop/evolution-data-server/files/509644-password-dialog.diff	Wed Jan 16 17:45:06 2008
@@ -0,0 +1,18 @@
+--- trunk/libedataserverui/e-passwords.c	2008/01/16 16:59:55	8378
++++ trunk/libedataserverui/e-passwords.c	2008/01/16 17:15:46	8379
+@@ -873,12 +873,12 @@
+ 
+ 	widget = gtk_dialog_new_with_buttons (
+ 		msg->title, msg->parent, 0,
+-		GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+-		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
++		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
++		GTK_STOCK_OK, GTK_RESPONSE_OK,
+ 		NULL);
+ 	gtk_dialog_set_has_separator (GTK_DIALOG (widget), FALSE);
+ 	gtk_dialog_set_default_response (
+-		GTK_DIALOG (widget), GTK_RESPONSE_ACCEPT);
++		GTK_DIALOG (widget), GTK_RESPONSE_OK);
+         gtk_window_set_resizable (GTK_WINDOW (widget), FALSE);
+ 	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
+ 	password_dialog = GTK_DIALOG (widget);