[evolution-patches] Evolution Data Server warnings - all components
- From: Not Zed <notzed ximian com>
- To: asdf <evolution-patches lists ximian com>
- Subject: [evolution-patches] Evolution Data Server warnings - all components
- Date: Mon, 22 Aug 2005 18:16:10 +0800
Fixes almost all of the important warnings in eds. I skipped test
programs, some of imap4, and some in libical that couldn't easily be
fixed without adding dependencies.
Please check your relevent parts carefully, some of the code is 'fixed',
in ways which may change their behaviour, or don't fully implement the
apis where api's have changed.
Some of them are particularly nasty - everyone - please check the
warnings from gcc when you compile, before committing code.
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.294
diff -u -p -r1.294 ChangeLog
--- ChangeLog 22 Aug 2005 08:13:29 -0000 1.294
+++ ChangeLog 22 Aug 2005 10:14:15 -0000
@@ -1,3 +1,8 @@
+2005-08-22 Not Zed <NotZed Ximian com>
+
+ * libedataserver/e-xml-hash-utils.c (e_xmlhash_foreach_key): cast
+ the func to remove a warning.
+
2005-08-22 Shreyas Srinivasan <sshreyas novell com>
* configure.in: Build camel-docs.
Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/ChangeLog,v
retrieving revision 1.309
diff -u -p -r1.309 ChangeLog
--- addressbook/ChangeLog 18 Aug 2005 06:55:45 -0000 1.309
+++ addressbook/ChangeLog 22 Aug 2005 10:14:16 -0000
@@ -1,3 +1,13 @@
+2005-08-22 Not Zed <NotZed Ximian com>
+
+ * backends/groupwise/e-book-backend-groupwise.c
+ (e_book_backend_groupwise_get_contact_list): initialise contacts
+ to NULL.
+
+ * libebook/e-book-listener.c
+ (impl_BookListener_report_auth_required): fix the type of this
+ function to match the idl.
+
2005-08-18 Ross Burton <ross burtonini com>
* libedata-book/e-book-backend.c:
Index: addressbook/backends/groupwise/e-book-backend-groupwise.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/groupwise/e-book-backend-groupwise.c,v
retrieving revision 1.66
diff -u -p -r1.66 e-book-backend-groupwise.c
--- addressbook/backends/groupwise/e-book-backend-groupwise.c 5 Aug 2005 11:12:21 -0000 1.66
+++ addressbook/backends/groupwise/e-book-backend-groupwise.c 22 Aug 2005 10:14:17 -0000
@@ -1806,7 +1806,7 @@ e_book_backend_groupwise_get_contact_lis
{
GList *vcard_list;
int status;
- GList *gw_items, *contacts, *temp;
+ GList *gw_items, *contacts = NULL, *temp;
EContact *contact;
EBookBackendGroupwise *egwb;
gboolean match_needed;
Index: addressbook/libebook/e-book-listener.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-book-listener.c,v
retrieving revision 1.17
diff -u -p -r1.17 e-book-listener.c
--- addressbook/libebook/e-book-listener.c 6 Jul 2005 09:08:03 -0000 1.17
+++ addressbook/libebook/e-book-listener.c 22 Aug 2005 10:14:17 -0000
@@ -374,7 +374,6 @@ impl_BookListener_report_link_status (Po
static void
impl_BookListener_report_auth_required (PortableServer_Servant servant,
- const CORBA_boolean is_online,
CORBA_Environment *ev)
{
EBookListener *listener = E_BOOK_LISTENER (bonobo_object (servant));
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.506
diff -u -p -r1.506 ChangeLog
--- calendar/ChangeLog 21 Aug 2005 17:35:14 -0000 1.506
+++ calendar/ChangeLog 22 Aug 2005 10:14:18 -0000
@@ -1,3 +1,46 @@
+2005-08-22 Not Zed <NotZed Ximian com>
+
+ * backends/weather/e-weather-source.c (e_weather_source_new):
+ constify base. Include missing string.h.
+
+ * backends/weather/e-cal-backend-weather.c
+ (e_cal_backend_weather_open): constify uri.
+
+ * backends/contacts/e-cal-backend-contacts.c
+ (contacts_changed_cb): constify uid.
+
+ * backends/http/e-cal-backend-http.c
+ (e_cal_backend_http_get_timezone): constify zone.
+
+ * backends/groupwise/e-cal-backend-groupwise.c (get_deltas):
+ remove unused.
+ (set_container_id_with_count): fix this logic so it doesn't use an
+ unset container pointer.
+ (connect_to_server): remove unused.
+ (e_cal_backend_groupwise_get_static_capabilities): remove all the
+ unecessary backslashes.
+
+ * backends/file/e-cal-backend-file.c
+ (e_cal_backend_file_modify_object)
+ (remove_instance, e_cal_backend_file_remove_object): cast away
+ warnings.
+ (e_cal_backend_file_modify_object): fix function signature. no
+ idea what new_object should be set to.
+
+ * libedata-cal/e-cal-backend-cache.c
+ (e_cal_backend_cache_put_timezone): Cast away warnings.
+
+ * libecal/e-cal-component.c (ensure_alarm_properties_cb): pass a
+ string to icalproperty_set_description. Not sure if it's the
+ right one.
+ (get_attachment_list): use const char * for data.
+ (set_alarm_description_cb): use const for old_summary.
+ (SetAlarmDescriptionData): constify strings.
+
+ * libecal/e-cal.c (open_calendar): make parent_user const & remove
+ unused.
+ (e_cal_get_objects_for_uid): init kind_to_find always.
+
2005-08-21 Chenthill Palanisamy <pchenthill novell com>
Fixes #271969
Index: calendar/backends/contacts/e-cal-backend-contacts.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/contacts/e-cal-backend-contacts.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-cal-backend-contacts.c
--- calendar/backends/contacts/e-cal-backend-contacts.c 18 May 2005 08:06:31 -0000 1.21
+++ calendar/backends/contacts/e-cal-backend-contacts.c 22 Aug 2005 10:14:19 -0000
@@ -322,12 +322,12 @@ contacts_changed_cb (EBookView *book_vie
for (i = contacts; i; i = i->next) {
EContact *contact = E_CONTACT (i->data);
- char *uid = e_contact_get_const (contact, E_CONTACT_UID);
+ const char *uid = e_contact_get_const (contact, E_CONTACT_UID);
/* If no date is set, remove from list of tracked contacts */
if (!e_contact_get (contact, E_CONTACT_BIRTH_DATE) &&
!e_contact_get (contact, E_CONTACT_ANNIVERSARY)) {
- g_hash_table_remove (cbc->priv->tracked_contacts, uid);
+ g_hash_table_remove (cbc->priv->tracked_contacts, (char *)uid);
} else {
ContactRecord *cr = contact_record_new (cbc, contact);
g_hash_table_insert (cbc->priv->tracked_contacts, g_strdup (uid), cr);
Index: calendar/backends/file/e-cal-backend-file.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/file/e-cal-backend-file.c,v
retrieving revision 1.58
diff -u -p -r1.58 e-cal-backend-file.c
--- calendar/backends/file/e-cal-backend-file.c 21 Aug 2005 17:35:15 -0000 1.58
+++ calendar/backends/file/e-cal-backend-file.c 22 Aug 2005 10:14:19 -0000
@@ -1788,7 +1788,7 @@ remove_object_instance_cb (gpointer key,
static ECalBackendSyncStatus
e_cal_backend_file_modify_object (ECalBackendSync *backend, EDataCal *cal, const char *calobj,
- CalObjModType mod, char **old_object)
+ CalObjModType mod, char **old_object, char **new_object)
{
RemoveRecurrenceData rrdata;
ECalBackendFile *cbfile;
@@ -1863,7 +1863,7 @@ e_cal_backend_file_modify_object (ECalBa
return GNOME_Evolution_Calendar_Success;
}
- if (g_hash_table_lookup_extended (obj_data->recurrences, rid, &real_rid, &recurrence)) {
+ if (g_hash_table_lookup_extended (obj_data->recurrences, rid, (void **)&real_rid, (void **)&recurrence)) {
if (old_object)
*old_object = e_cal_component_get_as_string (recurrence);
@@ -1920,7 +1920,7 @@ e_cal_backend_file_modify_object (ECalBa
/* now deal with the detached recurrence */
if (g_hash_table_lookup_extended (obj_data->recurrences, rid,
- &real_rid, &recurrence)) {
+ (void **)&real_rid, (void **)&recurrence)) {
if (old_object)
*old_object = e_cal_component_get_as_string (recurrence);
@@ -1985,7 +1985,7 @@ remove_instance (ECalBackendFile *cbfile
if (!rid || !*rid)
return;
- if (g_hash_table_lookup_extended (obj_data->recurrences, rid, &hash_rid, &comp)) {
+ if (g_hash_table_lookup_extended (obj_data->recurrences, rid, (void **)&hash_rid, (void **)&comp)) {
/* remove the component from our data */
icalcomponent_remove_component (cbfile->priv->icalcomp,
e_cal_component_get_icalcomponent (comp));
@@ -2046,7 +2046,7 @@ e_cal_backend_file_remove_object (ECalBa
} else {
char *real_rid;
- if (g_hash_table_lookup_extended (obj_data->recurrences, rid, &real_rid, &comp))
+ if (g_hash_table_lookup_extended (obj_data->recurrences, rid, (void **)&real_rid, (void **)&comp))
*old_object = e_cal_component_get_as_string (comp);
}
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.162
diff -u -p -r1.162 e-cal-backend-groupwise.c
--- calendar/backends/groupwise/e-cal-backend-groupwise.c 17 Aug 2005 03:47:41 -0000 1.162
+++ calendar/backends/groupwise/e-cal-backend-groupwise.c 22 Aug 2005 10:14:20 -0000
@@ -225,8 +225,6 @@ get_deltas (gpointer handle)
GList *item_list, *total_list = NULL, *l;
GSList *cache_keys = NULL;
GPtrArray *uid_array = g_ptr_array_new ();
-
- char *comp_str;
char *time_string = NULL;
char t_str [100];
const char *serv_time;
@@ -715,10 +713,10 @@ static ECalBackendSyncStatus
set_container_id_with_count (ECalBackendGroupwise *cbgw)
{
ECalBackendGroupwisePrivate *priv;
- EGwContainer *our_container;
GList *container_list = NULL, *l;
EGwConnectionStatus status;
icalcomponent_kind kind;
+ ECalBackendSyncStatus res;
priv = cbgw->priv;
@@ -742,22 +740,22 @@ set_container_id_with_count (ECalBackend
if (status != E_GW_CONNECTION_STATUS_OK)
return GNOME_Evolution_Calendar_OtherError;
+ res = GNOME_Evolution_Calendar_ObjectNotFound;
for (l = container_list; l != NULL; l = l->next) {
EGwContainer *container = E_GW_CONTAINER (l->data);
const char *name = e_gw_container_get_name (container);
if (name && strcmp (name, "Calendar") == 0) {
- our_container = container;
+ priv->container_id = g_strdup (e_gw_container_get_id (container));
+ priv->total_count = e_gw_container_get_total_count (container);
+ res = GNOME_Evolution_Calendar_Success;
break;
}
}
- priv->container_id = g_strdup (e_gw_container_get_id (our_container));
- priv->total_count = e_gw_container_get_total_count (our_container);
-
e_gw_connection_free_container_list (container_list);
- return GNOME_Evolution_Calendar_Success;
+ return res;
}
static ECalBackendSyncStatus
@@ -768,7 +766,7 @@ connect_to_server (ECalBackendGroupwise
ESource *source;
const char *use_ssl;
char *http_uri;
- int permissions, flag;
+ int permissions;
GThread *thread;
GError *error = NULL;
char *parent_user = NULL;
@@ -1041,21 +1039,21 @@ e_cal_backend_groupwise_get_alarm_email_
static ECalBackendSyncStatus
e_cal_backend_groupwise_get_static_capabilities (ECalBackendSync *backend, EDataCal *cal, char **capabilities)
{
- *capabilities = g_strdup (CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS "," \
- CAL_STATIC_CAPABILITY_ONE_ALARM_ONLY "," \
- CAL_STATIC_CAPABILITY_REMOVE_ALARMS "," \
- CAL_STATIC_CAPABILITY_NO_THISANDPRIOR "," \
- CAL_STATIC_CAPABILITY_NO_THISANDFUTURE "," \
- CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK "," \
- CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR "," \
- CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS "," \
- CAL_STATIC_CAPABILITY_SAVE_SCHEDULES "," \
- CAL_STATIC_CAPABILITY_ORGANIZER_MUST_ACCEPT "," \
- CAL_STATIC_CAPABILITY_DELEGATE_SUPPORTED "," \
- CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY "," \
- CAL_STATIC_CAPABILITY_NO_ORGANIZER "," \
- CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER "," \
- CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING "," \
+ *capabilities = g_strdup (CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS ","
+ CAL_STATIC_CAPABILITY_ONE_ALARM_ONLY ","
+ CAL_STATIC_CAPABILITY_REMOVE_ALARMS ","
+ CAL_STATIC_CAPABILITY_NO_THISANDPRIOR ","
+ CAL_STATIC_CAPABILITY_NO_THISANDFUTURE ","
+ CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK ","
+ CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR ","
+ CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS ","
+ CAL_STATIC_CAPABILITY_SAVE_SCHEDULES ","
+ CAL_STATIC_CAPABILITY_ORGANIZER_MUST_ACCEPT ","
+ CAL_STATIC_CAPABILITY_DELEGATE_SUPPORTED ","
+ CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY ","
+ CAL_STATIC_CAPABILITY_NO_ORGANIZER ","
+ CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER ","
+ CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING ","
CAL_STATIC_CAPABILITY_SAVE_SCHEDULES);
return GNOME_Evolution_Calendar_Success;
Index: calendar/backends/http/e-cal-backend-http.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/http/e-cal-backend-http.c,v
retrieving revision 1.34
diff -u -p -r1.34 e-cal-backend-http.c
--- calendar/backends/http/e-cal-backend-http.c 6 Mar 2005 02:47:03 -0000 1.34
+++ calendar/backends/http/e-cal-backend-http.c 22 Aug 2005 10:14:20 -0000
@@ -651,7 +651,7 @@ e_cal_backend_http_get_timezone (ECalBac
{
ECalBackendHttp *cbhttp;
ECalBackendHttpPrivate *priv;
- icaltimezone *zone;
+ const icaltimezone *zone;
icalcomponent *icalcomp;
cbhttp = E_CAL_BACKEND_HTTP (backend);
@@ -667,7 +667,7 @@ e_cal_backend_http_get_timezone (ECalBac
return GNOME_Evolution_Calendar_ObjectNotFound;
}
- icalcomp = icaltimezone_get_component (zone);
+ icalcomp = icaltimezone_get_component ((icaltimezone *)zone);
if (!icalcomp)
return GNOME_Evolution_Calendar_InvalidObject;
Index: calendar/backends/weather/e-cal-backend-weather.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/weather/e-cal-backend-weather.c,v
retrieving revision 1.8
diff -u -p -r1.8 e-cal-backend-weather.c
--- calendar/backends/weather/e-cal-backend-weather.c 25 Feb 2005 09:59:48 -0000 1.8
+++ calendar/backends/weather/e-cal-backend-weather.c 22 Aug 2005 10:14:20 -0000
@@ -427,7 +427,7 @@ e_cal_backend_weather_open (ECalBackendS
{
ECalBackendWeather *cbw;
ECalBackendWeatherPrivate *priv;
- char *uri;
+ const char *uri;
cbw = E_CAL_BACKEND_WEATHER (backend);
priv = cbw->priv;
Index: calendar/backends/weather/e-weather-source.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/weather/e-weather-source.c,v
retrieving revision 1.2
diff -u -p -r1.2 e-weather-source.c
--- calendar/backends/weather/e-weather-source.c 27 Jul 2005 10:57:21 -0000 1.2
+++ calendar/backends/weather/e-weather-source.c 22 Aug 2005 10:14:20 -0000
@@ -21,6 +21,8 @@
#include "e-weather-source.h"
#include "e-weather-source-ccf.h"
+#include <string.h>
+
void
e_weather_source_parse (EWeatherSource *source, EWeatherSourceFinished done, gpointer data)
{
@@ -66,7 +68,8 @@ e_weather_source_get_type (void)
EWeatherSource* e_weather_source_new (const char *uri)
{
- char *base = uri + 10; /* skip weather:// */
+ const char *base = uri + 10; /* skip weather:// */
+
if (strncmp (base, "ccf/", 4) == 0)
return e_weather_source_ccf_new (base);
return NULL;
Index: calendar/libecal/e-cal-component.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-component.c,v
retrieving revision 1.15
diff -u -p -r1.15 e-cal-component.c
--- calendar/libecal/e-cal-component.c 10 Aug 2005 22:40:43 -0000 1.15
+++ calendar/libecal/e-cal-component.c 22 Aug 2005 10:14:21 -0000
@@ -1305,7 +1305,7 @@ ensure_alarm_properties_cb (gpointer key
while (xprop) {
str = icalproperty_get_x_name (xprop);
if (!strcmp (str, "X-EVOLUTION-NEEDS-DESCRIPTION")) {
- icalproperty_set_description (prop, priv->summary.prop);
+ icalproperty_set_description (prop, icalproperty_get_summary(priv->summary.prop));
icalcomponent_remove_property (alarm, xprop);
icalproperty_free (xprop);
@@ -1481,7 +1481,7 @@ get_attachment_list (GSList *attachment_
for (l = attachment_list; l; l = l->next) {
struct attachment *attachment;
- gchar *data;
+ const char *data;
attachment = l->data;
g_assert (attachment->attach != NULL);
@@ -1495,7 +1495,7 @@ get_attachment_list (GSList *attachment_
}
else
data = NULL;
- *al = g_slist_prepend (*al, data);
+ *al = g_slist_prepend (*al, (char *)data);
}
*al = g_slist_reverse (*al);
@@ -4106,8 +4106,8 @@ e_cal_component_get_summary (ECalCompone
}
typedef struct {
- char *old_summary;
- char *new_summary;
+ const char *old_summary;
+ const char *new_summary;
} SetAlarmDescriptionData;
static void
@@ -4117,7 +4117,7 @@ set_alarm_description_cb (gpointer key,
icalproperty *icalprop, *desc_prop;
SetAlarmDescriptionData *sadd;
gboolean changed = FALSE;
- char *old_summary = NULL;
+ const char *old_summary = NULL;
alarm = value;
sadd = user_data;
Index: calendar/libecal/e-cal.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal.c,v
retrieving revision 1.110
diff -u -p -r1.110 e-cal.c
--- calendar/libecal/e-cal.c 17 Aug 2005 03:58:47 -0000 1.110
+++ calendar/libecal/e-cal.c 22 Aug 2005 10:14:22 -0000
@@ -1617,7 +1617,8 @@ open_calendar (ECal *ecal, gboolean only
/* see if the backend needs authentication */
if ( (priv->mode != CAL_MODE_LOCAL) && e_source_get_property (priv->source, "auth")) {
- char *prompt, *key, *parent_source_url, *parent_user;
+ char *prompt, *key;
+ const char *parent_user;
priv->load_state = E_CAL_LOAD_AUTHENTICATING;
@@ -2994,6 +2995,7 @@ e_cal_get_objects_for_uid (ECal *ecal, c
break;
default:
/* ignore everything else */
+ kind_to_find = ICAL_NO_COMPONENT;
break;
}
Index: calendar/libedata-cal/e-cal-backend-cache.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libedata-cal/e-cal-backend-cache.c,v
retrieving revision 1.24
diff -u -p -r1.24 e-cal-backend-cache.c
--- calendar/libedata-cal/e-cal-backend-cache.c 8 Jul 2005 11:04:19 -0000 1.24
+++ calendar/libedata-cal/e-cal-backend-cache.c 22 Aug 2005 10:14:22 -0000
@@ -571,17 +571,17 @@ e_cal_backend_cache_put_timezone (ECalBa
priv = cache->priv;
/* add the timezone to the cache file */
- icalcomp = icaltimezone_get_component (zone);
+ icalcomp = icaltimezone_get_component ((icaltimezone *)zone);
if (!icalcomp)
return FALSE;
- if (e_file_cache_get_object (E_FILE_CACHE (cache), icaltimezone_get_tzid (zone))) {
+ if (e_file_cache_get_object (E_FILE_CACHE (cache), icaltimezone_get_tzid ((icaltimezone *)zone))) {
retval = e_file_cache_replace_object (E_FILE_CACHE (cache),
- icaltimezone_get_tzid (zone),
+ icaltimezone_get_tzid ((icaltimezone *)zone),
icalcomponent_as_ical_string (icalcomp));
} else {
retval = e_file_cache_add_object (E_FILE_CACHE (cache),
- icaltimezone_get_tzid (zone),
+ icaltimezone_get_tzid ((icaltimezone *)zone),
icalcomponent_as_ical_string (icalcomp));
}
@@ -589,7 +589,7 @@ e_cal_backend_cache_put_timezone (ECalBa
return FALSE;
/* check if the timezone already exists */
- if (g_hash_table_lookup_extended (priv->timezones, icaltimezone_get_tzid (zone),
+ if (g_hash_table_lookup_extended (priv->timezones, icaltimezone_get_tzid ((icaltimezone *)zone),
&orig_key, &orig_value)) {
/* remove the previous timezone */
g_hash_table_remove (priv->timezones, orig_key);
Index: calendar/libical/ChangeLog
===================================================================
RCS file: /cvs/gnome/libical/ChangeLog,v
retrieving revision 1.172
diff -u -p -r1.172 ChangeLog
--- calendar/libical/ChangeLog 12 Aug 2005 01:15:42 -0000 1.172
+++ calendar/libical/ChangeLog 22 Aug 2005 10:14:23 -0000
@@ -1,3 +1,27 @@
+2005-08-22 Not Zed <NotZed Ximian com>
+
+ * src/libicalvcal/icalvcal.c (rrule_parse_weekly_days): init e to
+ something before using it.
+ (rrule_parse_monthly_positions): init only_weekday to remove
+ spurious warning.
+ (rrule_parse_monthly_positions): init e to something.
+ (rule_prop): remove unused vars.
+ (dc_prop): remove unused vars.
+
+ * src/libicalss/icalfileset.c (icalfileset_begin_component)
+ (icalfileset_form_a_matched_recurrence_component)
+ (icalfilesetiter_to_next): () to remove warning.
+
+ * src/libical/icaltypes.c (icaltriggertype_from_string): set es
+ before using it.
+
+ * src/libical/icaltime.c (icaltime_from_timet_with_zone)
+ (icaltime_as_timet_with_zone, icaltime_convert_to_zone)
+ (icaltime_get_tzid): cast away warnings.
+
+ * src/libical/icalerror.c: fix this strange function to always
+ return something.
+
2005-08-12 Tor Lillqvist <tml novell com>
* src/libical/Makefile.am (libical_evolution_la_LIBADD): Add
Index: calendar/libical/src/libical/icalerror.c
===================================================================
RCS file: /cvs/gnome/libical/src/libical/icalerror.c,v
retrieving revision 1.14
diff -u -p -r1.14 icalerror.c
--- calendar/libical/src/libical/icalerror.c 13 Sep 2004 12:34:52 -0000 1.14
+++ calendar/libical/src/libical/icalerror.c 22 Aug 2005 10:14:23 -0000
@@ -158,17 +158,13 @@ static struct icalerror_string_map strin
icalerrorenum icalerror_error_from_string(const char* str){
-
- icalerrorenum e;
- int i = 0;
+ int i;
- for( i = 0; string_map[i].error != ICAL_NO_ERROR; i++){
- if (strcmp(string_map[i].str,str) == 0){
- e = string_map[i].error;
- }
- }
+ for( i = 0; string_map[i].error != ICAL_UNKNOWN_ERROR; i++)
+ if (strcmp(string_map[i].str,str) == 0)
+ break;
- return e;
+ return string_map[i].error;
}
icalerrorstate icalerror_supress(const char* error){
Index: calendar/libical/src/libical/icaltime.c
===================================================================
RCS file: /cvs/gnome/libical/src/libical/icaltime.c,v
retrieving revision 1.36
diff -u -p -r1.36 icaltime.c
--- calendar/libical/src/libical/icaltime.c 15 Mar 2005 01:48:04 -0000 1.36
+++ calendar/libical/src/libical/icaltime.c 22 Aug 2005 10:14:24 -0000
@@ -201,7 +201,7 @@ icaltime_from_timet_with_zone(const time
tt.zone = NULL;
/* Use our timezone functions to convert to the required timezone. */
- icaltimezone_convert_time (&tt, utc_zone, zone);
+ icaltimezone_convert_time (&tt, utc_zone, (icaltimezone *)zone);
tt.is_date = is_date;
@@ -385,7 +385,7 @@ time_t icaltime_as_timet_with_zone(const
local_tt.is_date = 0;
/* Use our timezone functions to convert to UTC. */
- icaltimezone_convert_time (&local_tt, zone, utc_zone);
+ icaltimezone_convert_time (&local_tt, (icaltimezone *)zone, utc_zone);
/* Copy the icaltimetype to a struct tm. */
memset (&stm, 0, sizeof (struct tm));
@@ -991,7 +991,7 @@ struct icaltimetype icaltime_convert_to_
/* If it's a floating time we don't want to adjust the time */
if (tt.zone != NULL) {
- icaltimezone_convert_time(&ret, tt.zone, zone);
+ icaltimezone_convert_time(&ret, (icaltimezone *)tt.zone, zone);
}
ret.zone = zone;
@@ -1014,7 +1014,7 @@ char *
icaltime_get_tzid(const struct icaltimetype t) {
if (t.zone != NULL) {
- return icaltimezone_get_tzid(t.zone);
+ return icaltimezone_get_tzid((icaltimezone *)t.zone);
} else {
return NULL;
}
Index: calendar/libical/src/libical/icaltypes.c
===================================================================
RCS file: /cvs/gnome/libical/src/libical/icaltypes.c,v
retrieving revision 1.15
diff -u -p -r1.15 icaltypes.c
--- calendar/libical/src/libical/icaltypes.c 21 Oct 2003 18:28:27 -0000 1.15
+++ calendar/libical/src/libical/icaltypes.c 22 Aug 2005 10:14:24 -0000
@@ -77,7 +77,7 @@ struct icaltriggertype icaltriggertype_f
struct icaltriggertype tr, null_tr;
- icalerrorstate es;
+ icalerrorstate es = ICAL_ERROR_DEFAULT;
icalerrorenum e;
tr.time= icaltime_null_time();
Index: calendar/libical/src/libicalss/icalfileset.c
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalfileset.c,v
retrieving revision 1.4
diff -u -p -r1.4 icalfileset.c
--- calendar/libical/src/libicalss/icalfileset.c 12 Jan 2005 08:45:34 -0000 1.4
+++ calendar/libical/src/libicalss/icalfileset.c 22 Aug 2005 10:14:24 -0000
@@ -772,7 +772,7 @@ icalsetiter icalfileset_begin_component(
/* add recurrence-id to the component
if there is a recurrence-id already, remove it, then add the new one */
- if (prop = icalcomponent_get_first_property(comp, ICAL_RECURRENCEID_PROPERTY))
+ if ((prop = icalcomponent_get_first_property(comp, ICAL_RECURRENCEID_PROPERTY)))
icalcomponent_remove_property(comp, prop);
icalcomponent_add_property(comp, icalproperty_new_recurrenceid(next));
@@ -837,7 +837,7 @@ icalcomponent* icalfileset_form_a_matche
/* add recurrence-id to the component
* if there is a recurrence-id already, remove it, then add the new one */
- if (prop = icalcomponent_get_first_property(comp, ICAL_RECURRENCEID_PROPERTY))
+ if ((prop = icalcomponent_get_first_property(comp, ICAL_RECURRENCEID_PROPERTY)))
icalcomponent_remove_property(comp, prop);
icalcomponent_add_property(comp, icalproperty_new_recurrenceid(next));
@@ -906,7 +906,7 @@ icalcomponent* icalfilesetiter_to_next(i
/* add recurrence-id to the component
* if there is a recurrence-id already, remove it, then add the new one */
- if (prop = icalcomponent_get_first_property(c, ICAL_RECURRENCEID_PROPERTY))
+ if ((prop = icalcomponent_get_first_property(c, ICAL_RECURRENCEID_PROPERTY)))
icalcomponent_remove_property(c, prop);
icalcomponent_add_property(c, icalproperty_new_recurrenceid(next));
Index: calendar/libical/src/libicalvcal/icalvcal.c
===================================================================
RCS file: /cvs/gnome/libical/src/libicalvcal/icalvcal.c,v
retrieving revision 1.7
diff -u -p -r1.7 icalvcal.c
--- calendar/libical/src/libicalvcal/icalvcal.c 4 Feb 2004 21:07:47 -0000 1.7
+++ calendar/libical/src/libicalvcal/icalvcal.c 22 Aug 2005 10:14:24 -0000
@@ -1009,7 +1009,7 @@ static char* rrule_parse_weekly_days (ch
return NULL;
for (i = 0; i < ICAL_BY_DAY_SIZE; i++) {
- char *e;
+ char *e = s;
int found_day, day;
found_day = -1;
@@ -1103,7 +1103,7 @@ static char* rrule_parse_monthly_positio
int occurrences[ICAL_BY_DAY_SIZE];
int found_weekdays[7] = { 0 };
int i, num_positions, elems, month_position, day;
- int num_weekdays, only_weekday;
+ int num_weekdays, only_weekday = 0;
char *e;
/* If we've already found an error, just return. */
@@ -1143,7 +1143,7 @@ static char* rrule_parse_monthly_positio
/* Now read the weekdays in. */
for (;;) {
- char *e;
+ char *e = s;
int found_day, day;
found_day = -1;
@@ -1312,10 +1312,7 @@ static char* rrule_parse_yearly_days (ch
void* rule_prop(int icaltype, VObject *object, icalcomponent *comp,
icalvcal_defaults *defaults)
{
- icalproperty_kind kind = (icalproperty_kind)icaltype;
icalproperty *prop = NULL;
- icalvalue *value;
- icalvalue_kind value_kind;
char *s, *p, *error_message = NULL;
const char *property_name;
int free_string;
@@ -1394,7 +1391,7 @@ void* dc_prop(int icaltype, VObject *obj
icalproperty *prop;
icalvalue *value;
icalvalue_kind value_kind;
- char *s,*t=0;
+ char *s;
int free_string;
Index: camel/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/ChangeLog,v
retrieving revision 1.2473
diff -u -p -r1.2473 ChangeLog
--- camel/ChangeLog 22 Aug 2005 02:52:28 -0000 1.2473
+++ camel/ChangeLog 22 Aug 2005 10:14:27 -0000
@@ -1,3 +1,19 @@
+2005-08-22 Not Zed <NotZed Ximian com>
+
+ * camel-store.c (camel_store_rename_folder): init folders and only
+ use it if set.
+
+ * camel-offline-journal.c (CAMEL_OFFLINE_JOURNAL_GET_CLASS):
+ move redefined macro to .h.
+
+ * camel-gpg-context.c (gpg_decrypt): cast args properly.
+
+ * camel-text-index.c (camel_text_index_validate): cast to int for
+ printf.
+
+ * camel-object.c (co_metadata_get): assign metalast to remove
+ spurious warning.
+
2005-08-19 Not Zed <NotZed Ximian com>
** See #312668.
Index: camel/camel-charset-map-private.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-charset-map-private.h,v
retrieving revision 1.6
diff -u -p -r1.6 camel-charset-map-private.h
--- camel/camel-charset-map-private.h 26 Apr 2005 12:04:32 -0000 1.6
+++ camel/camel-charset-map-private.h 22 Aug 2005 10:14:27 -0000
@@ -561,8 +561,8 @@ static const unsigned char m250[256] = {
};
struct {
- unsigned char *bits0;
- unsigned char *bits1;
+ const unsigned char *bits0;
+ const unsigned char *bits1;
} camel_charmap[256] = {
{ m000, m001, }, { m010, m011, }, { m020, 0, }, { m030, 0, }, { m040, m041, }, { m050, 0, }, { 0, 0, }, { 0, 0, },
{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, },
Index: camel/camel-gpg-context.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-gpg-context.c,v
retrieving revision 1.73
diff -u -p -r1.73 camel-gpg-context.c
--- camel/camel-gpg-context.c 19 Aug 2005 05:36:33 -0000 1.73
+++ camel/camel-gpg-context.c 22 Aug 2005 10:14:27 -0000
@@ -1629,7 +1629,7 @@ gpg_decrypt(CamelCipherContext *context,
int rv;
content = camel_medium_get_content_object((CamelMedium *)ipart);
- ct = camel_mime_part_get_content_type(content);
+ ct = camel_mime_part_get_content_type((CamelMimePart *)content);
/* Encrypted part (using our fake mime type) or PGP/Mime multipart */
if (camel_content_type_is(ct, "multipart", "encrypted")) {
mp = (CamelMultipart *) camel_medium_get_content_object ((CamelMedium *) ipart);
Index: camel/camel-object.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-object.c,v
retrieving revision 1.54
diff -u -p -r1.54 camel-object.c
--- camel/camel-object.c 16 Aug 2005 06:14:40 -0000 1.54
+++ camel/camel-object.c 22 Aug 2005 10:14:28 -0000
@@ -1695,7 +1695,7 @@ static CamelObjectMeta *
co_metadata_get(CamelObject *obj)
{
CamelHookPair *pair;
- CamelObjectMeta *meta = NULL, *metaout = NULL, *metalast;
+ CamelObjectMeta *meta = NULL, *metaout = NULL, *metalast = NULL;
pair = co_metadata_pair(obj, FALSE);
if (pair) {
@@ -1704,7 +1704,7 @@ co_metadata_get(CamelObject *obj)
while (meta) {
CamelObjectMeta *m;
- m = g_malloc(sizeof(*metalast) + strlen(meta->name));
+ m = g_malloc(sizeof(*m) + strlen(meta->name));
m->next = NULL;
strcpy(m->name, meta->name);
m->value = g_strdup(meta->value);
Index: camel/camel-offline-journal.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-offline-journal.c,v
retrieving revision 1.3
diff -u -p -r1.3 camel-offline-journal.c
--- camel/camel-offline-journal.c 13 May 2005 20:48:05 -0000 1.3
+++ camel/camel-offline-journal.c 22 Aug 2005 10:14:28 -0000
@@ -45,8 +45,6 @@
#define d(x) x
-#define CAMEL_OFFLINE_JOURNAL_GET_CLASS(o) (CAMEL_OFFLINE_JOURNAL_CLASS (CAMEL_OBJECT_GET_CLASS (o)))
-
static void camel_offline_journal_class_init (CamelOfflineJournalClass *klass);
static void camel_offline_journal_init (CamelOfflineJournal *journal, CamelOfflineJournalClass *klass);
static void camel_offline_journal_finalize (CamelObject *object);
@@ -99,7 +97,6 @@ camel_offline_journal_finalize (CamelObj
while ((entry = e_dlist_remhead (&journal->queue)))
CAMEL_OFFLINE_JOURNAL_GET_CLASS (journal)->entry_free (journal, entry);
}
-
/**
* camel_offline_journal_construct:
Index: camel/camel-offline-journal.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-offline-journal.h,v
retrieving revision 1.1
diff -u -p -r1.1 camel-offline-journal.h
--- camel/camel-offline-journal.h 6 Jan 2005 21:18:30 -0000 1.1
+++ camel/camel-offline-journal.h 22 Aug 2005 10:14:28 -0000
@@ -42,7 +42,7 @@ extern "C" {
#define CAMEL_OFFLINE_JOURNAL_CLASS(klass) (CAMEL_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_OFFLINE_JOURNAL, CamelOfflineJournalClass))
#define CAMEL_IS_OFFLINE_JOURNAL(obj) (CAMEL_CHECK_TYPE ((obj), CAMEL_TYPE_OFFLINE_JOURNAL))
#define CAMEL_IS_OFFLINE_JOURNAL_CLASS(klass) (CAMEL_CHECK_CLASS_TYPE ((klass), CAMEL_TYPE_OFFLINE_JOURNAL))
-#define CAMEL_OFFLINE_JOURNAL_GET_CLASS(obj) (CAMEL_CHECK_GET_CLASS ((obj), CAMEL_TYPE_OFFLINE_JOURNAL, CamelOfflineJournalClass))
+#define CAMEL_OFFLINE_JOURNAL_GET_CLASS(o) (CAMEL_OFFLINE_JOURNAL_CLASS (CAMEL_OBJECT_GET_CLASS (o)))
typedef struct _CamelOfflineJournal CamelOfflineJournal;
typedef struct _CamelOfflineJournalClass CamelOfflineJournalClass;
Index: camel/camel-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-store.c,v
retrieving revision 1.169
diff -u -p -r1.169 camel-store.c
--- camel/camel-store.c 10 Aug 2005 02:05:39 -0000 1.169
+++ camel/camel-store.c 22 Aug 2005 10:14:28 -0000
@@ -439,7 +439,7 @@ camel_store_rename_folder (CamelStore *s
{
CamelFolder *folder;
int i, oldlen, namelen;
- GPtrArray *folders;
+ GPtrArray *folders = NULL;
char *old_name;
d(printf("store rename folder %s '%s' '%s'\n", ((CamelService *)store)->url->protocol, old_name, new_name));
@@ -486,7 +486,7 @@ camel_store_rename_folder (CamelStore *s
CS_CLASS (store)->rename_folder (store, old_name, new_name, ex);
/* If it worked, update all open folders/unlock them */
- if (!camel_exception_is_set(ex)) {
+ if (folders && !camel_exception_is_set(ex)) {
guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE;
CamelRenameInfo reninfo;
Index: camel/camel-text-index.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-text-index.c,v
retrieving revision 1.21
diff -u -p -r1.21 camel-text-index.c
--- camel/camel-text-index.c 17 Aug 2005 14:54:42 -0000 1.21
+++ camel/camel-text-index.c 22 Aug 2005 10:14:29 -0000
@@ -1337,7 +1337,7 @@ camel_text_index_validate(CamelTextIndex
printf("Warning, read failed for word '%s', at data '%d'\n", word, data);
data = 0;
} else {
- printf("(%d)\n", count);
+ printf("(%d)\n", (int)count);
g_free(records);
}
}
Index: camel/providers/groupwise/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/ChangeLog,v
retrieving revision 1.98
diff -u -p -r1.98 ChangeLog
--- camel/providers/groupwise/ChangeLog 22 Aug 2005 06:23:07 -0000 1.98
+++ camel/providers/groupwise/ChangeLog 22 Aug 2005 10:14:29 -0000
@@ -1,3 +1,21 @@
+2005-08-22 Not Zed <NotZed Ximian com>
+
+ * camel-groupwise-summary.c (gw_info_set_flags): return FALSE if
+ no flags were set.
+
+ * camel-groupwise-store.c (groupwise_get_folder): remove unused session.
+ (groupwise_get_folder_info): comment out unused msg.
+
+ * camel-groupwise-folder.c (move_to_mailbox): ugh, take an
+ exception argument, don't just make one up, and then not
+ initialise it!
+ (move_to_junk): same.
+ (gw_update_cache): initialise type.
+ (gw_update_summary): same.
+ (groupwise_folder_item_to_msg): use the right type for
+ container_id.
+ (groupwise_folder_item_to_msg): dont unref the as-yet-unset part.
+
2005-08-22 Parthasarathi Susarla <sparthasarathi novell com>
* camel-groupwise-store.c:
Index: camel/providers/groupwise/camel-groupwise-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-folder.c,v
retrieving revision 1.79
diff -u -p -r1.79 camel-groupwise-folder.c
--- camel/providers/groupwise/camel-groupwise-folder.c 19 Aug 2005 07:20:20 -0000 1.79
+++ camel/providers/groupwise/camel-groupwise-folder.c 22 Aug 2005 10:14:30 -0000
@@ -492,11 +492,10 @@ update_junk_list (CamelStore *store, Cam
}
static void
-move_to_mailbox (CamelFolder *folder, CamelMessageInfo *info)
+move_to_mailbox (CamelFolder *folder, CamelMessageInfo *info, CamelException *ex)
{
CamelFolder *dest;
GPtrArray *uids;
- CamelException *ex;
const char *uid = camel_message_info_uid (info);
uids = g_ptr_array_new ();
@@ -512,18 +511,17 @@ move_to_mailbox (CamelFolder *folder, Ca
}
static void
-move_to_junk (CamelFolder *folder, CamelMessageInfo *info)
+move_to_junk (CamelFolder *folder, CamelMessageInfo *info, CamelException *ex)
{
CamelFolder *dest;
CamelFolderInfo *fi;
GPtrArray *uids;
- CamelException *ex;
const char *uid = camel_message_info_uid (info);
uids = g_ptr_array_new ();
g_ptr_array_add (uids, (gpointer) uid);
- dest = camel_store_get_folder (folder->parent_store, JUNK_FOLDER, 0, NULL);
+ dest = camel_store_get_folder (folder->parent_store, JUNK_FOLDER, 0, ex);
if (dest)
groupwise_transfer_messages_to (folder, uids, dest, NULL, TRUE, ex);
else {
@@ -573,9 +571,9 @@ groupwise_sync (CamelFolder *folder, gbo
flags = camel_message_info_flags (info);
if ((flags & CAMEL_MESSAGE_JUNK) && !(flags & CAMEL_GW_MESSAGE_JUNK)) /*marked a message junk*/
- move_to_junk (folder, info);
+ move_to_junk (folder, info, ex);
else if ((flags & CAMEL_MESSAGE_JUNK) && (flags & CAMEL_GW_MESSAGE_JUNK)) /*message was marked as junk, now unjunk*/
- move_to_mailbox (folder, info);
+ move_to_mailbox (folder, info, ex);
if (gw_info && (gw_info->info.flags & CAMEL_MESSAGE_FOLDER_FLAGGED)) {
do_flags_diff (&diff, gw_info->server_flags, gw_info->info.flags);
@@ -939,7 +937,7 @@ gw_update_cache ( CamelFolder *folder, G
for ( ; item_list != NULL ; item_list = g_list_next (item_list) ) {
EGwItem *temp_item = (EGwItem *)item_list->data;
EGwItem *item;
- EGwItemType type;
+ EGwItemType type = E_GW_ITEM_TYPE_UNKNOWN;
EGwItemOrganizer *org;
char *temp_date = NULL;
const char *id;
@@ -1130,7 +1128,7 @@ gw_update_summary ( CamelFolder *folder,
for ( ; item_list != NULL ; item_list = g_list_next (item_list) ) {
EGwItem *item = (EGwItem *)item_list->data;
- EGwItemType type;
+ EGwItemType type = E_GW_ITEM_TYPE_UNKNOWN;
EGwItemOrganizer *org;
char *temp_date = NULL;
const char *id;
@@ -1261,7 +1259,7 @@ groupwise_folder_item_to_msg( CamelFolde
CamelMimeMessage *msg = NULL;
CamelGroupwiseStore *gw_store = CAMEL_GROUPWISE_STORE(folder->parent_store);
CamelGroupwiseStorePrivate *priv = gw_store->priv;
- char *container_id = NULL;
+ const char *container_id;
GSList *attach_list = NULL;
EGwItemType type;
EGwConnectionStatus status;
@@ -1364,7 +1362,6 @@ groupwise_folder_item_to_msg( CamelFolde
status = e_gw_connection_get_item (cnc, container_id, attach->id, "default distribution recipient message attachments subject notification created recipientStatus status", &temp_item);
if (status != E_GW_CONNECTION_STATUS_OK) {
g_warning ("Could not get attachment\n");
- camel_object_unref (part);
continue;
}
temp_msg = groupwise_folder_item_to_msg(folder, temp_item, ex);
Index: camel/providers/groupwise/camel-groupwise-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-store.c,v
retrieving revision 1.66
diff -u -p -r1.66 camel-groupwise-store.c
--- camel/providers/groupwise/camel-groupwise-store.c 22 Aug 2005 06:23:07 -0000 1.66
+++ camel/providers/groupwise/camel-groupwise-store.c 22 Aug 2005 10:14:30 -0000
@@ -439,7 +439,6 @@ groupwise_get_folder (CamelStore *store,
{
CamelGroupwiseStore *gw_store = CAMEL_GROUPWISE_STORE (store);
CamelGroupwiseStorePrivate *priv = gw_store->priv;
- CamelSession *session = camel_service_get_session (CAMEL_SERVICE (store));
CamelFolder *folder;
CamelGroupwiseSummary *summary;
char *container_id, *folder_dir, *storage_path;
@@ -624,7 +623,7 @@ groupwise_get_folder_info (CamelStore *s
const char *url, *top_folder, *temp_url;
char *folder_real = NULL;
CamelFolderInfo *info = NULL;
- struct _store_folder_refresh *msg;
+ /*struct _store_folder_refresh *msg;*/
if (top && groupwise_is_system_folder (top))
return groupwise_build_folder_info (groupwise_store, NULL, top );
Index: camel/providers/groupwise/camel-groupwise-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-summary.c,v
retrieving revision 1.7
diff -u -p -r1.7 camel-groupwise-summary.c
--- camel/providers/groupwise/camel-groupwise-summary.c 17 Aug 2005 14:54:43 -0000 1.7
+++ camel/providers/groupwise/camel-groupwise-summary.c 22 Aug 2005 10:14:30 -0000
@@ -248,7 +248,7 @@ gw_info_set_flags (CamelMessageInfo *inf
old = mi->flags;
/* we don't set flags which aren't appropriate for the folder*/
if ((set == (CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_JUNK_LEARN|CAMEL_MESSAGE_SEEN)) && (old & CAMEL_GW_MESSAGE_JUNK))
- return ;
+ return FALSE;
mi->flags = (old & ~flags) | (set & flags);
if (old != mi->flags) {
Index: camel/providers/imap4/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/ChangeLog,v
retrieving revision 1.20
diff -u -p -r1.20 ChangeLog
--- camel/providers/imap4/ChangeLog 12 Aug 2005 23:51:34 -0000 1.20
+++ camel/providers/imap4/ChangeLog 22 Aug 2005 10:14:30 -0000
@@ -1,3 +1,13 @@
+2005-08-22 Not Zed <NotZed Ximian com>
+
+ * camel-imap4-utils.c (camel_imap4_utils_set_unexpected_token_error):
+
+ * camel-imap4-stream.c (camel_imap4_stream_next_token):
+
+ * camel-imap4-command.c (imap4_command_append_string): fix type to
+ printfs.
+ (camel_imap4_command_newv, unexpected_token):
+
2005-08-12 Tor Lillqvist <tml novell com>
* Makefile.am: Use NO_UNDEFINED. Link with libcamel-provider,
Index: camel/providers/imap4/camel-imap4-command.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-command.c,v
retrieving revision 1.7
diff -u -p -r1.7 camel-imap4-command.c
--- camel/providers/imap4/camel-imap4-command.c 19 Jan 2005 16:34:19 -0000 1.7
+++ camel/providers/imap4/camel-imap4-command.c 22 Aug 2005 10:14:30 -0000
@@ -157,14 +157,14 @@ imap4_command_append_string (CamelIMAP4E
case IMAP4_STRING_LITERAL:
if (engine->capa & CAMEL_IMAP4_CAPABILITY_LITERALPLUS) {
/* we have to send a literal, but the server supports LITERAL+ so use that */
- g_string_append_printf (str, "{%u+}\r\n%s", strlen (string), string);
+ g_string_append_printf (str, "{%u+}\r\n%s", (unsigned int)strlen(string), string);
} else {
/* we have to make it a literal */
literal = g_new (CamelIMAP4Literal, 1);
literal->type = CAMEL_IMAP4_LITERAL_STRING;
literal->literal.string = g_strdup (string);
- g_string_append_printf (str, "{%u}\r\n", strlen (string));
+ g_string_append_printf (str, "{%u}\r\n", (unsigned int)strlen(string));
(*tail)->buffer = g_strdup (str->str);
(*tail)->buflen = str->len;
@@ -253,7 +253,7 @@ camel_imap4_command_newv (CamelIMAP4Engi
/* FIXME: take advantage of LITERAL+? */
len = camel_imap4_literal_length (literal);
- g_string_append_printf (str, "{%u}\r\n", len);
+ g_string_append_printf (str, "{%u}\r\n", (unsigned int)len);
tail->buffer = g_strdup (str->str);
tail->buflen = str->len;
@@ -491,7 +491,7 @@ unexpected_token (camel_imap4_token_t *t
fprintf (stderr, "\"%s\"", token->v.qstring);
break;
case CAMEL_IMAP4_TOKEN_LITERAL:
- fprintf (stderr, "{%u}", token->v.literal);
+ fprintf (stderr, "{%u}", (unsigned int)token->v.literal);
break;
default:
fprintf (stderr, "%c", (unsigned char) (token->token & 0xff));
Index: camel/providers/imap4/camel-imap4-stream.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-stream.c,v
retrieving revision 1.11
diff -u -p -r1.11 camel-imap4-stream.c
--- camel/providers/imap4/camel-imap4-stream.c 3 Feb 2005 20:35:57 -0000 1.11
+++ camel/providers/imap4/camel-imap4-stream.c 22 Aug 2005 10:14:30 -0000
@@ -469,7 +469,7 @@ camel_imap4_stream_next_token (CamelIMAP
token->token = CAMEL_IMAP4_TOKEN_LITERAL;
token->v.literal = literal;
- d(fprintf (stderr, "token: {%u}\n", literal));
+ d(fprintf (stderr, "token: {%u}\n", (unsigned int)literal));
stream->mode = CAMEL_IMAP4_STREAM_MODE_LITERAL;
stream->literal = literal;
Index: camel/providers/imap4/camel-imap4-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-utils.c,v
retrieving revision 1.14
diff -u -p -r1.14 camel-imap4-utils.c
--- camel/providers/imap4/camel-imap4-utils.c 19 Jan 2005 18:39:37 -0000 1.14
+++ camel/providers/imap4/camel-imap4-utils.c 22 Aug 2005 10:14:31 -0000
@@ -382,7 +382,7 @@ camel_imap4_utils_set_unexpected_token_e
g_string_append (errmsg, token->v.qstring);
break;
case CAMEL_IMAP4_TOKEN_LITERAL:
- g_string_append_printf (errmsg, "{%u}", token->v.literal);
+ g_string_append_printf (errmsg, "{%u}", (unsigned int)token->v.literal);
break;
case CAMEL_IMAP4_TOKEN_NUMBER:
g_string_append_printf (errmsg, "%u", token->v.number);
Index: camel/providers/local/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/local/ChangeLog,v
retrieving revision 1.12
diff -u -p -r1.12 ChangeLog
--- camel/providers/local/ChangeLog 15 Aug 2005 03:22:39 -0000 1.12
+++ camel/providers/local/ChangeLog 22 Aug 2005 10:14:31 -0000
@@ -1,3 +1,8 @@
+2005-08-22 Not Zed <NotZed Ximian com>
+
+ * camel-mbox-summary.c (mbox_summary_sync_quick): removed some
+ unecessary debug.
+
2005-08-12 Not Zed <NotZed Ximian com>
* camel-local-folder.c (camel_local_folder_construct): dont sync
Index: camel/providers/local/camel-mbox-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/local/camel-mbox-summary.c,v
retrieving revision 1.53
diff -u -p -r1.53 camel-mbox-summary.c
--- camel/providers/local/camel-mbox-summary.c 21 Mar 2005 03:37:18 -0000 1.53
+++ camel/providers/local/camel-mbox-summary.c 22 Aug 2005 10:14:31 -0000
@@ -759,8 +759,6 @@ mbox_summary_sync_quick(CamelMboxSummary
xevtmp = camel_header_unfold(xevnew);
/* the raw header contains a leading ' ', so (dis)count that too */
if (strlen(xev)-1 != strlen(xevtmp)) {
- printf ("strlen(xev)-1 = %d; strlen(xevtmp) = %d\n", strlen(xev)-1, strlen(xevtmp));
- printf ("xev='%s'; xevtmp='%s'\n", xev, xevtmp);
g_free(xevnew);
g_free(xevtmp);
g_warning("Hmm, the xev headers shouldn't have changed size, but they did");
Index: camel/providers/nntp/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/nntp/ChangeLog,v
retrieving revision 1.8
diff -u -p -r1.8 ChangeLog
--- camel/providers/nntp/ChangeLog 12 Aug 2005 23:51:35 -0000 1.8
+++ camel/providers/nntp/ChangeLog 22 Aug 2005 10:14:31 -0000
@@ -1,3 +1,7 @@
+2005-08-22 Not Zed <NotZed Ximian com>
+
+ * camel-nntp-stream.c (stream_read): cast print args to int.
+
2005-08-12 Tor Lillqvist <tml novell com>
* Makefile.am: Use NO_UNDEFINED. Link with libcamel-provider,
Index: camel/providers/nntp/camel-nntp-stream.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/nntp/camel-nntp-stream.c,v
retrieving revision 1.4
diff -u -p -r1.4 camel-nntp-stream.c
--- camel/providers/nntp/camel-nntp-stream.c 1 Dec 2004 03:07:51 -0000 1.4
+++ camel/providers/nntp/camel-nntp-stream.c 22 Aug 2005 10:14:31 -0000
@@ -104,7 +104,7 @@ stream_read(CamelStream *stream, char *b
is->ptr = p+3;
is->mode = CAMEL_NNTP_STREAM_EOD;
is->state = 0;
- dd(printf("NNTP_STREAM_READ(%d):\n%.*s\n", o-buffer, o-buffer, buffer));
+ dd(printf("NNTP_STREAM_READ(%d):\n%.*s\n", (int)(o-buffer), (int)(o-buffer), buffer));
return o-buffer;
}
p++;
@@ -137,7 +137,7 @@ stream_read(CamelStream *stream, char *b
is->ptr = p;
is->state = state;
- dd(printf("NNTP_STREAM_READ(%d):\n%.*s\n", o-buffer, o-buffer, buffer));
+ dd(printf("NNTP_STREAM_READ(%d):\n%.*s\n", (int)(o-buffer), (int)(o-buffer), buffer));
return o-buffer;
}
Index: camel/providers/pop3/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/pop3/ChangeLog,v
retrieving revision 1.4
diff -u -p -r1.4 ChangeLog
--- camel/providers/pop3/ChangeLog 12 Aug 2005 23:51:35 -0000 1.4
+++ camel/providers/pop3/ChangeLog 22 Aug 2005 10:14:31 -0000
@@ -1,3 +1,8 @@
+2005-08-22 Not Zed <NotZed Ximian com>
+
+ * camel-pop3-stream.c: fix some debug printfs to use
+ the right sized length.
+
2005-08-12 Tor Lillqvist <tml novell com>
* Makefile.am: Use NO_UNDEFINED. Link with libcamel-provider,
Index: camel/providers/pop3/camel-pop3-stream.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/pop3/camel-pop3-stream.c,v
retrieving revision 1.3
diff -u -p -r1.3 camel-pop3-stream.c
--- camel/providers/pop3/camel-pop3-stream.c 24 Feb 2003 20:30:00 -0000 1.3
+++ camel/providers/pop3/camel-pop3-stream.c 22 Aug 2005 10:14:31 -0000
@@ -106,7 +106,7 @@ stream_read(CamelStream *stream, char *b
is->ptr = p+3;
is->mode = CAMEL_POP3_STREAM_EOD;
is->state = 0;
- dd(printf("POP3_STREAM_READ(%d):\n%.*s\n", o-buffer, o-buffer, buffer));
+ dd(printf("POP3_STREAM_READ(%d):\n%.*s\n", (int)(o-buffer), (int)(o-buffer), buffer));
return o-buffer;
}
p++;
@@ -139,7 +139,7 @@ stream_read(CamelStream *stream, char *b
is->ptr = p;
is->state = state;
- dd(printf("POP3_STREAM_READ(%d):\n%.*s\n", o-buffer, o-buffer, buffer));
+ dd(printf("POP3_STREAM_READ(%d):\n%.*s\n", (int)(o-buffer), (int)(o-buffer), buffer));
return o-buffer;
}
@@ -150,9 +150,9 @@ stream_write(CamelStream *stream, const
CamelPOP3Stream *is = (CamelPOP3Stream *)stream;
if (strncmp (buffer, "PASS ", 5) != 0)
- dd(printf("POP3_STREAM_WRITE(%d):\n%.*s\n", n, (int)n, buffer));
+ dd(printf("POP3_STREAM_WRITE(%d):\n%.*s\n", (int)n, (int)n, buffer));
else
- dd(printf("POP3_STREAM_WRITE(%d):\nPASS xxxxxxxx\n", n));
+ dd(printf("POP3_STREAM_WRITE(%d):\nPASS xxxxxxxx\n", (int)n));
return camel_stream_write(is->source, buffer, n);
}
Index: libedataserver/e-xml-hash-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-xml-hash-utils.c,v
retrieving revision 1.8
diff -u -p -r1.8 e-xml-hash-utils.c
--- libedataserver/e-xml-hash-utils.c 21 Aug 2005 17:35:14 -0000 1.8
+++ libedataserver/e-xml-hash-utils.c 22 Aug 2005 10:14:32 -0000
@@ -325,7 +325,7 @@ e_xmlhash_foreach_key_remove (EXmlHash *
g_return_if_fail (hash != NULL);
g_return_if_fail (func != NULL);
- g_hash_table_foreach_remove (hash->objects, func, user_data);
+ g_hash_table_foreach_remove (hash->objects, (GHRFunc)func, user_data);
}
/**
Index: libedataserverui/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/ChangeLog,v
retrieving revision 1.60
diff -u -p -r1.60 ChangeLog
--- libedataserverui/ChangeLog 17 Aug 2005 11:18:13 -0000 1.60
+++ libedataserverui/ChangeLog 22 Aug 2005 10:14:32 -0000
@@ -1,3 +1,8 @@
+2005-08-22 Not Zed <NotZed Ximian com>
+
+ * e-name-selector-entry.c (find_existing_completion): assign
+ best_field to remove spurious warning.
+
2005-08-17 Devashish Sharma <sdevashish novell com>
* e-name-selector-entry.c (completion_match_selected): automatically
Index: libedataserverui/e-name-selector-entry.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-name-selector-entry.c,v
retrieving revision 1.23
diff -u -p -r1.23 e-name-selector-entry.c
--- libedataserverui/e-name-selector-entry.c 17 Aug 2005 11:18:13 -0000 1.23
+++ libedataserverui/e-name-selector-entry.c 22 Aug 2005 10:14:33 -0000
@@ -609,7 +609,7 @@ find_existing_completion (ENameSelectorE
GtkTreeIter iter;
EContact *best_contact = NULL;
gint best_field_rank = G_MAXINT;
- EContactField best_field;
+ EContactField best_field = 0;
gint cue_len;
g_assert (cue_str);
Index: servers/exchange/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/ChangeLog,v
retrieving revision 1.25
diff -u -p -r1.25 ChangeLog
--- servers/exchange/ChangeLog 17 Aug 2005 11:39:39 -0000 1.25
+++ servers/exchange/ChangeLog 22 Aug 2005 10:14:33 -0000
@@ -1,3 +1,8 @@
+2005-08-22 Not Zed <NotZed Ximian com>
+
+ * storage/exchange-esource.c (is_offline): provide a proper c
+ prototype for this, () is not pre-iso-c.
+
2005-08-17 Sarfraaz Ahmed <asarfraaz novell com>
* storage/exchange-account.c (exchange_account_get_folder): Lookup on
Index: servers/exchange/storage/exchange-esource.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/exchange-esource.c,v
retrieving revision 1.4
diff -u -p -r1.4 exchange-esource.c
--- servers/exchange/storage/exchange-esource.c 16 Aug 2005 12:28:39 -0000 1.4
+++ servers/exchange/storage/exchange-esource.c 22 Aug 2005 10:14:33 -0000
@@ -30,7 +30,7 @@
#include <stdlib.h>
#include <string.h>
-static gboolean is_offline ();
+static gboolean is_offline (void);
void
add_folder_esource (ExchangeAccount *account,
@@ -288,7 +288,7 @@ remove_folder_esource (ExchangeAccount *
}
static gboolean
-is_offline ()
+is_offline (void)
{
GConfClient *client;
GConfValue *value;
Index: servers/groupwise/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/ChangeLog,v
retrieving revision 1.160
diff -u -p -r1.160 ChangeLog
--- servers/groupwise/ChangeLog 13 Aug 2005 02:33:16 -0000 1.160
+++ servers/groupwise/ChangeLog 22 Aug 2005 10:14:33 -0000
@@ -1,3 +1,8 @@
+2005-08-22 Not Zed <NotZed Ximian com>
+
+ * e-gw-item.c (e_gw_item_append_to_soap_message): cast strlen to
+ int for printf.
+
2005-08-13 Tor Lillqvist <tml novell com>
* Makefile.am: Use NO_UNDEFINED.
Index: servers/groupwise/e-gw-item.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-item.c,v
retrieving revision 1.93
diff -u -p -r1.93 e-gw-item.c
--- servers/groupwise/e-gw-item.c 6 Aug 2005 11:26:31 -0000 1.93
+++ servers/groupwise/e-gw-item.c 22 Aug 2005 10:14:34 -0000
@@ -3076,7 +3076,7 @@ e_gw_item_append_to_soap_message (EGwIte
char *str_len ;
str = soup_base64_encode (priv->message, strlen (priv->message));
- str_len = g_strdup_printf ("%d", strlen (str));
+ str_len = g_strdup_printf ("%d", (int)strlen (str));
soup_soap_message_start_element (msg, "part", NULL, NULL);
soup_soap_message_add_attribute (msg, "length", str_len, NULL, NULL);
soup_soap_message_add_attribute (msg, "contentType", priv->content_type, NULL, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
