pool/evolution-data-server
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=16

Browse Source
This commit is contained in:
OBS User unknown 2007-09-15 09:59:23 +00:00 committed by Git OBS Bridge
parent 16af2f14f0
commit 42dfecaee8
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bnc-307861-calendar-auth.diff
View File

@ -1,8 +1,8 @@
Index: calendar/libecal/e-cal-util.h Index: calendar/libecal/e-cal-util.h
=================================================================== ===================================================================
--- calendar/libecal/e-cal-util.h (revision 8052) --- calendar/libecal/e-cal-util.h.orig
+++ calendar/libecal/e-cal-util.h (working copy) +++ calendar/libecal/e-cal-util.h
@@ -127,6 +127,7 @@ @@ -127,6 +127,7 @@ gboolean e_cal_util_event_dates_match (i
#define CAL_STATIC_CAPABILITY_NO_ORGANIZER "no-organizer" #define CAL_STATIC_CAPABILITY_NO_ORGANIZER "no-organizer"
#define CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY "delegate-to-many" #define CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY "delegate-to-many"
#define CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING "has-unaccepted-meeting" #define CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING "has-unaccepted-meeting"
@ -12,9 +12,9 @@ Index: calendar/libecal/e-cal-util.h
icalcomponent *e_cal_util_construct_instance (icalcomponent *icalcomp, icalcomponent *e_cal_util_construct_instance (icalcomponent *icalcomp,
Index: calendar/libecal/e-cal.c Index: calendar/libecal/e-cal.c
=================================================================== ===================================================================
--- calendar/libecal/e-cal.c (revision 8052) --- calendar/libecal/e-cal.c.orig
+++ calendar/libecal/e-cal.c (working copy) +++ calendar/libecal/e-cal.c
@@ -1607,13 +1607,15 @@ @@ -1624,13 +1624,15 @@ open_calendar (ECal *ecal, gboolean only
CORBA_Environment ev; CORBA_Environment ev;
ECalendarOp *our_op; ECalendarOp *our_op;
char *username = NULL, *auth_type = NULL, *password = NULL; char *username = NULL, *auth_type = NULL, *password = NULL;
@ -31,7 +31,7 @@ Index: calendar/libecal/e-cal.c
g_mutex_lock (ecal->priv->mutex); g_mutex_lock (ecal->priv->mutex);
if (!needs_auth && priv->load_state == E_CAL_LOAD_LOADED) { 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); g_mutex_unlock (priv->mutex);
/* see if the backend needs authentication */ /* see if the backend needs authentication */
@ -40,7 +40,7 @@ Index: calendar/libecal/e-cal.c
char *prompt, *key; char *prompt, *key;
char *parent_user; char *parent_user;
@@ -2396,11 +2398,6 @@ @@ -2413,11 +2415,6 @@ load_static_capabilities (ECal *ecal, GE
g_mutex_lock (ecal->priv->mutex); g_mutex_lock (ecal->priv->mutex);
@ -52,8 +52,10 @@ Index: calendar/libecal/e-cal.c
if (ecal->priv->current_op != NULL) { if (ecal->priv->current_op != NULL) {
g_mutex_unlock (ecal->priv->mutex); g_mutex_unlock (ecal->priv->mutex);
E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_BUSY, error); E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_BUSY, error);
--- servers/exchange/storage/exchange-account.c 2007-09-14 13:20:05.000000000 +0530 Index: servers/exchange/storage/exchange-account.c
+++ servers/exchange/storage/exchange-account.c 2007-09-14 13:21:44.000000000 +0530 ===================================================================
--- servers/exchange/storage/exchange-account.c.orig
+++ servers/exchange/storage/exchange-account.c
@@ -2498,3 +2498,11 @@ exchange_account_get_hierarchy_by_type ( @@ -2498,3 +2498,11 @@ exchange_account_get_hierarchy_by_type (
} }
return NULL; return NULL;
@ -66,14 +68,16 @@ Index: calendar/libecal/e-cal.c
+ +
+ return acct->priv->password_key; + return acct->priv->password_key;
+} +}
--- servers/exchange/storage/exchange-account.h 2007-09-14 13:20:05.000000000 +0530 Index: servers/exchange/storage/exchange-account.h
+++ servers/exchange/storage/exchange-account.h 2007-09-14 13:21:40.000000000 +0530 ===================================================================
--- servers/exchange/storage/exchange-account.h.orig
+++ servers/exchange/storage/exchange-account.h
@@ -202,7 +202,7 @@ void exchange_account_folder_size_ren @@ -202,7 +202,7 @@ void exchange_account_folder_size_ren
GtkListStore *exchange_account_folder_size_get_model (ExchangeAccount *account); GtkListStore *exchange_account_folder_size_get_model (ExchangeAccount *account);
void exchange_account_scan_foreign_hierarchy (ExchangeAccount *account, void exchange_account_scan_foreign_hierarchy (ExchangeAccount *account,
const char *user_email); const char *user_email);
- -
+const char * exchange_account_get_password_key (ExchangeAccount *acct) +const char * exchange_account_get_password_key (ExchangeAccount *acct);
#ifdef __cplusplus #ifdef __cplusplus
} }

5
evolution-data-server.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Sep 15 01:48:00 CEST 2007 - maw@suse.de
- Fix bnc-307861-calendar-auth.diff.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 14 12:53:35 CEST 2007 - pchenthill@novell.com Fri Sep 14 12:53:35 CEST 2007 - pchenthill@novell.com

4
evolution-data-server.spec
View File

@ -17,7 +17,7 @@ Group: Development/Libraries/GNOME
AutoReqProv: on AutoReqProv: on
Summary: Evolution Data Server Summary: Evolution Data Server
Version: 1.11.92 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 Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.11/%{name}-%{version}.tar.bz2
#Patch3: evolution-data-server-gcc4.patch #Patch3: evolution-data-server-gcc4.patch
Patch5: evolution-data-server-configure.patch Patch5: evolution-data-server-configure.patch
@ -302,6 +302,8 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/*
%changelog %changelog
* Sat Sep 15 2007 - maw@suse.de
- Fix bnc-307861-calendar-auth.diff.
* Fri Sep 14 2007 - pchenthill@novell.com * Fri Sep 14 2007 - pchenthill@novell.com
- evolution-data-server-1.11.5-cert-auth-complete.patch: Updated the - evolution-data-server-1.11.5-cert-auth-complete.patch: Updated the
patch to fix bug 307861. patch to fix bug 307861.