Hello community, here is the log from the commit of package evolution-data-server checked in at Sat Sep 15 11:59:22 CEST 2007. -------- --- GNOME/evolution-data-server/evolution-data-server.changes 2007-09-14 13:17:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/evolution-data-server/evolution-data-server.changes 2007-09-15 01:48:18.561303000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 15 01:48:00 CEST 2007 - maw@suse.de + +- Fix bnc-307861-calendar-auth.diff. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.gR8006/_old 2007-09-15 11:59:12.000000000 +0200 +++ /var/tmp/diff_new_pack.gR8006/_new 2007-09-15 11:59:12.000000000 +0200 @@ -17,7 +17,7 @@ AutoReqProv: on Summary: Evolution Data Server Version: 1.11.92 -Release: 3 +Release: 4 Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.11/%{name}-%{version}.tar.bz2 #Patch3: evolution-data-server-gcc4.patch Patch5: evolution-data-server-configure.patch @@ -302,6 +302,8 @@ %{_datadir}/gtk-doc/html/* %changelog +* Sat Sep 15 2007 - maw@suse.de +- Fix bnc-307861-calendar-auth.diff. * Fri Sep 14 2007 - pchenthill@novell.com - evolution-data-server-1.11.5-cert-auth-complete.patch: Updated the patch to fix bug 307861. ++++++ bnc-307861-calendar-auth.diff ++++++ --- /var/tmp/diff_new_pack.gR8006/_old 2007-09-15 11:59:14.000000000 +0200 +++ /var/tmp/diff_new_pack.gR8006/_new 2007-09-15 11:59:14.000000000 +0200 @@ -1,8 +1,8 @@ Index: calendar/libecal/e-cal-util.h =================================================================== ---- calendar/libecal/e-cal-util.h (revision 8052) -+++ calendar/libecal/e-cal-util.h (working copy) -@@ -127,6 +127,7 @@ +--- calendar/libecal/e-cal-util.h.orig ++++ calendar/libecal/e-cal-util.h +@@ -127,6 +127,7 @@ gboolean e_cal_util_event_dates_match (i #define CAL_STATIC_CAPABILITY_NO_ORGANIZER "no-organizer" #define CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY "delegate-to-many" #define CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING "has-unaccepted-meeting" @@ -12,9 +12,9 @@ icalcomponent *e_cal_util_construct_instance (icalcomponent *icalcomp, Index: calendar/libecal/e-cal.c =================================================================== ---- calendar/libecal/e-cal.c (revision 8052) -+++ calendar/libecal/e-cal.c (working copy) -@@ -1607,13 +1607,15 @@ +--- calendar/libecal/e-cal.c.orig ++++ calendar/libecal/e-cal.c +@@ -1624,13 +1624,15 @@ open_calendar (ECal *ecal, gboolean only CORBA_Environment ev; ECalendarOp *our_op; char *username = NULL, *auth_type = NULL, *password = NULL; @@ -31,7 +31,7 @@ g_mutex_lock (ecal->priv->mutex); if (!needs_auth && priv->load_state == E_CAL_LOAD_LOADED) { -@@ -1632,7 +1634,7 @@ +@@ -1649,7 +1651,7 @@ open_calendar (ECal *ecal, gboolean only g_mutex_unlock (priv->mutex); /* see if the backend needs authentication */ @@ -40,7 +40,7 @@ char *prompt, *key; char *parent_user; -@@ -2396,11 +2398,6 @@ +@@ -2413,11 +2415,6 @@ load_static_capabilities (ECal *ecal, GE g_mutex_lock (ecal->priv->mutex); @@ -52,8 +52,10 @@ if (ecal->priv->current_op != NULL) { g_mutex_unlock (ecal->priv->mutex); E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_BUSY, error); ---- servers/exchange/storage/exchange-account.c 2007-09-14 13:20:05.000000000 +0530 -+++ servers/exchange/storage/exchange-account.c 2007-09-14 13:21:44.000000000 +0530 +Index: servers/exchange/storage/exchange-account.c +=================================================================== +--- servers/exchange/storage/exchange-account.c.orig ++++ servers/exchange/storage/exchange-account.c @@ -2498,3 +2498,11 @@ exchange_account_get_hierarchy_by_type ( } return NULL; @@ -66,14 +68,16 @@ + + return acct->priv->password_key; +} ---- servers/exchange/storage/exchange-account.h 2007-09-14 13:20:05.000000000 +0530 -+++ servers/exchange/storage/exchange-account.h 2007-09-14 13:21:40.000000000 +0530 +Index: servers/exchange/storage/exchange-account.h +=================================================================== +--- servers/exchange/storage/exchange-account.h.orig ++++ servers/exchange/storage/exchange-account.h @@ -202,7 +202,7 @@ void exchange_account_folder_size_ren GtkListStore *exchange_account_folder_size_get_model (ExchangeAccount *account); void exchange_account_scan_foreign_hierarchy (ExchangeAccount *account, const char *user_email); - -+const char * exchange_account_get_password_key (ExchangeAccount *acct) ++const char * exchange_account_get_password_key (ExchangeAccount *acct); #ifdef __cplusplus } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org