[evolution-patches] Fix for the bug #66484 [calendar]
- From: r1 <r1 research rpvo>
- To: evolution-patches ximian com
- Subject: [evolution-patches] Fix for the bug #66484 [calendar]
- Date: Fri, 01 Oct 2004 17:41:57 +0530
Hi,
Have added an new error message Unknown User so that we display a
proper error message in case if the user io not found while creating a
meeting.
thanks, chenthill.
? 1
? 62868.diff
? 64682.diff
? 66484.diff
? orbit-test1
? addressbook/libebook/libebook-1.2.pc
? addressbook/libebook/libebook.pc
? addressbook/libedata-book/libedata-book-1.2.pc
? addressbook/libedata-book/libedata-book.pc
? calendar/libecal/.e-cal-listener.c.swp
? calendar/libecal/libecal-1.2.pc
? calendar/libecal/libecal.pc
? calendar/libedata-cal/libedata-cal-1.2.pc
? calendar/libedata-cal/libedata-cal.pc
? calendar/libical/src/libicalss/icalssyacc.output
? libedataserver/libedataserver-1.2.pc
? libedataserver/libedataserver.pc
? po/1
? servers/groupwise/.e-gw-connection.h.swp
? servers/groupwise/libegroupwise.pc
? src/GNOME_Evolution_DataServer_1.2.server
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.338
diff -u -p -r1.338 ChangeLog
--- calendar/ChangeLog 30 Sep 2004 16:49:47 -0000 1.338
+++ calendar/ChangeLog 1 Oct 2004 10:21:16 -0000
@@ -1,3 +1,17 @@
+2004-10-01 Chenthill Palanisamy <pchenthill novell com>
+
+ Fixes #66484
+ * idl/Evolution-DataServer-Calendar.idl (CallStatus):
+ Added an error message "Unknown User".
+ * libecal/e-cal-types.h (ECalendarStatus):
+ Added a enum variable for the same error message
+ * libecal/e-cal-listener.c (convert_status)
+ * libecal/e-cal-view-listener.c (convert_status):
+ Mapped the new error message.
+ * libecal/e-cal.c (e_cal_get_error_message):
+ Return the proper string for the new error message.
+
+
2004-09-30 Chris Toshok <toshok ximian com>
* libecal/e-cal.c (get_factories): don't look for factories based
Index: calendar/backends/groupwise/e-cal-backend-groupwise.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/groupwise/e-cal-backend-groupwise.c,v
retrieving revision 1.96
diff -u -p -r1.96 e-cal-backend-groupwise.c
--- calendar/backends/groupwise/e-cal-backend-groupwise.c 23 Sep 2004 21:06:46 -0000 1.96
+++ calendar/backends/groupwise/e-cal-backend-groupwise.c 1 Oct 2004 10:21:16 -0000
@@ -1194,7 +1194,11 @@ e_cal_backend_groupwise_create_object (E
status = e_gw_connection_create_appointment (priv->cnc, priv->container_id, cbgw, comp, &uid_list);
if (status != E_GW_CONNECTION_STATUS_OK) {
g_object_unref (comp);
- return GNOME_Evolution_Calendar_OtherError;
+
+ if (status == E_GW_CONNECTION_STATUS_UNKNOWN_USER)
+ return GNOME_Evolution_Calendar_UnknownUser;
+ else
+ return GNOME_Evolution_Calendar_OtherError;
}
if (uid_list && (g_slist_length (uid_list) == 1)) {
Index: calendar/idl/Evolution-DataServer-Calendar.idl
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/idl/Evolution-DataServer-Calendar.idl,v
retrieving revision 1.5
diff -u -p -r1.5 Evolution-DataServer-Calendar.idl
--- calendar/idl/Evolution-DataServer-Calendar.idl 1 Mar 2004 15:45:57 -0000 1.5
+++ calendar/idl/Evolution-DataServer-Calendar.idl 1 Oct 2004 10:21:16 -0000
@@ -118,6 +118,7 @@ module Calendar {
UnsupportedAuthenticationMethod,
TLSNotAvailable,
NoSuchCal,
+ UnknownUser,
/* These can be returned for successful searches, but
indicate the result set was truncated */
Index: calendar/libecal/e-cal-listener.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-listener.c,v
retrieving revision 1.9
diff -u -p -r1.9 e-cal-listener.c
--- calendar/libecal/e-cal-listener.c 3 May 2004 14:13:55 -0000 1.9
+++ calendar/libecal/e-cal-listener.c 1 Oct 2004 10:21:17 -0000
@@ -89,6 +89,8 @@ convert_status (const GNOME_Evolution_Ca
return E_CALENDAR_STATUS_AUTHENTICATION_FAILED;
case GNOME_Evolution_Calendar_AuthenticationRequired:
return E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED;
+ case GNOME_Evolution_Calendar_UnknownUser:
+ return E_CALENDAR_STATUS_UNKNOWN_USER;
case GNOME_Evolution_Calendar_OtherError:
default:
return E_CALENDAR_STATUS_OTHER_ERROR;
Index: calendar/libecal/e-cal-types.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-types.h,v
retrieving revision 1.6
diff -u -p -r1.6 e-cal-types.h
--- calendar/libecal/e-cal-types.h 1 Jun 2004 14:03:06 -0000 1.6
+++ calendar/libecal/e-cal-types.h 1 Oct 2004 10:21:17 -0000
@@ -56,6 +56,7 @@ typedef enum {
E_CALENDAR_STATUS_URI_NOT_LOADED,
E_CALENDAR_STATUS_URI_ALREADY_LOADED,
E_CALENDAR_STATUS_PERMISSION_DENIED,
+ E_CALENDAR_STATUS_UNKNOWN_USER,
E_CALENDAR_STATUS_OBJECT_ID_ALREADY_EXISTS,
E_CALENDAR_STATUS_PROTOCOL_NOT_SUPPORTED,
E_CALENDAR_STATUS_CANCELLED,
Index: calendar/libecal/e-cal-view-listener.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-view-listener.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-cal-view-listener.c
--- calendar/libecal/e-cal-view-listener.c 27 Jan 2004 18:51:15 -0000 1.3
+++ calendar/libecal/e-cal-view-listener.c 1 Oct 2004 10:21:17 -0000
@@ -67,6 +67,8 @@ convert_status (const GNOME_Evolution_Ca
return E_CALENDAR_STATUS_AUTHENTICATION_FAILED;
case GNOME_Evolution_Calendar_AuthenticationRequired:
return E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED;
+ case GNOME_Evolution_Calendar_UnknownUser:
+ return E_CALENDAR_STATUS_UNKNOWN_USER;
case GNOME_Evolution_Calendar_OtherError:
default:
return E_CALENDAR_STATUS_OTHER_ERROR;
Index: calendar/libecal/e-cal.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal.c,v
retrieving revision 1.78
diff -u -p -r1.78 e-cal.c
--- calendar/libecal/e-cal.c 30 Sep 2004 16:49:48 -0000 1.78
+++ calendar/libecal/e-cal.c 1 Oct 2004 10:21:17 -0000
@@ -4297,6 +4297,8 @@ e_cal_get_error_message (ECalendarStatus
return _("URI already loaded");
case E_CALENDAR_STATUS_PERMISSION_DENIED :
return _("Permission denied");
+ case E_CALENDAR_STATUS_UNKNOWN_USER :
+ return _("Unknown User");
case E_CALENDAR_STATUS_OBJECT_ID_ALREADY_EXISTS :
return _("Object ID already exists");
case E_CALENDAR_STATUS_PROTOCOL_NOT_SUPPORTED :
Index: servers/groupwise/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/ChangeLog,v
retrieving revision 1.67
diff -u -p -r1.67 ChangeLog
--- servers/groupwise/ChangeLog 23 Sep 2004 16:45:29 -0000 1.67
+++ servers/groupwise/ChangeLog 1 Oct 2004 10:21:19 -0000
@@ -1,3 +1,13 @@
+2004-10-01 Chenthill Palanisamy <pchenthill novell com>
+
+ Fixes #66484
+ * e-gw-connection.[ch] (EGwConnectionStatus):
+ Added a enum variable for the code error User not
+ found error message from the server.
+ * e-gw-connection.c (e_gw_connection_parse_response_status),
+ (e_gw_connection_get_error_message):
+ Added the code 53505 and used the new enum variable.
+
2004-09-23 JP Rosevear <jpr novell com>
* Makefile.am: build versioned library and don't hard code pkg
Index: servers/groupwise/e-gw-connection.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-connection.c,v
retrieving revision 1.81
diff -u -p -r1.81 e-gw-connection.c
--- servers/groupwise/e-gw-connection.c 22 Sep 2004 16:41:07 -0000 1.81
+++ servers/groupwise/e-gw-connection.c 1 Oct 2004 10:21:19 -0000
@@ -64,6 +64,7 @@ e_gw_connection_parse_response_status (S
switch (soup_soap_parameter_get_int_value (subparam)) {
case 0 : return E_GW_CONNECTION_STATUS_OK;
case 59905 : return E_GW_CONNECTION_STATUS_BAD_PARAMETER;
+ case 53505 : return E_GW_CONNECTION_STATUS_UNKNOWN_USER;
/* FIXME: map all error codes */
}
@@ -84,6 +85,8 @@ e_gw_connection_get_error_message (EGwCo
return _("Invalid response from server");
case E_GW_CONNECTION_STATUS_OBJECT_NOT_FOUND :
return _("Object not found");
+ case E_GW_CONNECTION_STATUS_UNKNOWN_USER :
+ return _("Unknown User");
case E_GW_CONNECTION_STATUS_BAD_PARAMETER :
return _("Bad parameter");
case E_GW_CONNECTION_STATUS_OTHER :
Index: servers/groupwise/e-gw-connection.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-connection.h,v
retrieving revision 1.35
diff -u -p -r1.35 e-gw-connection.h
--- servers/groupwise/e-gw-connection.h 22 Sep 2004 16:41:07 -0000 1.35
+++ servers/groupwise/e-gw-connection.h 1 Oct 2004 10:21:19 -0000
@@ -60,6 +60,7 @@ typedef enum {
E_GW_CONNECTION_STATUS_INVALID_OBJECT,
E_GW_CONNECTION_STATUS_INVALID_RESPONSE,
E_GW_CONNECTION_STATUS_OBJECT_NOT_FOUND,
+ E_GW_CONNECTION_STATUS_UNKNOWN_USER,
E_GW_CONNECTION_STATUS_BAD_PARAMETER,
E_GW_CONNECTION_STATUS_OTHER,
E_GW_CONNECTION_STATUS_UNKNOWN
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]