[evolution-patches] evo + eds warnings patches
- From: Not Zed <notzed ximian com>
- To: asdf <evolution-patches lists ximian com>
- Subject: [evolution-patches] evo + eds warnings patches
- Date: Tue, 23 Aug 2005 14:58:19 +0800
This contains an updated eds patch - two minor changes. I will probably
commit today due to a total lack of interest in anybody looking at the
original one.
And a warning patch for evolution. Some is a bit more than just fixing
warnings, and I added some myself - the calendar code calling em-utils
functions is just not on, I pointed this out weeks ago too, and it still
isn't fixed.
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 23 Aug 2005 06:56:03 -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 23 Aug 2005 06:56:05 -0000
@@ -1,3 +1,18 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * libebook/e-contact.h (EContactPhoto): use gsize not int for the
+ length.
+
+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 23 Aug 2005 06:56:06 -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 23 Aug 2005 06:56:06 -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: addressbook/libebook/e-contact.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-contact.h,v
retrieving revision 1.20
diff -u -p -r1.20 e-contact.h
--- addressbook/libebook/e-contact.h 11 Jul 2005 08:08:04 -0000 1.20
+++ addressbook/libebook/e-contact.h 23 Aug 2005 06:56:06 -0000
@@ -212,7 +212,7 @@ typedef struct {
} EContactName;
typedef struct {
- int length;
+ gsize length;
char *data;
} EContactPhoto;
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 23 Aug 2005 06:56:07 -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 23 Aug 2005 06:56:08 -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 23 Aug 2005 06:56:08 -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 23 Aug 2005 06:56:09 -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 23 Aug 2005 06:56:09 -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 23 Aug 2005 06:56:09 -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 23 Aug 2005 06:56:09 -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 23 Aug 2005 06:56:10 -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 23 Aug 2005 06:56:11 -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 23 Aug 2005 06:56:11 -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 23 Aug 2005 06:56:14 -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 23 Aug 2005 06:56:14 -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 23 Aug 2005 06:56:14 -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 23 Aug 2005 06:56:14 -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 23 Aug 2005 06:56:14 -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 23 Aug 2005 06:56:14 -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 23 Aug 2005 06:56:17 -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 23 Aug 2005 06:56:17 -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 23 Aug 2005 06:56:17 -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 23 Aug 2005 06:56:18 -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 23 Aug 2005 06:56:18 -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 23 Aug 2005 06:56:18 -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 23 Aug 2005 06:56:18 -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 23 Aug 2005 06:56:19 -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 23 Aug 2005 06:56:19 -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 23 Aug 2005 06:56:20 -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 23 Aug 2005 06:56:20 -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 23 Aug 2005 06:56:20 -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 23 Aug 2005 06:56:20 -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 23 Aug 2005 06:56:20 -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 23 Aug 2005 06:56:21 -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 23 Aug 2005 06:56:21 -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 23 Aug 2005 06:56:21 -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 23 Aug 2005 06:56:21 -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 23 Aug 2005 06:56:21 -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 23 Aug 2005 06:56:21 -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 23 Aug 2005 06:56:21 -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 23 Aug 2005 06:56:21 -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 23 Aug 2005 06:56:22 -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 23 Aug 2005 06:56:22 -0000
@@ -1,3 +1,12 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * e-name-selector-entry.h: fix prototype of temporary api's.
+
+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 23 Aug 2005 06:56:23 -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: libedataserverui/e-name-selector-entry.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-name-selector-entry.h,v
retrieving revision 1.5
diff -u -p -r1.5 e-name-selector-entry.h
--- libedataserverui/e-name-selector-entry.h 25 Jan 2005 02:56:02 -0000 1.5
+++ libedataserverui/e-name-selector-entry.h 23 Aug 2005 06:56:23 -0000
@@ -80,10 +80,10 @@ void e_name_selector_entr
EDestinationStore *destination_store);
/* TEMPORARY API - DO NOT USE */
-void e_name_selector_set_contact_editor_func (ENameSelectorEntry *name_selector_entry,
- gpointer func);
-void e_name_selector_set_contact_list_editor_func (ENameSelectorEntry *name_selector_entry,
- gpointer func);
+void e_name_selector_entry_set_contact_editor_func (ENameSelectorEntry *name_selector_entry,
+ gpointer func);
+void e_name_selector_entry_set_contact_list_editor_func (ENameSelectorEntry *name_selector_entry,
+ gpointer func);
G_END_DECLS
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 23 Aug 2005 06:56:23 -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 23 Aug 2005 06:56:23 -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 23 Aug 2005 06:56:23 -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 23 Aug 2005 06:56:24 -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);
Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1988
diff -u -p -r1.1988 ChangeLog
--- addressbook/ChangeLog 22 Aug 2005 10:37:17 -0000 1.1988
+++ addressbook/ChangeLog 23 Aug 2005 06:56:32 -0000
@@ -1,3 +1,34 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * gui/component/addressbook.c (addressbook_authenticate):
+ de-constify uri, and fix its creation logic.
+ (load_source_cb): cast for warning.
+
+ * gui/widgets/e-addressbook-view.c: more missing a11y include.
+
+ * gui/widgets/e-minicard-view.c: another missing a11y include.
+
+ * gui/widgets/e-minicard.c: include missing a11y include.
+ (e_minicard_activate_editor): fix cast.
+
+ * gui/widgets/eab-popup-control.c (eab_popup_control_display_contact): remove unused.
+
+ * gui/widgets/eab-gui-util.c (eab_contact_save): fix conditional build.
+ (eab_send_to_contact_and_email_num_list): fix boolean conversion.
+
+ * gui/widgets/eab-contact-display.c (eab_contact_display_init): cast.
+
+ * gui/contact-list-editor/e-contact-list-editor.c (fill_in_info): constify file_as.
+
+ * gui/contact-editor/e-contact-editor.c (init_im_record_location):
+ fix warnings for conditional building.
+ (fill_in_simple_field): do proper boolean conversion.
+ (extract_simple_field): do proper boolean conversion.
+ (response): constify categories, and dont bother initialising it.
+ (image_clicked): remove warnings for conditional build.
+ (e_contact_editor_is_valid): constify text.
+ (e_contact_editor_create_web): cast.
+
2005-08-22 Sushma Rai <rsushma novell com>
* gui/widgets/eab-contact-display.c
Index: addressbook/gui/component/addressbook.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook.c,v
retrieving revision 1.251
diff -u -p -r1.251 addressbook.c
--- addressbook/gui/component/addressbook.c 16 May 2005 06:11:11 -0000 1.251
+++ addressbook/gui/component/addressbook.c 23 Aug 2005 06:56:32 -0000
@@ -161,13 +161,11 @@ addressbook_authenticate (EBook *book, g
char *pass_dup = NULL;
const gchar *auth;
const gchar *user;
- const gchar *uri = e_book_get_uri (book);
- gchar *stripped_uri = remove_parameters_from_uri (uri);
+ gchar *uri = remove_parameters_from_uri(e_book_get_uri (book));
const gchar *auth_domain = e_source_get_property (source, "auth-domain");
const gchar *component_name;
component_name = auth_domain ? auth_domain : "Addressbook";
- uri = stripped_uri;
password = e_passwords_get_password (component_name, uri);
@@ -257,7 +255,7 @@ load_source_cb (EBook *book, EBookStatus
auth = e_source_get_property (load_source_data->source, "auth");
if (auth && strcmp (auth, "none")) {
- g_signal_connect (book, "auth_required", auth_required_cb, NULL);
+ g_signal_connect (book, "auth_required", G_CALLBACK(auth_required_cb), NULL);
if (e_book_is_online (book)) {
addressbook_authenticate (book, FALSE, load_source_data->source,
Index: addressbook/gui/contact-editor/e-contact-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor.c,v
retrieving revision 1.241
diff -u -p -r1.241 e-contact-editor.c
--- addressbook/gui/contact-editor/e-contact-editor.c 22 Aug 2005 10:30:02 -0000 1.241
+++ addressbook/gui/contact-editor/e-contact-editor.c 23 Aug 2005 06:56:33 -0000
@@ -1317,11 +1317,13 @@ sensitize_phone (EContactEditor *editor)
static void
init_im_record_location (EContactEditor *editor, gint record)
{
+#ifdef ENABLE_IM_LOCATION
GtkWidget *location_option_menu;
GtkWidget *location_menu;
+ gint i;
+#endif
GtkWidget *name_entry;
gchar *widget_name;
- gint i;
widget_name = g_strdup_printf ("entry-im-name-%d", record);
name_entry = glade_xml_get_widget (editor->gui, widget_name);
@@ -2146,7 +2148,8 @@ fill_in_simple_field (EContactEditor *ed
e_contact_photo_free (photo);
}
else if (GTK_IS_TOGGLE_BUTTON (widget)) {
- gboolean val = (gboolean) e_contact_get (contact, field_id);
+ gboolean val = e_contact_get (contact, field_id) != NULL;
+
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), val);
}
else {
@@ -2249,7 +2252,8 @@ extract_simple_field (EContactEditor *ed
}
else if (GTK_IS_TOGGLE_BUTTON (widget)) {
gboolean val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
- e_contact_set (contact, field_id, (gpointer) val);
+
+ e_contact_set (contact, field_id, val?(void *)1:NULL);
}
else {
g_warning (G_STRLOC ": Unhandled widget class in mappings!");
@@ -2546,7 +2550,7 @@ full_name_clicked (GtkWidget *button, EC
static void
response (GtkDialog *dialog, int response, EContactEditor *editor)
{
- char *categories = NULL;
+ const char *categories;
GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
if (response == GTK_RESPONSE_OK) {
@@ -2554,7 +2558,7 @@ response (GtkDialog *dialog, int respons
if (entry && GTK_IS_ENTRY(entry))
gtk_entry_set_text (GTK_ENTRY (entry), categories);
else
- e_contact_set (editor->contact, E_CONTACT_CATEGORIES, categories);
+ e_contact_set (editor->contact, E_CONTACT_CATEGORIES, (char *)categories);
}
gtk_widget_destroy(GTK_WIDGET(dialog));
}
@@ -2654,8 +2658,6 @@ file_selector_deleted (GtkWidget *widget
static void
image_clicked (GtkWidget *button, EContactEditor *editor)
{
- GtkWidget *clear_button;
- GtkWidget *dialog;
const gchar *title = _("Please select an image for this contact");
const gchar *no_image = _("No image");
@@ -2675,6 +2677,9 @@ image_clicked (GtkWidget *button, EConta
g_signal_connect (editor->file_selector, "response",
G_CALLBACK (file_chooser_response), editor);
#else
+ GtkWidget *clear_button;
+ GtkWidget *dialog;
+
/* Create the selector */
editor->file_selector = gtk_file_selection_new (title);
@@ -2967,8 +2972,8 @@ e_contact_editor_is_valid (EABEditor *ed
}
} else {
-
- char *text = e_contact_get_const (ce->contact, field_id);
+ const char *text = e_contact_get_const (ce->contact, field_id);
+
if (STRING_IS_EMPTY (text)) {
g_string_append_printf (errmsg, "%s'%s' is empty",
validation_error ? ",\n" : "",
@@ -3599,7 +3604,7 @@ e_contact_editor_create_web(gchar *name,
gint int1, gint int2)
{
GtkWidget *widget = e_url_entry_new ();
- AtkObject *a11y = gtk_widget_get_accessible (e_url_entry_get_entry (widget));
+ AtkObject *a11y = gtk_widget_get_accessible (e_url_entry_get_entry ((EUrlEntry *)widget));
if (a11y != NULL) {
atk_object_set_name (a11y, string1);
Index: addressbook/gui/contact-list-editor/e-contact-list-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-list-editor/e-contact-list-editor.c,v
retrieving revision 1.71
diff -u -p -r1.71 e-contact-list-editor.c
--- addressbook/gui/contact-list-editor/e-contact-list-editor.c 22 Aug 2005 06:33:04 -0000 1.71
+++ addressbook/gui/contact-list-editor/e-contact-list-editor.c 23 Aug 2005 06:56:33 -0000
@@ -1053,7 +1053,7 @@ fill_in_info(EContactListEditor *editor)
{
if (editor->contact) {
EContactPhoto *photo;
- char *file_as;
+ const char *file_as;
gboolean show_addresses = FALSE;
gboolean is_evolution_list = FALSE;
GList *email_list;
@@ -1067,8 +1067,8 @@ fill_in_info(EContactListEditor *editor)
gtk_editable_delete_text (GTK_EDITABLE (editor->list_name_entry), 0, -1);
if (file_as) {
int position = 0;
+
gtk_editable_insert_text (GTK_EDITABLE (editor->list_name_entry), file_as, strlen (file_as), &position);
- g_free (file_as);
}
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(editor->visible_addrs_checkbutton), !show_addresses);
Index: addressbook/gui/widgets/e-addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v
retrieving revision 1.169
diff -u -p -r1.169 e-addressbook-view.c
--- addressbook/gui/widgets/e-addressbook-view.c 21 Jul 2005 13:27:36 -0000 1.169
+++ addressbook/gui/widgets/e-addressbook-view.c 23 Aug 2005 06:56:34 -0000
@@ -45,6 +45,7 @@
#include "addressbook/gui/search/e-addressbook-search-dialog.h"
#include "addressbook/gui/widgets/eab-popup.h"
#include "addressbook/gui/widgets/eab-menu.h"
+#include "a11y/addressbook/ea-addressbook.h"
#include "e-util/e-print.h"
#include "libedataserver/e-sexp.h"
Index: addressbook/gui/widgets/e-minicard-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-minicard-view.c,v
retrieving revision 1.69
diff -u -p -r1.69 e-minicard-view.c
--- addressbook/gui/widgets/e-minicard-view.c 23 Jun 2005 09:11:04 -0000 1.69
+++ addressbook/gui/widgets/e-minicard-view.c 23 Aug 2005 06:56:34 -0000
@@ -33,6 +33,7 @@
#include <misc/e-canvas.h>
#include <libgnome/gnome-i18n.h>
#include <string.h>
+#include "a11y/addressbook/ea-addressbook.h"
static void e_minicard_view_drag_data_get(GtkWidget *widget,
GdkDragContext *context,
Index: addressbook/gui/widgets/e-minicard.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-minicard.c,v
retrieving revision 1.125
diff -u -p -r1.125 e-minicard.c
--- addressbook/gui/widgets/e-minicard.c 23 Jun 2005 09:11:04 -0000 1.125
+++ addressbook/gui/widgets/e-minicard.c 23 Aug 2005 06:56:34 -0000
@@ -41,6 +41,7 @@
#include "e-contact-editor.h"
#include <e-util/e-icon-factory.h>
#include <libebook/e-destination.h>
+#include "a11y/addressbook/ea-addressbook.h"
static void e_minicard_init (EMinicard *card);
static void e_minicard_class_init (EMinicardClass *klass);
@@ -534,8 +535,7 @@ editor_closed_cb (GtkObject *editor, gpo
gboolean
e_minicard_activate_editor(EMinicard *minicard)
{
- GnomeCanvasItem *item = NULL;
- item = minicard;
+ GnomeCanvasItem *item = (GnomeCanvasItem *)minicard;
if (minicard->editor) {
eab_editor_raise (minicard->editor);
Index: addressbook/gui/widgets/eab-contact-display.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-contact-display.c,v
retrieving revision 1.22
diff -u -p -r1.22 eab-contact-display.c
--- addressbook/gui/widgets/eab-contact-display.c 22 Aug 2005 10:37:18 -0000 1.22
+++ addressbook/gui/widgets/eab-contact-display.c 23 Aug 2005 06:56:34 -0000
@@ -663,7 +663,7 @@ eab_contact_display_new (void)
static void
eab_contact_display_init (GObject *object)
{
- gtk_html_construct (object);
+ gtk_html_construct ((GtkHTML *)object);
}
static void
Index: addressbook/gui/widgets/eab-gui-util.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-gui-util.c,v
retrieving revision 1.43
diff -u -p -r1.43 eab-gui-util.c
--- addressbook/gui/widgets/eab-gui-util.c 3 Aug 2005 08:34:02 -0000 1.43
+++ addressbook/gui/widgets/eab-gui-util.c 23 Aug 2005 06:56:34 -0000
@@ -497,8 +497,11 @@ void
eab_contact_save (char *title, EContact *contact, GtkWindow *parent_window)
{
GtkWidget *filesel;
- char *file, *full_filename;
+ char *file;
char *name;
+#ifndef USE_GTKFILECHOOSER
+ char *full_filename;
+#endif
SaveAsInfo *info = g_new(SaveAsInfo, 1);
name = e_contact_get (contact, E_CONTACT_FILE_AS);
@@ -556,7 +559,10 @@ eab_contact_list_save (char *title, GLis
{
GtkWidget *filesel;
SaveAsInfo *info = g_new(SaveAsInfo, 1);
- char *file, *full_filename;
+ char *file;
+#ifndef USE_GTKFILECHOOSER
+ char *full_filename;
+#endif
#ifdef USE_GTKFILECHOOSER
filesel = gtk_file_chooser_dialog_new (title,
@@ -861,8 +867,7 @@ eab_send_to_contact_and_email_num_list (
GList *iterator;
if (emails != NULL) {
-
- is_list = (gboolean)e_contact_get (contact, E_CONTACT_IS_LIST);
+ is_list = e_contact_get (contact, E_CONTACT_IS_LIST) != NULL;
is_hidden = is_list && !e_contact_get (contact, E_CONTACT_LIST_SHOW_ADDRESSES);
if (is_list) {
Index: addressbook/gui/widgets/eab-popup-control.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-popup-control.c,v
retrieving revision 1.13
diff -u -p -r1.13 eab-popup-control.c
--- addressbook/gui/widgets/eab-popup-control.c 6 Feb 2005 13:09:58 -0000 1.13
+++ addressbook/gui/widgets/eab-popup-control.c 23 Aug 2005 06:56:35 -0000
@@ -926,8 +926,6 @@ contact_editor_cb (EBook *book, EBookSta
static void
eab_popup_control_display_contact (EABPopupControl *pop, EContact *contact)
{
- GtkWidget *b;
-
g_return_if_fail (pop && EAB_IS_POPUP_CONTROL (pop));
g_return_if_fail (contact && E_IS_CONTACT (contact));
g_return_if_fail (pop->contact == NULL);
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2800
diff -u -p -r1.2800 ChangeLog
--- calendar/ChangeLog 19 Aug 2005 13:11:55 -0000 1.2800
+++ calendar/ChangeLog 23 Aug 2005 06:56:38 -0000
@@ -1,3 +1,74 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * gui/e-cal-config.h: source-type is an enum not a pointer!
+
+ * gui/tasks-component.c (selector_tree_drag_data_received):
+ constify uid.
+
+ * gui/itip-utils.c (comp_sentby): use the right list type for
+ attendees.
+
+ * gui/gnome-cal.c (config_categories_changed_cb): fix cast.
+ (setup_widgets): fix casts.
+
+ * gui/e-tasks.c: add missing e-categories.h include.
+ (config_categories_changed_cb): fix cast.
+
+ * gui/e-week-view.c (e_week_view_realize): remove unused.
+
+ * gui/e-select-names-editable.c
+ (e_select_names_editable_get_emails): remve unused.
+
+ * gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
+ remove/comment unused.
+
+ * gui/e-meeting-store.c (freebusy_async): g* strikes again, use
+ the right lock/unlock function for the g-spastic-mutex.
+ (process_callbacks_main_thread): fix signature to match usage.
+ (refresh_queue_add): cast off warning
+
+ * gui/e-itip-control.c (cleanup_ecal): fix signature to match use
+
+ * gui/e-day-view.c (process_component): remove unused vars.
+ (e_day_view_realize): more.
+ (e_day_view_on_event_double_click): cast
+ (e_day_view_update_calendar_selection_time): define out unused
+
+ * gui/e-calendar-table.c (e_calendar_table_init): more a11y
+ related casts.
+
+ * gui/e-calendar-view.c (on_edit_appointment): proper boolean
+ conversion of a pointer.
+ (transfer_selected_items): cast
+ (on_unrecur_appointment): remove unused prop
+ (e_calendar_view_open_event): proper boolean conversion of pointer.
+
+ * gui/e-cal-popup.c (needs_to_accept): remove unused.
+
+ * gui/e-cal-model.c (set_instance_times): remove unused.
+ :include missing calendar-config.
+
+ * gui/dialogs/meeting-page.c (clear_widgets): yawn, another
+ gtklabel wawrning.
+ (meeting_page_fill_component): constify attendees.
+
+ * gui/dialogs/e-send-options-utils.c: remove unused global sod,
+ add missing string.h
+
+ * gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
+ remove unused.
+
+ * gui/dialogs/comp-editor.c (response_cb): wtf, this can't use
+ em_utils!!! #if 0 it out and add a build warning.
+ (cab_popup_position): pointer cast.
+ (set_attachment_list): remove unused.
+
+ * gui/dialogs/calendar-setup.c (eccp_general_offline): change very
+ incorrect N_ macro to _.
+ (CalendarSourceDialog): Umm, source_type is an enum, not a
+ pointer.
+ (eccp_get_source_color): remove unused.
+
2005-08-19 Harish Krishnaswamy <kharish novell com>
* gui/dialogs/comp-editor.h: Remove unwanted include of
Index: calendar/gui/e-cal-config.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-config.h,v
retrieving revision 1.2
diff -u -p -r1.2 e-cal-config.h
--- calendar/gui/e-cal-config.h 1 Jul 2005 09:49:32 -0000 1.2
+++ calendar/gui/e-cal-config.h 23 Aug 2005 06:56:38 -0000
@@ -53,7 +53,7 @@ struct _ECalConfigTargetSource {
EConfigTarget target;
struct _ESource *source;
- ECalSourceType *source_type;
+ ECalSourceType source_type;
};
typedef struct _EConfigItem ECalConfigItem;
Index: calendar/gui/e-cal-model.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model.c,v
retrieving revision 1.60
diff -u -p -r1.60 e-cal-model.c
--- calendar/gui/e-cal-model.c 22 Jul 2005 11:41:35 -0000 1.60
+++ calendar/gui/e-cal-model.c 23 Aug 2005 06:56:39 -0000
@@ -32,6 +32,7 @@
#include "itip-utils.h"
#include "misc.h"
#include "e-calendar-marshal.h"
+#include "calendar-config.h"
typedef struct {
ECal *client;
@@ -1314,7 +1315,7 @@ add_instance_cb (ECalComponent *comp, ti
static void
set_instance_times (ECalModelComponent *comp_data, icaltimezone *zone)
{
- struct icaltimetype recur_time, start_time, end_time, itt;
+ struct icaltimetype recur_time, start_time, end_time;
recur_time = icalcomponent_get_recurrenceid (comp_data->icalcomp);
start_time = icalcomponent_get_dtstart (comp_data->icalcomp);
Index: calendar/gui/e-cal-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-popup.c,v
retrieving revision 1.15
diff -u -p -r1.15 e-cal-popup.c
--- calendar/gui/e-cal-popup.c 18 Aug 2005 11:20:23 -0000 1.15
+++ calendar/gui/e-cal-popup.c 23 Aug 2005 06:56:39 -0000
@@ -169,7 +169,6 @@ needs_to_accept (icalcomponent *icalcomp
icalproperty *prop;
icalparameter *param;
icalparameter_partstat status;
- const char *delto = NULL;
prop = get_attendee_prop (icalcomp, user_email);
Index: calendar/gui/e-calendar-table.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-table.c,v
retrieving revision 1.138
diff -u -p -r1.138 e-calendar-table.c
--- calendar/gui/e-calendar-table.c 5 Aug 2005 12:15:33 -0000 1.138
+++ calendar/gui/e-calendar-table.c 23 Aug 2005 06:56:39 -0000
@@ -509,7 +509,7 @@ e_calendar_table_init (ECalendarTable *c
g_signal_connect (e_table, "key_press", G_CALLBACK (e_calendar_table_on_key_press), cal_table);
g_signal_connect (e_table, "popup_menu", G_CALLBACK (e_calendar_table_on_popup_menu), cal_table);
- a11y = gtk_widget_get_accessible (e_table);
+ a11y = gtk_widget_get_accessible ((GtkWidget *)e_table);
if (a11y)
atk_object_set_name (a11y, _("Task Table"));
}
Index: calendar/gui/e-calendar-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-view.c,v
retrieving revision 1.90
diff -u -p -r1.90 e-calendar-view.c
--- calendar/gui/e-calendar-view.c 5 Aug 2005 12:15:34 -0000 1.90
+++ calendar/gui/e-calendar-view.c 23 Aug 2005 06:56:40 -0000
@@ -1049,7 +1049,7 @@ on_edit_appointment (EPopup *ep, EPopupI
if (event)
e_calendar_view_edit_appointment (cal_view, event->comp_data->client,
event->comp_data->icalcomp,
- icalcomponent_get_first_property(event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY));
+ icalcomponent_get_first_property(event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY) != NULL);
g_list_free (selected);
}
@@ -1213,7 +1213,7 @@ transfer_selected_items (ECalendarView *
return;
/* prompt the user for destination source */
- destination_source = select_source_dialog ((GtkWindow *) gtk_widget_get_toplevel (cal_view), E_CAL_SOURCE_TYPE_EVENT);
+ destination_source = select_source_dialog ((GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *)cal_view), E_CAL_SOURCE_TYPE_EVENT);
if (!destination_source)
return;
@@ -1403,7 +1403,6 @@ on_unrecur_appointment (EPopup *ep, EPop
GList *selected;
ECal *client;
char *new_uid;
- icalproperty *prop;
selected = e_calendar_view_get_selected_events (cal_view);
if (!selected)
@@ -1625,7 +1624,7 @@ e_calendar_view_open_event (ECalendarVie
ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data;
if (event)
e_calendar_view_edit_appointment (cal_view, event->comp_data->client,
- event->comp_data->icalcomp, icalcomponent_get_first_property(event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY));
+ event->comp_data->icalcomp, icalcomponent_get_first_property(event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY) != NULL);
g_list_free (selected);
}
Index: calendar/gui/e-day-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view.c,v
retrieving revision 1.285
diff -u -p -r1.285 e-day-view.c
--- calendar/gui/e-day-view.c 12 Aug 2005 14:33:56 -0000 1.285
+++ calendar/gui/e-day-view.c 23 Aug 2005 06:56:41 -0000
@@ -505,8 +505,6 @@ time_range_changed_cb (ECalModel *model,
static void
process_component (EDayView *day_view, ECalModelComponent *comp_data)
{
- EDayViewEvent *event;
- gint day, event_num;
const char *uid, *rid;
ECalComponent *comp;
AddEventData add_event_data;
@@ -1078,8 +1076,6 @@ e_day_view_realize (GtkWidget *widget)
{
EDayView *day_view;
GdkColormap *colormap;
- gboolean success[E_DAY_VIEW_COLOR_LAST];
- gint nfailed;
if (GTK_WIDGET_CLASS (e_day_view_parent_class)->realize)
(*GTK_WIDGET_CLASS (e_day_view_parent_class)->realize)(widget);
@@ -3308,7 +3304,7 @@ e_day_view_on_event_double_click (EDayVi
attendee_prop = icalcomponent_get_first_property (event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY);
- e_calendar_view_edit_appointment (day_view,
+ e_calendar_view_edit_appointment ((ECalendarView *)day_view,
event->comp_data->client,
event->comp_data->icalcomp, attendee_prop ? TRUE:FALSE);
}
@@ -3492,8 +3488,9 @@ void
e_day_view_update_calendar_selection_time (EDayView *day_view)
{
time_t start, end;
+#if 0
GnomeCalendar *calendar;
-
+#endif
e_day_view_get_selected_time_range ((ECalendarView *) day_view, &start, &end);
#if 0
Index: calendar/gui/e-itip-control.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-itip-control.c,v
retrieving revision 1.166
diff -u -p -r1.166 e-itip-control.c
--- calendar/gui/e-itip-control.c 11 Jul 2005 02:35:48 -0000 1.166
+++ calendar/gui/e-itip-control.c 23 Aug 2005 06:56:42 -0000
@@ -361,8 +361,10 @@ find_server (EItipControl *itip, ECalCom
}
static void
-cleanup_ecal (ECal *ecal)
+cleanup_ecal (void *data)
{
+ ECal *ecal = data;
+
/* Clean up any signals */
g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, cal_opened_cb, NULL);
g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, find_cal_opened_cb, NULL);
Index: calendar/gui/e-meeting-store.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-store.c,v
retrieving revision 1.13
diff -u -p -r1.13 e-meeting-store.c
--- calendar/gui/e-meeting-store.c 22 Jun 2005 14:32:35 -0000 1.13
+++ calendar/gui/e-meeting-store.c 23 Aug 2005 06:56:42 -0000
@@ -989,8 +989,9 @@ typedef struct {
/* Process the callbacks in the main thread. Avoids widget redrawing issues. */
static gboolean
-process_callbacks_main_thread (EMeetingStore *store)
+process_callbacks_main_thread (void *data)
{
+ EMeetingStore *store = data;
EMeetingStorePrivate *priv;
QueueCbData *aqueue_data;
gboolean threads_done = FALSE;
@@ -1230,9 +1231,9 @@ freebusy_async (gpointer data)
if (fbd->client) {
/* FIXME this a work around for getting all th free busy information for the users
we should be able to get free busy asynchronously */
- g_mutex_lock (&mutex);
+ g_static_mutex_lock (&mutex);
e_cal_get_free_busy (fbd->client, fbd->users, fbd->startt, fbd->endt, &(fbd->fb_data), NULL);
- g_mutex_unlock (&mutex);
+ g_static_mutex_unlock (&mutex);
g_list_foreach (fbd->users, (GFunc)g_free, NULL);
g_list_free (fbd->users);
@@ -1439,7 +1440,7 @@ refresh_queue_add (EMeetingStore *store,
g_ptr_array_add (qdata->call_backs, call_back);
g_ptr_array_add (qdata->data, data);
- g_hash_table_insert (priv->refresh_data, itip_strip_mailto (e_meeting_attendee_get_address (attendee)), qdata);
+ g_hash_table_insert (priv->refresh_data, (void *)itip_strip_mailto (e_meeting_attendee_get_address (attendee)), qdata);
} else {
if (e_meeting_time_compare_times (start, &qdata->start) == -1)
qdata->start = *start;
Index: calendar/gui/e-meeting-time-sel.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel.c,v
retrieving revision 1.68
diff -u -p -r1.68 e-meeting-time-sel.c
--- calendar/gui/e-meeting-time-sel.c 23 Jun 2005 09:11:05 -0000 1.68
+++ calendar/gui/e-meeting-time-sel.c 23 Aug 2005 06:56:45 -0000
@@ -895,13 +895,11 @@ e_meeting_time_selector_style_set (GtkWi
EMeetingTimeSelector *mts;
EMeetingTime saved_time;
int hour, max_hour_width;
- int maxheight;
+ /*int maxheight; */
PangoFontDescription *font_desc;
PangoContext *pango_context;
PangoFontMetrics *font_metrics;
PangoLayout *layout;
- GtkTreePath *path;
- GdkRectangle cell_area;
if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->style_set)
(*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->style_set)(widget, previous_style);
Index: calendar/gui/e-select-names-editable.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-select-names-editable.c,v
retrieving revision 1.11
diff -u -p -r1.11 e-select-names-editable.c
--- calendar/gui/e-select-names-editable.c 2 Jul 2005 14:59:49 -0000 1.11
+++ calendar/gui/e-select-names-editable.c 23 Aug 2005 06:56:45 -0000
@@ -132,7 +132,6 @@ e_select_names_editable_get_emails (ESel
GList *destinations;
EDestination *destination;
GList *result = NULL;
- gboolean contact_list = FALSE;
g_return_val_if_fail (E_SELECT_NAMES_EDITABLE (esne), NULL);
Index: calendar/gui/e-tasks.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-tasks.c,v
retrieving revision 1.119
diff -u -p -r1.119 e-tasks.c
--- calendar/gui/e-tasks.c 9 Aug 2005 21:46:34 -0000 1.119
+++ calendar/gui/e-tasks.c 23 Aug 2005 06:56:45 -0000
@@ -39,6 +39,7 @@
#include "e-util/e-time-utils.h"
#include "shell/e-user-creatable-items-handler.h"
#include <libedataserver/e-url.h>
+#include <libedataserver/e-categories.h>
#include <libecal/e-cal-time-util.h>
#include "widgets/menus/gal-view-menus.h"
#include "dialogs/delete-error.h"
@@ -640,7 +641,7 @@ config_categories_changed_cb (EConfigLis
cat_list = g_list_remove (cat_list, cat_list->data);
}
- cal_search_bar_set_categories (priv->search_bar, cat_array);
+ cal_search_bar_set_categories ((CalSearchBar *)priv->search_bar, cat_array);
g_ptr_array_free (cat_array, TRUE);
}
Index: calendar/gui/e-week-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view.c,v
retrieving revision 1.247
diff -u -p -r1.247 e-week-view.c
--- calendar/gui/e-week-view.c 29 Jul 2005 05:10:11 -0000 1.247
+++ calendar/gui/e-week-view.c 23 Aug 2005 06:56:45 -0000
@@ -678,8 +678,6 @@ e_week_view_realize (GtkWidget *widget)
{
EWeekView *week_view;
GdkColormap *colormap;
- gboolean success[E_WEEK_VIEW_COLOR_LAST];
- gint nfailed;
if (GTK_WIDGET_CLASS (e_week_view_parent_class)->realize)
(*GTK_WIDGET_CLASS (e_week_view_parent_class)->realize)(widget);
Index: calendar/gui/gnome-cal.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/gnome-cal.c,v
retrieving revision 1.385
diff -u -p -r1.385 gnome-cal.c
--- calendar/gui/gnome-cal.c 4 Aug 2005 10:17:43 -0000 1.385
+++ calendar/gui/gnome-cal.c 23 Aug 2005 06:56:46 -0000
@@ -1288,7 +1288,7 @@ config_categories_changed_cb (EConfigLis
cat_list = g_list_remove (cat_list, cat_list->data);
}
- cal_search_bar_set_categories (priv->search_bar, cat_array);
+ cal_search_bar_set_categories ((CalSearchBar *)priv->search_bar, cat_array);
g_ptr_array_free (cat_array, TRUE);
}
@@ -1404,9 +1404,9 @@ setup_widgets (GnomeCalendar *gcal)
g_signal_connect (etable, "selection_change",
G_CALLBACK (table_selection_change_cb), gcal);
- g_signal_connect (e_calendar_table_get_model (priv->todo), "cal_view_progress",
+ g_signal_connect (e_calendar_table_get_model ((ECalendarTable *)priv->todo), "cal_view_progress",
G_CALLBACK (view_progress_cb), gcal);
- g_signal_connect (e_calendar_table_get_model (priv->todo), "cal_view_done",
+ g_signal_connect (e_calendar_table_get_model ((ECalendarTable *)priv->todo), "cal_view_done",
G_CALLBACK (view_done_cb), gcal);
/* Timeout check to hide completed items */
@@ -1445,7 +1445,7 @@ setup_widgets (GnomeCalendar *gcal)
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (week_view_adjustment_changed_cb),
gcal);
- w_model = e_calendar_view_get_model (priv->week_view);
+ w_model = e_calendar_view_get_model ((ECalendarView *)priv->week_view);
g_signal_connect (w_model, "cal_view_progress",
G_CALLBACK (view_progress_cb), gcal);
g_signal_connect (w_model, "cal_view_done",
Index: calendar/gui/itip-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/itip-utils.c,v
retrieving revision 1.104
diff -u -p -r1.104 itip-utils.c
--- calendar/gui/itip-utils.c 5 Aug 2005 08:03:55 -0000 1.104
+++ calendar/gui/itip-utils.c 23 Aug 2005 06:56:47 -0000
@@ -744,7 +744,7 @@ static void
comp_sentby (ECalComponent *comp, ECal *client)
{
ECalComponentOrganizer organizer;
- GList * attendees, *l;
+ GSList * attendees, *l;
char *user = NULL;
e_cal_component_get_organizer (comp, &organizer);
Index: calendar/gui/tasks-component.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/tasks-component.c,v
retrieving revision 1.89
diff -u -p -r1.89 tasks-component.c
--- calendar/gui/tasks-component.c 9 Aug 2005 19:54:55 -0000 1.89
+++ calendar/gui/tasks-component.c 23 Aug 2005 06:56:47 -0000
@@ -745,7 +745,7 @@ selector_tree_drag_data_received (GtkWid
icalcomp = icalparser_parse_string (data->data);
if (icalcomp) {
- char * uid;
+ const char * uid;
/* FIXME deal with GDK_ACTION_ASK */
if (context->action == GDK_ACTION_COPY) {
Index: calendar/gui/dialogs/calendar-setup.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/calendar-setup.c,v
retrieving revision 1.37
diff -u -p -r1.37 calendar-setup.c
--- calendar/gui/dialogs/calendar-setup.c 1 Jul 2005 09:49:32 -0000 1.37
+++ calendar/gui/dialogs/calendar-setup.c 23 Aug 2005 06:56:47 -0000
@@ -55,7 +55,7 @@ struct _CalendarSourceDialog {
/* Source group we're creating/editing a source in */
ESourceGroup *source_group;
- ECalSourceType *source_type;
+ ECalSourceType source_type;
};
static gboolean
@@ -284,10 +284,10 @@ eccp_general_offline (EConfig *ec, EConf
row = ((GtkTable*)parent)->nrows;
if (sdialog->source_type == E_CAL_SOURCE_TYPE_EVENT)
- offline_setting = gtk_check_button_new_with_label (N_("Copy calendar contents locally for offline operation"));
+ offline_setting = gtk_check_button_new_with_label (_("Copy calendar contents locally for offline operation"));
else if (sdialog->source_type == E_CAL_SOURCE_TYPE_TODO)
- offline_setting = gtk_check_button_new_with_label (N_("Copy task list contents locally for offline operation"));
+ offline_setting = gtk_check_button_new_with_label (_("Copy task list contents locally for offline operation"));
gtk_widget_show (offline_setting);
g_signal_connect (offline_setting, "toggled", G_CALLBACK (offline_status_changed_cb), sdialog);
@@ -315,8 +315,6 @@ eccp_get_source_color (EConfig *ec, ECon
static GtkWidget *label, *picker;
int row;
ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target;
- ESource *source = t->source;
-
static guint32 assigned_colors[] = {
0xBECEDD, /* 190 206 221 Blue */
0xE2F0EF, /* 226 240 239 Light Blue */
Index: calendar/gui/dialogs/comp-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor.c,v
retrieving revision 1.149
diff -u -p -r1.149 comp-editor.c
--- calendar/gui/dialogs/comp-editor.c 18 Aug 2005 11:20:23 -0000 1.149
+++ calendar/gui/dialogs/comp-editor.c 23 Aug 2005 06:56:48 -0000
@@ -897,9 +897,11 @@ response_cb (GtkWidget *widget, int resp
case GTK_RESPONSE_OK:
/* Check whether the downloads are completed */
if (e_attachment_bar_get_download_count (E_ATTACHMENT_BAR (editor->priv->attachment_bar)) ){
+ gboolean response = 1;
+#warning "FIXME: Cannot use mail functions from calendar!!!!"
+#if 0
ECalComponentVType vtype = e_cal_component_get_vtype(editor->priv->comp);
- gboolean response;
-
+
if (vtype == E_CAL_COMPONENT_EVENT)
response = em_utils_prompt_user((GtkWindow *)widget,
NULL,
@@ -910,6 +912,7 @@ response_cb (GtkWidget *widget, int resp
NULL,
"calendar:ask-send-task-pending-download",
NULL);
+#endif
if (!response)
return;
}
@@ -1097,7 +1100,7 @@ cab_popup_position(GtkMenu *menu, int *x
if (selection == NULL)
return;
- image = gnome_icon_list_get_icon_pixbuf_item (icon_list, (gint)selection->data);
+ image = gnome_icon_list_get_icon_pixbuf_item (icon_list, GPOINTER_TO_INT(selection->data));
if (image == NULL)
return;
@@ -2009,7 +2012,6 @@ set_attachment_list (CompEditor *editor,
{
GSList *p = NULL;
const char *comp_uid= NULL;
- const char *local_store = e_cal_get_local_attachment_store (editor->priv->client);
e_cal_component_get_uid (editor->priv->comp, &comp_uid);
Index: calendar/gui/dialogs/e-delegate-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/e-delegate-dialog.c,v
retrieving revision 1.22
diff -u -p -r1.22 e-delegate-dialog.c
--- calendar/gui/dialogs/e-delegate-dialog.c 23 Jun 2005 09:11:05 -0000 1.22
+++ calendar/gui/dialogs/e-delegate-dialog.c 23 Aug 2005 06:56:48 -0000
@@ -123,7 +123,6 @@ e_delegate_dialog_construct (EDelegateDi
EDestination *dest;
ENameSelectorModel *name_selector_model;
ENameSelectorDialog *name_selector_dialog;
- char *str;
g_return_val_if_fail (edd != NULL, NULL);
g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
Index: calendar/gui/dialogs/e-send-options-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/e-send-options-utils.c,v
retrieving revision 1.2
diff -u -p -r1.2 e-send-options-utils.c
--- calendar/gui/dialogs/e-send-options-utils.c 6 Jan 2005 09:25:21 -0000 1.2
+++ calendar/gui/dialogs/e-send-options-utils.c 23 Aug 2005 06:56:48 -0000
@@ -21,8 +21,7 @@
#include "e-send-options-utils.h"
#include "../calendar-config.h"
#include <glib.h>
-
-ESendOptionsDialog *sod = NULL;
+#include <string.h>
void
e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char * type)
Index: calendar/gui/dialogs/meeting-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/meeting-page.c,v
retrieving revision 1.104
diff -u -p -r1.104 meeting-page.c
--- calendar/gui/dialogs/meeting-page.c 18 Aug 2005 11:20:23 -0000 1.104
+++ calendar/gui/dialogs/meeting-page.c 23 Aug 2005 06:56:48 -0000
@@ -300,7 +300,7 @@ clear_widgets (MeetingPage *mpage)
priv = mpage->priv;
if (COMP_EDITOR_PAGE (mpage)->flags & COMP_EDITOR_PAGE_DELEGATE) {
- gtk_label_set_markup_with_mnemonic (priv->att_label, _("<b>Dele_gatees</b>"));
+ gtk_label_set_markup_with_mnemonic ((GtkLabel *)priv->att_label, _("<b>Dele_gatees</b>"));
}
if (e_cal_get_static_capability (COMP_EDITOR_PAGE (mpage)->client, CAL_STATIC_CAPABILITY_NO_ORGANIZER)) {
@@ -487,7 +487,7 @@ meeting_page_fill_component (CompEditorP
if (COMP_EDITOR_PAGE (mpage)->flags & COMP_EDITOR_PAGE_DELEGATE ) {
GSList *attendee_list, *l;
int i;
- GPtrArray *attendees = e_meeting_store_get_attendees (priv->model);
+ const GPtrArray *attendees = e_meeting_store_get_attendees (priv->model);
e_cal_component_get_attendee_list (priv->comp, &attendee_list);
Index: composer/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.712
diff -u -p -r1.712 ChangeLog
--- composer/ChangeLog 27 Jul 2005 10:55:23 -0000 1.712
+++ composer/ChangeLog 23 Aug 2005 06:56:49 -0000
@@ -1,3 +1,23 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * e-msg-composer.c (build_message): only define skip_content: if
+ it is used.
+ (menu_file_add_attachment_cb): fixed the warning. Boy, what on
+ earth is this thing doing!
+ (add_to_bar): fix signature to match code.
+ (emcab_add): more warning fixes for bizarre functions.
+ (emcab_popup_position): more casting crap
+
+ * e-msg-composer-hdrs.c (addressbook_dialog_response): Remove
+ unused.
+ (account_can_send): make this static, and define before first use.
+ : include missing e-name-selector-entry header.
+ (create_headers): fix casts/style
+ (e_msg_composer_hdrs_set_to, e_msg_composer_hdrs_set_cc)
+ (e_msg_composer_hdrs_set_bcc, e_msg_composer_hdrs_get_to)
+ (e_msg_composer_hdrs_get_cc, e_msg_composer_hdrs_get_bcc): remove
+ unused str. lazy addressbook hackers!
+
2005-07-27 Mengjie Yu <meng-jie yu sun com>
* e-msg-composer-select-file.h:
Index: composer/e-msg-composer-hdrs.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer-hdrs.c,v
retrieving revision 1.142
diff -u -p -r1.142 e-msg-composer-hdrs.c
--- composer/e-msg-composer-hdrs.c 21 Jul 2005 07:00:54 -0000 1.142
+++ composer/e-msg-composer-hdrs.c 23 Aug 2005 06:56:49 -0000
@@ -37,6 +37,7 @@
#include <libgnomeui/gnome-uidefs.h>
#include <libgnome/gnome-i18n.h>
#include <libedataserverui/e-name-selector.h>
+#include <libedataserverui/e-name-selector-entry.h>
#include "Composer.h"
@@ -129,8 +130,6 @@ static int signals[LAST_SIGNAL];
static void
addressbook_dialog_response (ENameSelectorDialog *name_selector_dialog, gint response, gpointer user_data)
{
- EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (user_data);
-
gtk_widget_hide (GTK_WIDGET (name_selector_dialog));
}
@@ -229,6 +228,26 @@ from_changed (GtkWidget *item, gpointer
g_signal_emit (hdrs, signals [FROM_CHANGED], 0);
}
+static gboolean
+account_can_send (EAccount *account)
+{
+ static CamelStore *store;
+ CamelException ex;
+ gboolean result = FALSE;
+
+ if (!account->parent_uid)
+ return TRUE;
+
+ if (!(store = (CamelStore *) camel_session_get_service (session, e_account_get_string(account, E_ACCOUNT_SOURCE_URL), CAMEL_PROVIDER_STORE, &ex))) {
+ camel_exception_clear (&ex);
+ return result;
+ } else if (store->mode & CAMEL_STORE_WRITE)
+ result = TRUE;
+
+ camel_object_unref (store);
+ return result;
+}
+
static void
account_added_cb (EAccountList *accounts, EAccount *account, EMsgComposerHdrs *hdrs)
{
@@ -328,26 +347,6 @@ account_removed_cb (EAccountList *accoun
}
}
-gboolean
-account_can_send (EAccount *account)
-{
- static CamelStore *store;
- CamelException ex;
- gboolean result = FALSE;
-
- if (!account->parent_uid)
- return TRUE;
-
- if (!(store = (CamelStore *) camel_session_get_service (session, e_account_get_string(account, E_ACCOUNT_SOURCE_URL), CAMEL_PROVIDER_STORE, &ex))) {
- camel_exception_clear (&ex);
- return result;
- } else if (store->mode & CAMEL_STORE_WRITE)
- result = TRUE;
-
- camel_object_unref (store);
- return result;
-}
-
static GtkWidget *
create_from_optionmenu (EMsgComposerHdrs *hdrs)
{
@@ -623,23 +622,22 @@ create_headers (EMsgComposerHdrs *hdrs)
*/
priv->reply_to.label = gtk_label_new_with_mnemonic (_("_Reply-To:"));
priv->reply_to.entry = gtk_entry_new ();
- gtk_label_set_mnemonic_widget (priv->reply_to.label, priv->reply_to.entry);
+ gtk_label_set_mnemonic_widget((GtkLabel *)priv->reply_to.label, priv->reply_to.entry);
/*
* From
*/
priv->from.label = gtk_label_new_with_mnemonic (_("Fr_om:"));
priv->from.entry = create_from_optionmenu (hdrs);
- gtk_label_set_mnemonic_widget (priv->from.label, e_msg_composer_hdrs_get_from_omenu (hdrs));
+ gtk_label_set_mnemonic_widget((GtkLabel *)priv->from.label, e_msg_composer_hdrs_get_from_omenu (hdrs));
/*
* Subject
*/
priv->subject.label = gtk_label_new_with_mnemonic (_("S_ubject:"));
priv->subject.entry = gtk_entry_new ();
- gtk_label_set_mnemonic_widget (priv->subject.label, priv->subject.entry);
- g_signal_connect (priv->subject.entry, "changed",
- G_CALLBACK (entry_changed), hdrs);
+ gtk_label_set_mnemonic_widget((GtkLabel *)priv->subject.label, priv->subject.entry);
+ g_signal_connect(priv->subject.entry, "changed", G_CALLBACK(entry_changed), hdrs);
/*
* To, CC, and Bcc
@@ -1207,8 +1205,6 @@ void
e_msg_composer_hdrs_set_to (EMsgComposerHdrs *hdrs,
EDestination **to_destv)
{
- char *str;
-
g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
destinations_to_name_selector_entry (E_NAME_SELECTOR_ENTRY (hdrs->priv->to.entry), to_destv);
@@ -1218,8 +1214,6 @@ void
e_msg_composer_hdrs_set_cc (EMsgComposerHdrs *hdrs,
EDestination **cc_destv)
{
- char *str;
-
g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
destinations_to_name_selector_entry (E_NAME_SELECTOR_ENTRY (hdrs->priv->cc.entry), cc_destv);
@@ -1232,8 +1226,6 @@ void
e_msg_composer_hdrs_set_bcc (EMsgComposerHdrs *hdrs,
EDestination **bcc_destv)
{
- char *str;
-
g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
destinations_to_name_selector_entry (E_NAME_SELECTOR_ENTRY (hdrs->priv->bcc.entry), bcc_destv);
@@ -1459,7 +1451,6 @@ destination_list_to_destv (GList *destin
EDestination **
e_msg_composer_hdrs_get_to (EMsgComposerHdrs *hdrs)
{
- char *str = NULL;
EDestinationStore *destination_store;
GList *destinations;
EDestination **destv = NULL;
@@ -1479,7 +1470,6 @@ e_msg_composer_hdrs_get_to (EMsgComposer
EDestination **
e_msg_composer_hdrs_get_cc (EMsgComposerHdrs *hdrs)
{
- char *str = NULL;
EDestinationStore *destination_store;
GList *destinations;
EDestination **destv = NULL;
@@ -1499,7 +1489,6 @@ e_msg_composer_hdrs_get_cc (EMsgComposer
EDestination **
e_msg_composer_hdrs_get_bcc (EMsgComposerHdrs *hdrs)
{
- char *str = NULL;
EDestinationStore *destination_store;
GList *destinations;
EDestination **destv = NULL;
Index: composer/e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.515
diff -u -p -r1.515 e-msg-composer.c
--- composer/e-msg-composer.c 25 Jul 2005 05:03:32 -0000 1.515
+++ composer/e-msg-composer.c 23 Aug 2005 06:56:50 -0000
@@ -809,8 +809,9 @@ build_message (EMsgComposer *composer, g
camel_mime_part_set_encoding (CAMEL_MIME_PART (new), plain_encoding);
camel_object_unref (current);
+#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
skip_content:
-
+#endif
if (recipients) {
for (i=0; i<recipients->len; i++)
g_free(recipients->pdata[i]);
@@ -1657,7 +1658,7 @@ menu_file_close_cb (BonoboUIComponent *u
}
static void
-add_to_bar (GtkWidget *composer, GSList *names, int is_inline)
+add_to_bar (EMsgComposer *composer, GSList *names, int is_inline)
{
while (names) {
e_attachment_bar_attach((EAttachmentBar *)((EMsgComposer *)composer)->attachment_bar, names->data, is_inline ? "inline" : "attachment");
@@ -1671,7 +1672,7 @@ menu_file_add_attachment_cb (BonoboUICom
const char *path)
{
EMsgComposer *composer = E_MSG_COMPOSER (data);
- GtkWindow *toplevel = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (composer->attachment_bar)));
+ EMsgComposer *toplevel = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (composer->attachment_bar)));
GtkWidget **attachment_selector = e_attachment_bar_get_selector(E_ATTACHMENT_BAR(composer->attachment_bar));
e_msg_composer_select_file_attachments (toplevel, attachment_selector, add_to_bar);
@@ -3371,7 +3372,7 @@ static void
emcab_add(EPopup *ep, EPopupItem *item, void *data)
{
EAttachmentBar *bar = data;
- GtkWindow *toplevel = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (bar)));
+ EMsgComposer *toplevel = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (bar)));
GtkWidget **attachment_selector = e_attachment_bar_get_selector(E_ATTACHMENT_BAR(bar));
e_msg_composer_select_file_attachments (toplevel, attachment_selector, add_to_bar);
@@ -3415,7 +3416,7 @@ emcab_popup_position(GtkMenu *menu, int
if (selection == NULL)
return;
- image = gnome_icon_list_get_icon_pixbuf_item (icon_list, (gint)selection->data);
+ image = gnome_icon_list_get_icon_pixbuf_item (icon_list, GPOINTER_TO_INT(selection->data));
if (image == NULL)
return;
Index: e-util/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
retrieving revision 1.553
diff -u -p -r1.553 ChangeLog
--- e-util/ChangeLog 22 Aug 2005 19:46:44 -0000 1.553
+++ e-util/ChangeLog 23 Aug 2005 06:56:51 -0000
@@ -1,3 +1,25 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * e-util.c (e_mkdir_hier): cast warning, good ol win32 patches.
+ (e_strftime): fix some clahey-code to use the right variable and
+ not try to modify const strings by stealth.
+
+ * eggtrayicon.h: add missing prototype.
+
+ * e-gui-utils.c (e_create_image_widget): remove unused pixbuf.
+
+ * e-dialog-utils.c (dialog_realized): fix cast.
+ (e_dialog_set_transient_for_xid): same.
+ (e_file_dialog_save): fix cases for build.
+
+ * e-categories-config.c
+ (e_categories_config_open_dialog_for_entry): cast & use right type
+ for text.
+ (icons_table[]): remove unused.
+
+ * e-account-list.c (e_account_list_remove_account_proxies): cast
+ to fix warning.
+
2005-08-18 David Malcolm <dmalcolm redhat com>
* e-plugin.c (ep_set_enabled): Fix compiler warning on early bailout
Index: e-util/e-account-list.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-account-list.c,v
retrieving revision 1.11
diff -u -p -r1.11 e-account-list.c
--- e-util/e-account-list.c 10 Jul 2005 09:55:57 -0000 1.11
+++ e-util/e-account-list.c 23 Aug 2005 06:56:51 -0000
@@ -316,7 +316,7 @@ e_account_list_remove_account_proxies (E
{
EAccount *child_account;
- while ( (child_account = e_account_list_find (accounts, E_ACCOUNT_FIND_PARENT_UID, account->uid))) {
+ while ( (child_account = (EAccount *)e_account_list_find (accounts, E_ACCOUNT_FIND_PARENT_UID, account->uid))) {
e_account_list_remove (accounts, child_account);
child_account = NULL;
}
Index: e-util/e-categories-config.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-categories-config.c,v
retrieving revision 1.19
diff -u -p -r1.19 e-categories-config.c
--- e-util/e-categories-config.c 7 Jan 2005 18:08:56 -0000 1.19
+++ e-util/e-categories-config.c 23 Aug 2005 06:56:51 -0000
@@ -16,8 +16,6 @@
#include <libedataserverui/e-categories-dialog.h>
#include "e-categories-config.h"
-static GHashTable *icons_table = NULL;
-
/**
* e_categories_config_get_icon_for:
* @category: Category for which to get the icon.
@@ -78,7 +76,6 @@ e_categories_config_open_dialog_for_entr
{
GtkDialog *dialog;
const char *text;
- char *categories;
int result;
g_return_if_fail (entry != NULL);
@@ -87,14 +84,14 @@ e_categories_config_open_dialog_for_entr
text = gtk_entry_get_text (GTK_ENTRY (entry));
dialog = GTK_DIALOG (e_categories_dialog_new (text));
- gtk_window_set_transient_for (GTK_WINDOW (dialog), gtk_widget_get_toplevel (GTK_WIDGET (entry)));
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW(gtk_widget_get_toplevel (GTK_WIDGET (entry))));
/* run the dialog */
result = gtk_dialog_run (dialog);
if (result == GTK_RESPONSE_OK) {
- categories = e_categories_dialog_get_categories (E_CATEGORIES_DIALOG (dialog));
- gtk_entry_set_text (GTK_ENTRY (entry), categories);
+ text = e_categories_dialog_get_categories (E_CATEGORIES_DIALOG (dialog));
+ gtk_entry_set_text (GTK_ENTRY (entry), text);
}
gtk_object_destroy (GTK_OBJECT (dialog));
Index: e-util/e-dialog-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-dialog-utils.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-dialog-utils.c
--- e-util/e-dialog-utils.c 25 Aug 2004 10:59:00 -0000 1.21
+++ e-util/e-dialog-utils.c 23 Aug 2005 06:56:51 -0000
@@ -197,7 +197,7 @@ e_dialog_set_transient_for (GtkWindow *d
static void
dialog_realized (GtkWindow *dialog, gpointer xid)
{
- e_dialog_set_transient_for_xid (dialog, (GdkNativeWindow)xid);
+ e_dialog_set_transient_for_xid (dialog, (GdkNativeWindow)GPOINTER_TO_INT(xid));
}
/**
@@ -222,7 +222,7 @@ e_dialog_set_transient_for_xid (GtkWindo
if (!GTK_WIDGET_REALIZED (dialog)) {
g_signal_connect (dialog, "realize",
G_CALLBACK (dialog_realized),
- (gpointer) xid);
+ GINT_TO_POINTER(xid));
return;
}
@@ -294,7 +294,7 @@ char *
e_file_dialog_save (const char *title)
{
GtkWidget *selection;
- char *path, *filename = NULL;
+ char *filename = NULL;
#ifdef USE_GTKFILECHOOSER
selection = gtk_file_chooser_dialog_new (title,
@@ -308,6 +308,8 @@ e_file_dialog_save (const char *title)
g_signal_connect (G_OBJECT (selection), "response", G_CALLBACK (filechooser_response), &filename);
#else
+ char *path;
+
selection = gtk_file_selection_new (title);
path = g_strdup_printf ("%s/", g_get_home_dir ());
gtk_file_selection_set_filename (GTK_FILE_SELECTION (selection), path);
Index: e-util/e-gui-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-gui-utils.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-gui-utils.c
--- e-util/e-gui-utils.c 26 Nov 2004 14:57:49 -0000 1.21
+++ e-util/e-gui-utils.c 23 Aug 2005 06:56:51 -0000
@@ -36,7 +36,6 @@ GtkWidget *e_create_image_widget(gchar *
gint int1, gint int2)
{
GtkWidget *alignment = NULL;
- GdkPixbuf *pixbuf;
GtkWidget *w;
if (string1) {
Index: e-util/e-util.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-util.c,v
retrieving revision 1.64
diff -u -p -r1.64 e-util.c
--- e-util/e-util.c 17 Jun 2005 15:20:29 -0000 1.64
+++ e-util/e-util.c 23 Aug 2005 06:56:52 -0000
@@ -272,7 +272,7 @@ e_mkdir_hier(const char *path, mode_t mo
g_free (current_dir);
}
- p = g_path_skip_root (p);
+ p = (char *)g_path_skip_root (p);
do {
char *p1 = strchr (p, '/');
#ifdef G_OS_WIN32
@@ -774,7 +774,7 @@ size_t e_strftime(char *s, size_t max, c
ff = c;
}
- ff = fmt;
+ ff = ffmt;
while ((c = strstr(ff, "%k")) != NULL) {
c[1] = 'H';
ff = c;
Index: e-util/eggtrayicon.h
===================================================================
RCS file: /cvs/gnome/evolution/e-util/eggtrayicon.h,v
retrieving revision 1.2
diff -u -p -r1.2 eggtrayicon.h
--- e-util/eggtrayicon.h 27 Aug 2004 00:21:33 -0000 1.2
+++ e-util/eggtrayicon.h 23 Aug 2005 06:56:52 -0000
@@ -58,6 +58,8 @@ struct _EggTrayIconClass
GType egg_tray_icon_get_type (void);
+EggTrayIcon *egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name);
+
EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen *screen,
const gchar *name);
Index: filter/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/filter/ChangeLog,v
retrieving revision 1.426
diff -u -p -r1.426 ChangeLog
--- filter/ChangeLog 9 Aug 2005 23:29:27 -0000 1.426
+++ filter/ChangeLog 23 Aug 2005 06:56:52 -0000
@@ -1,3 +1,7 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * filter-rule.c (get_widget): cast.
+
2005-08-10 Tor Lillqvist <tml novell com>
* Makefile.am: Use privsolib instead of privlib. On Unix they are
Index: filter/filter-rule.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-rule.c,v
retrieving revision 1.68
diff -u -p -r1.68 filter-rule.c
--- filter/filter-rule.c 16 May 2005 06:14:34 -0000 1.68
+++ filter/filter-rule.c 23 Aug 2005 06:56:52 -0000
@@ -790,7 +790,7 @@ get_widget (FilterRule *fr, struct _Rule
label = gtk_label_new_with_mnemonic (_("_Rule name:"));
name = gtk_entry_new ();
- gtk_label_set_mnemonic_widget (label, name);
+ gtk_label_set_mnemonic_widget ((GtkLabel *)label, name);
if (!fr->name) {
fr->name = g_strdup (_("Untitled"));
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3701
diff -u -p -r1.3701 ChangeLog
--- mail/ChangeLog 22 Aug 2005 02:54:51 -0000 1.3701
+++ mail/ChangeLog 23 Aug 2005 06:56:56 -0000
@@ -1,3 +1,25 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * mail-tools.c (mail_tool_uri_to_folder): cast warning away.
+
+ * mail-folder-cache.c: include missing header for
+ e_filename_make_safe.
+
+ * em-junk-hook.h: Fix some header includes, fix the include guard
+ to use the right name.
+ (EMJunk): Ugh, this is an object, properly derive from it! How
+ did this work?
+
+ * em-junk-hook.c (em_junk_check_junk): fix bool conversion.
+
+ * em-format-html-display.c (efhd_bar_popup_position): another
+ wraning, why this crap isn't in the attachment bar like i said it
+ should be, i'll never know.
+ (efhd_xpkcs7mime_viewcert_foad): only define if used.
+
+ * em-account-editor.c (emae_defaults_page): attempt to fix parentheses
+ (emae_security_page): fix conditional compilation warnings.
+
2005-08-19 Not Zed <NotZed Ximian com>
** See #312668.
Index: mail/em-account-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-account-editor.c,v
retrieving revision 1.34
diff -u -p -r1.34 em-account-editor.c
--- mail/em-account-editor.c 12 Aug 2005 10:58:06 -0000 1.34
+++ mail/em-account-editor.c 23 Aug 2005 06:56:57 -0000
@@ -2151,9 +2151,9 @@ emae_defaults_page(EConfig *ec, EConfigI
&& ( emae->priv->source.provider && !(emae->priv->source.provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER)));
gtk_widget_set_sensitive((GtkWidget *)gui->restore_folders_button,
- (e_account_writable(emae->account, E_ACCOUNT_SENT_FOLDER_URI) &&
- ( emae->priv->source.provider && ! ( emae->priv->source.provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER)) ||
- e_account_writable(emae->account, E_ACCOUNT_DRAFTS_FOLDER_URI)));
+ (e_account_writable(emae->account, E_ACCOUNT_SENT_FOLDER_URI)
+ && ((emae->priv->source.provider && !( emae->priv->source.provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER))
+ || e_account_writable(emae->account, E_ACCOUNT_DRAFTS_FOLDER_URI))));
/* Receipt policy */
emae_setup_receipt_policy (emae, xml);
@@ -2172,7 +2172,9 @@ static GtkWidget *
emae_security_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
{
EMAccountEditor *emae = data;
+#if defined (HAVE_NSS)
EMAccountEditorPrivate *gui = emae->priv;
+#endif
GtkWidget *w;
GladeXML *xml;
Index: mail/em-format-html-display.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-html-display.c,v
retrieving revision 1.75
diff -u -p -r1.75 em-format-html-display.c
--- mail/em-format-html-display.c 19 Aug 2005 05:38:22 -0000 1.75
+++ mail/em-format-html-display.c 23 Aug 2005 06:56:58 -0000
@@ -738,13 +738,13 @@ efhd_xpkcs7mime_info_response(GtkWidget
po->widget = NULL;
}
+#ifdef HAVE_NSS
static void
efhd_xpkcs7mime_viewcert_foad(GtkWidget *w, guint button, struct _smime_pobject *po)
{
gtk_widget_destroy(w);
}
-#ifdef HAVE_NSS
static void
efhd_xpkcs7mime_viewcert_clicked(GtkWidget *button, struct _smime_pobject *po)
{
@@ -1772,7 +1772,7 @@ efhd_bar_popup_position(GtkMenu *menu, i
if (selection == NULL)
return;
- image = gnome_icon_list_get_icon_pixbuf_item (icon_list, (gint)selection->data);
+ image = gnome_icon_list_get_icon_pixbuf_item (icon_list, GPOINTER_TO_INT(selection->data));
if (image == NULL)
return;
Index: mail/em-junk-hook.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-junk-hook.c,v
retrieving revision 1.1
diff -u -p -r1.1 em-junk-hook.c
--- mail/em-junk-hook.c 6 Jul 2005 04:42:33 -0000 1.1
+++ mail/em-junk-hook.c 23 Aug 2005 06:56:58 -0000
@@ -89,7 +89,7 @@ em_junk_check_junk(CamelJunkPlugin *csp,
m
};
- return (gboolean)(e_plugin_invoke(item->hook->hook.plugin, item->check_junk, &target));
+ return e_plugin_invoke(item->hook->hook.plugin, item->check_junk, &target) != NULL;
}
return FALSE;
@@ -170,21 +170,19 @@ static struct _EMJunkHookItem *
emjh_construct_item(EPluginHook *eph, EMJunkHookGroup *group, xmlNodePtr root)
{
struct _EMJunkHookItem *item;
- EMJunk junk_plugin = {
- {
- em_junk_get_name,
- 1,
- em_junk_check_junk,
- em_junk_report_junk,
- em_junk_report_non_junk,
- em_junk_commit_reports,
- em_junk_init,
- }
+ CamelJunkPlugin junk_plugin = {
+ em_junk_get_name,
+ 1,
+ em_junk_check_junk,
+ em_junk_report_junk,
+ em_junk_report_non_junk,
+ em_junk_commit_reports,
+ em_junk_init,
};
d(printf(" loading group item\n"));
item = g_malloc0(sizeof(*item));
- item->csp = junk_plugin.csp;
+ item->csp = junk_plugin;
item->check_junk = e_plugin_xml_prop(root, "check_junk");
item->report_junk = e_plugin_xml_prop(root, "report_junk");
item->report_non_junk = e_plugin_xml_prop(root, "report_non_junk");
Index: mail/em-junk-hook.h
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-junk-hook.h,v
retrieving revision 1.1
diff -u -p -r1.1 em-junk-hook.h
--- mail/em-junk-hook.h 6 Jul 2005 04:42:33 -0000 1.1
+++ mail/em-junk-hook.h 23 Aug 2005 06:56:58 -0000
@@ -20,14 +20,13 @@
*
*/
-#ifndef __EM_FORMAT_HOOK_H__
-#define __EM_FORMAT_HOOK_H__
+#ifndef __EM_JUNK_HOOK_H__
+#define __EM_JUNK_HOOK_H__
-#include <glib-object.h>
-#include "libedataserver/e-msgport.h"
#include "e-util/e-plugin.h"
+
#include <camel/camel-junk-plugin.h>
-#include <camel/camel-mime-message.h>
+
#ifdef __cplusplus
extern "C" {
#pragma }
@@ -45,7 +44,7 @@ typedef struct _EMJunkHookTarget EMJunkH
typedef void (*EMJunkHookFunc)(struct _EPlugin *plugin, EMJunkHookTarget *data);
struct _EMJunkHookTarget {
- CamelMimeMessage *m;
+ struct _CamelMimeMessage *m;
};
struct _EMJunkHookItem {
@@ -79,6 +78,8 @@ GType em_junk_hook_get_type(void);
void em_junk_hook_register_type(GType type);
struct _EMJunk {
+ GObject object;
+
CamelJunkPlugin csp;
};
Index: mail/mail-folder-cache.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-folder-cache.c,v
retrieving revision 1.101
diff -u -p -r1.101 mail-folder-cache.c
--- mail/mail-folder-cache.c 12 Aug 2005 08:31:19 -0000 1.101
+++ mail/mail-folder-cache.c 23 Aug 2005 06:56:58 -0000
@@ -43,6 +43,8 @@
#include <camel/camel-offline-store.h>
#include <camel/camel-disco-store.h>
+#include "e-util/e-util.h"
+
#include "mail-mt.h"
#include "mail-folder-cache.h"
#include "mail-ops.h"
Index: mail/mail-tools.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-tools.c,v
retrieving revision 1.138
diff -u -p -r1.138 mail-tools.c
--- mail/mail-tools.c 21 Jul 2005 04:15:21 -0000 1.138
+++ mail/mail-tools.c 23 Aug 2005 06:56:58 -0000
@@ -293,7 +293,7 @@ mail_tool_uri_to_folder (const char *uri
return NULL;
}
- store = camel_session_get_service(session, uri+offset, CAMEL_PROVIDER_STORE, ex);
+ store = (CamelStore *)camel_session_get_service(session, uri+offset, CAMEL_PROVIDER_STORE, ex);
if (store) {
const char *name;
Index: plugins/addressbook-file/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/addressbook-file/ChangeLog,v
retrieving revision 1.5
diff -u -p -r1.5 ChangeLog
--- plugins/addressbook-file/ChangeLog 27 Jun 2005 00:55:22 -0000 1.5
+++ plugins/addressbook-file/ChangeLog 23 Aug 2005 06:56:58 -0000
@@ -1,3 +1,9 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * addressbook-file.c (e_book_file_dummy): fix relative_uri type,
+ don't include every header in the world we dont' need. And it
+ sure has hell seems to do something for a 'dummy' function.
+
2005-06-27 Tor Lillqvist <tml novell com>
* Makefile.am: There is no EVOLUTION_CFLAGS. Use
Index: plugins/addressbook-file/addressbook-file.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/addressbook-file/addressbook-file.c,v
retrieving revision 1.2
diff -u -p -r1.2 addressbook-file.c
--- plugins/addressbook-file/addressbook-file.c 4 Mar 2005 17:30:24 -0000 1.2
+++ plugins/addressbook-file/addressbook-file.c 23 Aug 2005 06:56:58 -0000
@@ -19,29 +19,20 @@
*
*/
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkhbox.h>
#include <e-util/e-config.h>
#include <addressbook/gui/widgets/eab-config.h>
#include <libedataserver/e-source.h>
-#include <libgnome/gnome-i18n.h>
#include <string.h>
-GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
+struct _GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
-GtkWidget *
+struct _GtkWidget *
e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data)
{
EABConfigTargetSource *t = (EABConfigTargetSource *) data->target;
ESource *source = t->source;
char *uri_text;
- char *relative_uri;
+ const char *relative_uri;
uri_text = e_source_get_uri (source);
if (strncmp (uri_text, "file", 4)) {
Index: plugins/calendar-file/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/calendar-file/ChangeLog,v
retrieving revision 1.7
diff -u -p -r1.7 ChangeLog
--- plugins/calendar-file/ChangeLog 27 Jun 2005 00:55:22 -0000 1.7
+++ plugins/calendar-file/ChangeLog 23 Aug 2005 06:56:58 -0000
@@ -1,3 +1,7 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * calendar-file.c (e_calendar_file_dummy): fix relative_uri type.
+
2005-06-27 Tor Lillqvist <tml novell com>
* Makefile.am: There is no EVOLUTION_CFLAGS. Use
Index: plugins/calendar-file/calendar-file.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/calendar-file/calendar-file.c,v
retrieving revision 1.2
diff -u -p -r1.2 calendar-file.c
--- plugins/calendar-file/calendar-file.c 4 Mar 2005 17:31:58 -0000 1.2
+++ plugins/calendar-file/calendar-file.c 23 Aug 2005 06:56:58 -0000
@@ -42,7 +42,7 @@ e_calendar_file_dummy (EPlugin *epl, ECo
ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target;
ESource *source = t->source;
char *uri_text;
- char *relative_uri;
+ const char *relative_uri;
uri_text = e_source_get_uri (source);
if (strncmp (uri_text, "file", 4)) {
Index: plugins/default-source/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/default-source/ChangeLog,v
retrieving revision 1.5
diff -u -p -r1.5 ChangeLog
--- plugins/default-source/ChangeLog 9 Aug 2005 21:56:33 -0000 1.5
+++ plugins/default-source/ChangeLog 23 Aug 2005 06:56:58 -0000
@@ -1,3 +1,7 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * default-source.c: forward declare exported func.
+
2005-08-10 Tor Lillqvist <tml novell com>
* org-gnome-default-source.eplug.in: Use SOEXT.
Index: plugins/default-source/default-source.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/default-source/default-source.c,v
retrieving revision 1.2
diff -u -p -r1.2 default-source.c
--- plugins/default-source/default-source.c 6 May 2005 06:41:55 -0000 1.2
+++ plugins/default-source/default-source.c 23 Aug 2005 06:56:58 -0000
@@ -94,6 +94,7 @@ org_gnome_default_book (EPlugin *epl, EC
return widget;
}
+GtkWidget *org_gnome_default_cal (EPlugin *epl, EConfigHookItemFactoryData *data);
GtkWidget *
org_gnome_default_cal (EPlugin *epl, EConfigHookItemFactoryData *data)
Index: plugins/groupwise-account-setup/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-account-setup/ChangeLog,v
retrieving revision 1.19
diff -u -p -r1.19 ChangeLog
--- plugins/groupwise-account-setup/ChangeLog 4 Aug 2005 05:28:00 -0000 1.19
+++ plugins/groupwise-account-setup/ChangeLog 23 Aug 2005 06:56:58 -0000
@@ -1,3 +1,10 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * groupwise-account-setup.c (org_gnome_groupwise_account_setup):
+ def9ine before defining.
+
+ * camel-gw-listener.c (account_added): fix warning.
+
2005-07-27 Sankar P <psankar novell com>
* camel-gw-listener.c (get_addressbook_names_from_server) :
Index: plugins/groupwise-account-setup/camel-gw-listener.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-account-setup/camel-gw-listener.c,v
retrieving revision 1.36
diff -u -p -r1.36 camel-gw-listener.c
--- plugins/groupwise-account-setup/camel-gw-listener.c 4 Aug 2005 05:28:00 -0000 1.36
+++ plugins/groupwise-account-setup/camel-gw-listener.c 23 Aug 2005 06:56:58 -0000
@@ -803,7 +803,7 @@ account_added (EAccountList *account_lis
info->name = g_strdup (account->name);
info->source_url = g_strdup (account->source->url);
if (account->parent_uid) {
- parent = e_account_list_find (account_listener, E_ACCOUNT_FIND_UID, account->parent_uid);
+ parent = (EAccount *)e_account_list_find (account_listener, E_ACCOUNT_FIND_UID, account->parent_uid);
if (!parent)
return;
Index: plugins/groupwise-account-setup/groupwise-account-setup.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-account-setup/groupwise-account-setup.c,v
retrieving revision 1.4
diff -u -p -r1.4 groupwise-account-setup.c
--- plugins/groupwise-account-setup/groupwise-account-setup.c 10 Jul 2005 11:18:29 -0000 1.4
+++ plugins/groupwise-account-setup/groupwise-account-setup.c 23 Aug 2005 06:56:58 -0000
@@ -52,11 +52,11 @@ e_plugin_lib_enable (EPluginLib *ep, int
}
+GtkWidget * org_gnome_groupwise_account_setup(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
+
GtkWidget *
org_gnome_groupwise_account_setup(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
{
- GtkWidget *w;
-
if (data->old)
return data->old;
/* FIXME, with new soap camel provider we don't need extra settings in receiving options page, Remove them
Index: plugins/groupwise-features/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/ChangeLog,v
retrieving revision 1.30
diff -u -p -r1.30 ChangeLog
--- plugins/groupwise-features/ChangeLog 22 Aug 2005 12:21:42 -0000 1.30
+++ plugins/groupwise-features/ChangeLog 23 Aug 2005 06:56:59 -0000
@@ -1,3 +1,30 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * proxy-login.c (proxy_get_password): return the right type.
+ (proxy_soap_login): fix pointer cast.
+ (proxy_login_add_new_store): fix pointer cast.
+ (proxy_login_setup_tree_view): fix callback cast.
+ (org_gnome_proxy_account_login): fix prototype to match use.
+
+ * junk-settings.c (user_selected): fix calling.
+ (junk_settings_construct): more stupid casts.
+
+ * junk-mail-settings.c (junk_mail_settings): casts.
+
+ * install-shared.c (install_folder_response): constify item_id.
+ (install_folder_response): remove unused.
+ (org_gnome_popup_wizard): fixed numerous problems with this,
+ over-copying data around, not referencing information properly,
+ freeing potentially unset variables, etc etc.
+ (accept_free): add a free function.
+
+ * share-folder.c (notification_clicked): fix a multitude of busted
+ casts.
+ (user_selected): fix broken calling conventions, busted style.
+ (share_folder_construct): fix more busted/missing casts.
+
+ * share-folder-common.c: add missing header.
+
2005-08-22 vivek jain <jvivek novell com>
** see previous commit
Index: plugins/groupwise-features/install-shared.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/install-shared.c,v
retrieving revision 1.3
diff -u -p -r1.3 install-shared.c
--- plugins/groupwise-features/install-shared.c 22 Aug 2005 12:21:42 -0000 1.3
+++ plugins/groupwise-features/install-shared.c 23 Aug 2005 06:56:59 -0000
@@ -48,13 +48,11 @@
#include <e-gw-connection.h>
#include <share-folder.h>
-CamelSession *session;
struct AcceptData {
- const char *item_id;
+ CamelMimeMessage *msg;
EMFolderTreeModel *model;
};
-
void org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target);
static void
@@ -67,11 +65,11 @@ install_folder_response (EMFolderSelecto
gchar **names;
gchar *folder_name;
gchar *parent_name;
- gchar *container_id,*item_id;
+ gchar *container_id;
+ const char *item_id;
CamelException ex;
CamelStore *store;
CamelFolder *folder;
- CamelFolderChangeInfo *changes;
EAccount *account;
CamelProvider *provider;
EGwConnection *cnc;
@@ -80,7 +78,7 @@ install_folder_response (EMFolderSelecto
gtk_widget_destroy (GTK_WIDGET (emfs));
} else {
model = accept_data->model;
- item_id = accept_data->item_id;
+ item_id = camel_mime_message_get_message_id (accept_data->msg);
uri = em_folder_selector_get_selected_uri (emfs);
path = em_folder_selector_get_selected_path (emfs);
names = g_strsplit (path, "/", -1);
@@ -97,7 +95,7 @@ install_folder_response (EMFolderSelecto
parent_name = NULL;
}
camel_exception_init (&ex);
- if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex))) {
+ if (!(store = (CamelStore *) camel_session_get_service (mail_component_peek_session(NULL), uri, CAMEL_PROVIDER_STORE, &ex))) {
camel_exception_clear (&ex);
return;
}
@@ -106,7 +104,7 @@ install_folder_response (EMFolderSelecto
if(E_IS_GW_CONNECTION (cnc)) {
container_id = get_container_id (cnc, parent_name);
- if(e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, item_id, NULL) == E_GW_CONNECTION_STATUS_OK) {
+ if(e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (char *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) {
folder = camel_store_get_folder (store, "Mailbox", 0, NULL);
@@ -142,24 +140,36 @@ install_folder_response (EMFolderSelecto
}
+static void
+accept_free(void *data)
+{
+ struct AcceptData *accept_data = data;
+
+ camel_object_unref(accept_data->msg);
+ g_free(accept_data);
+}
+
static void
-accept_clicked(GnomeDruidPage *page, GtkWidget *druid, const char *id)
+accept_clicked(GnomeDruidPage *page, GtkWidget *druid, CamelMimeMessage *msg)
{
EMFolderTreeModel *model;
EMFolderTree *folder_tree;
GtkWidget *dialog ;
struct AcceptData *accept_data;
char *uri;
+
accept_data = g_new0(struct AcceptData, 1);
- model = mail_component_peek_tree_model (mail_component_peek ());
+ model = mail_component_peek_tree_model (NULL);
folder_tree = (EMFolderTree *) em_folder_tree_new_with_model (model);
dialog = em_folder_selector_create_new (folder_tree, 0, _("Create folder"), _("Specify where to create the folder:"));
uri = em_folder_tree_get_selected_uri(folder_tree);
em_folder_selector_set_selected ((EMFolderSelector *) dialog, uri);
g_free(uri);
- accept_data->item_id = id;
+ accept_data->msg = msg;
+ camel_object_ref(msg);
accept_data->model = model;
- g_signal_connect (dialog, "response", G_CALLBACK (install_folder_response), accept_data);
+ g_object_set_data_full((GObject *)dialog, "accept-data", accept_data, accept_free);
+! g_signal_connect (dialog, "response", G_CALLBACK (install_folder_response), accept_data);
gtk_window_set_title (GTK_WINDOW (dialog), "Install Shared Folder");
gtk_widget_destroy (druid);
gtk_widget_show (dialog);
@@ -170,19 +180,17 @@ void
org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
{
const CamelInternetAddress *from_addr = NULL;
- const char *name, *item_id;
+ const char *name;
const char *email;
GtkWidget *window;
GnomeDruid *wizard;
GnomeDruidPageEdge *title_page;
CamelMimeMessage *msg = (CamelMimeMessage *) target->message ;
CamelStreamMem *content ;
- CamelDataWrapper *dw ;
+ CamelDataWrapper *dw;
CamelMimePart *mime_part ;
- CamelMultipart *mp ;
char *notification;
char *start_message;
- char *buffer = NULL;
/* XXX:Remove this when server has a fix to show mails in shared-folder*/
if (!getenv("GROUPWISE_SHARED_FOLDER"))
@@ -192,46 +200,40 @@ org_gnome_popup_wizard (EPlugin *ep, EME
return ;
mime_part = CAMEL_MIME_PART(msg) ;
- notification = (char *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification") ;
- if (!notification) {
- return ;
-
+ if ((notification = (char *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL
+ || (from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message)) == NULL
+ || !camel_internet_address_get(from_addr, 0, &name, &email)
+ || (dw = camel_medium_get_content_object (CAMEL_MEDIUM (msg))) == NULL) {
+ return;
} else {
- mp = (CamelMultipart *) camel_medium_get_content_object (CAMEL_MEDIUM (msg)) ;
- dw = camel_data_wrapper_new () ;
- content = (CamelStreamMem *)camel_stream_mem_new();
- if (!mp)
- return ;
-
- if (CAMEL_IS_MULTIPART (mp)) {
- mime_part = camel_multipart_get_part (mp, 0) ;
- dw = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part)) ;
- camel_data_wrapper_write_to_stream(dw, (CamelStream *)content) ;
- buffer = g_malloc0 (content->buffer->len+1) ;
- buffer = memcpy (buffer, content->buffer->data, content->buffer->len) ;
-
- } else {
- dw = camel_medium_get_content_object (CAMEL_MEDIUM (msg)) ;
- camel_data_wrapper_write_to_stream(dw, (CamelStream *)content) ;
- buffer = g_malloc0 (content->buffer->len+1) ;
- buffer = memcpy (buffer, content->buffer->data, content->buffer->len) ;
+ if (CAMEL_IS_MULTIPART (dw)) {
+ dw = camel_medium_get_content_object((CamelMedium *)camel_multipart_get_part((CamelMultipart *)dw, 0));
+ if (dw == NULL)
+ return;
}
+ content = (CamelStreamMem *)camel_stream_mem_new();
+ camel_data_wrapper_write_to_stream(dw, (CamelStream *)content) ;
+ camel_stream_write((CamelStream *)content, "", 1);
+
from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message);
- if (camel_internet_address_get (from_addr,0, &name, &email)) {
- start_message = g_strconcat (" The User ", "'", name, "'" ," has shared a folder with you\n\n", " Message from ", "'" , name, "'\n\n\n", buffer, "\n\n\n", "Click 'Forward' to install the shared folder\n\n",NULL);
+ if (from_addr && camel_internet_address_get(from_addr, 0, &name, &email)) {
+ /* FIXME: this needs translating ... */
+ start_message = g_strconcat (" The User ", "'", name, "'" ," has shared a folder with you\n\n",
+ " Message from ", "'" , name, "'\n\n\n", content->buffer->data, "\n\n\n", "Click 'Forward' to install the shared folder\n\n",NULL);
title_page = GNOME_DRUID_PAGE_EDGE (gnome_druid_page_edge_new_with_vals(GNOME_EDGE_START, TRUE, "Install the shared folder", start_message, NULL, NULL, NULL));
+ g_free(start_message);
wizard = GNOME_DRUID (gnome_druid_new_with_window ("Shared Folder Installation", NULL, TRUE, (GtkWidget**)(&window)));
gtk_window_set_position (GTK_WINDOW (window) , GTK_WIN_POS_CENTER_ALWAYS);
gnome_druid_append_page(wizard, GNOME_DRUID_PAGE(title_page));
gtk_widget_show_all (GTK_WIDGET (title_page));
- item_id = camel_mime_message_get_message_id (msg);
- g_signal_connect (title_page, "next", G_CALLBACK(accept_clicked), item_id);
+ camel_object_ref(msg);
+ g_object_set_data_full((GObject *)title_page, "msg", msg, camel_object_unref);
+ g_signal_connect (title_page, "next", G_CALLBACK(accept_clicked), msg);
} else
g_warning ("Could not get the sender name");
- g_free (buffer) ;
- g_free (start_message) ;
+ camel_object_unref(content);
}
}
Index: plugins/groupwise-features/junk-mail-settings.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/junk-mail-settings.c,v
retrieving revision 1.3
diff -u -p -r1.3 junk-mail-settings.c
--- plugins/groupwise-features/junk-mail-settings.c 19 Jul 2005 11:00:16 -0000 1.3
+++ plugins/groupwise-features/junk-mail-settings.c 23 Aug 2005 06:56:59 -0000
@@ -91,13 +91,13 @@ junk_mail_settings (EPopup *ep, EPopupIt
gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 6);
junk_tab = junk_settings_new (cnc);
- w = junk_tab->vbox;
+ w = (GtkWidget *)junk_tab->vbox;
gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 6);
/*We might have to add more options for settings i.e. more pages*/
while (page_count > 0 ){
notebook = gtk_notebook_new ();
- gtk_notebook_append_page (notebook, box, NULL);
+ gtk_notebook_append_page ((GtkNotebook *)notebook, box, NULL);
gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, notebook, TRUE, TRUE, 0);
}
Index: plugins/groupwise-features/junk-settings.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/junk-settings.c,v
retrieving revision 1.1
diff -u -p -r1.1 junk-settings.c
--- plugins/groupwise-features/junk-settings.c 7 Jul 2005 09:02:29 -0000 1.1
+++ plugins/groupwise-features/junk-settings.c 23 Aug 2005 06:56:59 -0000
@@ -361,8 +361,10 @@ remove_clicked(GtkButton *button, JunkSe
static void
user_selected(GtkTreeSelection *selection, JunkSettings *js)
{
+ GtkTreeModel *model;
+
gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
- if (gtk_tree_selection_get_selected (selection, &(js->model), &(js->iter))){
+ if (gtk_tree_selection_get_selected (selection, &model, &(js->iter))){
gtk_widget_set_sensitive (GTK_WIDGET (js->remove), TRUE);
}
@@ -381,7 +383,7 @@ junk_settings_construct (JunkSettings *j
g_warning ("could not get xml");
}
js->vbox = GTK_VBOX (glade_xml_get_widget(js->xml, "vboxSettings"));
- js->table = GTK_WIDGET (glade_xml_get_widget (js->xml, "vbox194"));
+ js->table = GTK_VBOX (glade_xml_get_widget (js->xml, "vbox194"));
gtk_widget_set_sensitive (GTK_WIDGET (js->table), FALSE);
js->enable = GTK_RADIO_BUTTON (glade_xml_get_widget (js->xml, "radEnable"));
@@ -407,7 +409,7 @@ junk_settings_construct (JunkSettings *j
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (js->scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
js->model = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
- js->entry_list = gtk_tree_view_new ();
+ js->entry_list = (GtkTreeView *)gtk_tree_view_new ();
/*gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (js->scrolled_window), (GtkWidget *)js->entry_list);*/
gtk_container_add (GTK_CONTAINER (js->scrolled_window), (GtkWidget *)js->entry_list);
gtk_tree_view_set_model (GTK_TREE_VIEW (js->entry_list), GTK_TREE_MODEL (js->model));
Index: plugins/groupwise-features/proxy-login.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/proxy-login.c,v
retrieving revision 1.1
diff -u -p -r1.1 proxy-login.c
--- plugins/groupwise-features/proxy-login.c 20 Jul 2005 05:11:33 -0000 1.1
+++ plugins/groupwise-features/proxy-login.c 23 Aug 2005 06:56:59 -0000
@@ -61,15 +61,13 @@
#include <e-gw-connection.h>
#include <e-gw-message.h>
#include <libedataserverui/e-name-selector.h>
-#include <proxy-login.h>
+#include "proxy-login.h"
#define GW(name) glade_xml_get_widget (priv->xml, name)
#define ACCOUNT_PICTURE 0
#define ACCOUNT_NAME 1
-void org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, char *uri);
-
proxyLogin *pld = NULL;
static GObjectClass *parent_class = NULL;
@@ -198,11 +196,11 @@ proxy_get_password (EAccount *account, c
url = camel_url_new (account->source->url, NULL);
if (url == NULL)
- return NULL;
+ return 0;
*user_name = g_strdup (url->user);
poa_address = url->host;
if (!poa_address || strlen (poa_address) ==0)
- return NULL;
+ return 0;
soap_port = camel_url_get_param (url, "soap_port");
if (!soap_port || strlen (soap_port) == 0)
@@ -354,7 +352,7 @@ proxy_soap_login (char *email)
e_account_list_add(accounts, dstAccount);
e_account_list_change (accounts, srcAccount);
e_account_list_save(accounts);
- g_object_set_data ((GObject *)dstAccount, "permissions", permissions);
+ g_object_set_data ((GObject *)dstAccount, "permissions", GINT_TO_POINTER(permissions));
mail_get_store(e_account_get_string(dstAccount, E_ACCOUNT_SOURCE_URL), NULL, proxy_login_add_new_store, dstAccount);
g_free (proxy_source_url);
@@ -376,7 +374,7 @@ proxy_login_add_new_store (char *uri, Ca
{
MailComponent *component = mail_component_peek ();
EAccount *account = user_data;
- int permissions = g_object_get_data ((GObject *)account, "permissions");
+ int permissions = GPOINTER_TO_INT(g_object_get_data ((GObject *)account, "permissions"));
if (store == NULL)
return;
@@ -427,7 +425,7 @@ proxy_login_setup_tree_view (void)
gtk_tree_view_set_model (priv->tree, GTK_TREE_MODEL (priv->store));
selection = gtk_tree_view_get_selection (priv->tree);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
- g_signal_connect (G_OBJECT (selection), "changed", proxy_login_tree_view_changed_cb, NULL);
+ g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK(proxy_login_tree_view_changed_cb), NULL);
}
static void
@@ -461,8 +459,9 @@ proxy_login_update_tree (void)
}
void
-org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, char *uri)
+org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, void *data)
{
+ char *uri = data;
proxyLoginPrivate *priv;
pld = proxy_login_new();
Index: plugins/groupwise-features/proxy-login.h
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/proxy-login.h,v
retrieving revision 1.1
diff -u -p -r1.1 proxy-login.h
--- plugins/groupwise-features/proxy-login.h 20 Jul 2005 05:11:33 -0000 1.1
+++ plugins/groupwise-features/proxy-login.h 23 Aug 2005 06:56:59 -0000
@@ -54,7 +54,7 @@ proxyLogin * proxy_login_new (void);
static void proxy_login_cb (GtkDialog *dialog, gint state);
static void proxy_login_add_new_store (char *uri, CamelStore *store, void *user_data);
static void proxy_login_setup_tree_view (void);
-void org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, char *uri);
+void org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, void *data);
proxyLogin* proxy_dialog_new (void);
static void proxy_soap_login (char *email);
char *parse_email_for_name (char *email);
Index: plugins/groupwise-features/share-folder-common.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/share-folder-common.c,v
retrieving revision 1.6
diff -u -p -r1.6 share-folder-common.c
--- plugins/groupwise-features/share-folder-common.c 22 Aug 2005 12:21:42 -0000 1.6
+++ plugins/groupwise-features/share-folder-common.c 23 Aug 2005 06:56:59 -0000
@@ -35,6 +35,7 @@
#include <mail/mail-mt.h>
#include <mail/mail-component.h>
#include <mail/mail-config.h>
+#include <mail/mail-vfolder.h>
#include <mail/em-vfolder-rule.h>
#include <filter/filter-rule.h>
#include <camel/camel-store.h>
Index: plugins/groupwise-features/share-folder.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/share-folder.c,v
retrieving revision 1.2
diff -u -p -r1.2 share-folder.c
--- plugins/groupwise-features/share-folder.c 22 Jul 2005 08:42:58 -0000 1.2
+++ plugins/groupwise-features/share-folder.c 23 Aug 2005 06:56:59 -0000
@@ -521,10 +521,10 @@ notification_clicked(GtkButton *button,
gtk_window_set_title (GTK_WINDOW (sf->window), "Custom Notification");
gtk_window_set_position (GTK_WINDOW (sf->window) , GTK_WIN_POS_CENTER_ALWAYS);
gtk_window_set_default_size (GTK_WINDOW (sf->window), 100, 200);
- gtk_widget_reparent (GTK_WINDOW (sf->window), GTK_DIALOG (sf->vbox));
- gtk_window_set_transient_for (sf->window, GTK_DIALOG(sf->vbox));
- gtk_window_set_modal (sf->window, TRUE);
- gtk_window_present (sf->window);
+ gtk_widget_reparent (GTK_WIDGET (sf->window), GTK_WIDGET (sf->vbox));
+ gtk_window_set_transient_for ((GtkWindow *)sf->window, GTK_WINDOW(sf->vbox));
+ gtk_window_set_modal ((GtkWindow *)sf->window, TRUE);
+ gtk_window_present ((GtkWindow *)sf->window);
gtk_widget_show_all (sf->window);
}
@@ -553,12 +553,11 @@ address_button_clicked_cb (GtkButton *bu
static void
user_selected(GtkTreeSelection *selection, ShareFolder *sf)
{
+ GtkTreeModel *model;
gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
- if (gtk_tree_selection_get_selected (selection, &(sf->model), &(sf->iter))){
+ if (gtk_tree_selection_get_selected (selection, &model, &sf->iter))
gtk_widget_set_sensitive (GTK_WIDGET (sf->remove), TRUE);
-
- }
}
static void
@@ -677,7 +676,7 @@ share_folder_construct (ShareFolder *sf)
g_warning ("could not get xml");
}
sf->vbox = GTK_VBOX (glade_xml_get_widget(sf->xml, "vboxSharing"));
- sf->table = GTK_WIDGET (glade_xml_get_widget (sf->xml, "vbox194"));
+ sf->table = GTK_VBOX (glade_xml_get_widget (sf->xml, "vbox194"));
gtk_widget_set_sensitive (GTK_WIDGET (sf->table), FALSE);
sf->shared = GTK_RADIO_BUTTON (glade_xml_get_widget (sf->xml, "radShared"));
@@ -724,7 +723,7 @@ share_folder_construct (ShareFolder *sf)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sf->scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
sf->model = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
- sf->user_list = gtk_tree_view_new ();
+ sf->user_list = (GtkTreeView *)gtk_tree_view_new ();
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sf->scrolled_window), (GtkWidget *)sf->user_list);
gtk_tree_view_set_model (GTK_TREE_VIEW (sf->user_list), GTK_TREE_MODEL (sf->model));
gtk_widget_show (GTK_WIDGET (sf->user_list));
Index: plugins/itip-formatter/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/ChangeLog,v
retrieving revision 1.59
diff -u -p -r1.59 ChangeLog
--- plugins/itip-formatter/ChangeLog 21 Aug 2005 16:27:56 -0000 1.59
+++ plugins/itip-formatter/ChangeLog 23 Aug 2005 06:57:00 -0000
@@ -1,3 +1,7 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * itip-view.c: add missing headers.
+
2005-08-21 Chenthill Palanisamy <pchenthill novell com>
* itip-formatter.c:
Index: plugins/itip-formatter/itip-view.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/itip-view.c,v
retrieving revision 1.16
diff -u -p -r1.16 itip-view.c
--- plugins/itip-formatter/itip-view.c 11 Jul 2005 02:48:18 -0000 1.16
+++ plugins/itip-formatter/itip-view.c 23 Aug 2005 06:57:00 -0000
@@ -36,6 +36,7 @@
#include <libedataserver/e-time-utils.h>
#include <libedataserverui/e-source-option-menu.h>
#include <libecal/e-cal.h>
+#include <libecal/e-cal-time-util.h>
#include <gtkhtml/gtkhtml-embedded.h>
#include <mail/em-format-hook.h>
#include <mail/em-format-html.h>
@@ -43,6 +44,7 @@
#include <e-util/e-icon-factory.h>
#include <e-util/e-time-utils.h>
#include <e-util/e-gtk-utils.h>
+#include <e-util/e-util.h>
#include <calendar/gui/itip-utils.h>
#include "itip-view.h"
Index: plugins/mail-account-disable/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/mail-account-disable/ChangeLog,v
retrieving revision 1.2
diff -u -p -r1.2 ChangeLog
--- plugins/mail-account-disable/ChangeLog 13 Jul 2005 10:05:43 -0000 1.2
+++ plugins/mail-account-disable/ChangeLog 23 Aug 2005 06:57:00 -0000
@@ -1,3 +1,11 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * Makefile.am: Remove the special case for win32, its a bug on all
+ platforms, silly.
+
+ * mail-account-disable.c (mail_account_disable): make signature
+ match usage.
+
2005-07-13 Tor Lillqvist <tml novell com>
* Makefile.am (INCLUDES): Remove duplicated line.
Index: plugins/mail-account-disable/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/plugins/mail-account-disable/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- plugins/mail-account-disable/Makefile.am 26 Jul 2005 16:43:43 -0000 1.3
+++ plugins/mail-account-disable/Makefile.am 23 Aug 2005 06:57:00 -0000
@@ -1,10 +1,3 @@
-if OS_WIN32
-NO_UNDEFINED_REQUIRED_LIBS = \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/mail/libevolution-mail.la \
- $(EVOLUTION_MAIL_LIBS)
-endif
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/mail \
@@ -18,6 +11,8 @@ plugin_LTLIBRARIES = libmail-account-dis
libmail_account_disable_la_SOURCES = mail-account-disable.c
libmail_account_disable_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-libmail_account_disable_la_LIBADD = $(NO_UNDEFINED_REQUIRED_LIBS)
+libmail_account_disable_la_LIBADD = $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/mail/libevolution-mail.la \
+ $(EVOLUTION_MAIL_LIBS)
EXTRA_DIST = org-gnome-mail-account-disable.eplug.xml
Index: plugins/mail-account-disable/mail-account-disable.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/mail-account-disable/mail-account-disable.c,v
retrieving revision 1.1
diff -u -p -r1.1 mail-account-disable.c
--- plugins/mail-account-disable/mail-account-disable.c 10 Jul 2005 09:51:29 -0000 1.1
+++ plugins/mail-account-disable/mail-account-disable.c 23 Aug 2005 06:57:00 -0000
@@ -39,7 +39,7 @@
#define ACCOUNT_DISABLE 0
#define PROXY_LOGOUT 1
-void mail_account_disable (EPopup *ep, EPopupItem *p, char *uri);
+void mail_account_disable (EPopup *ep, EPopupItem *p, void *data);
void org_gnome_create_mail_account_disable (EPlugin *ep, EMPopupTargetFolder *t);
static EPopupItem popup_items[] = {
@@ -50,12 +50,13 @@ static EPopupItem popup_items[] = {
static void
popup_free (EPopup *ep, GSList *items, void *data)
{
-g_slist_free (items);
+ g_slist_free (items);
}
void
-mail_account_disable (EPopup *ep, EPopupItem *p, char *uri)
+mail_account_disable (EPopup *ep, EPopupItem *p, void *data)
{
+ char *uri = data;
EAccount *account;
account = mail_config_get_account_by_source_url (uri);
Index: plugins/mail-to-task/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/mail-to-task/ChangeLog,v
retrieving revision 1.13
diff -u -p -r1.13 ChangeLog
--- plugins/mail-to-task/ChangeLog 12 May 2005 04:27:38 -0000 1.13
+++ plugins/mail-to-task/ChangeLog 23 Aug 2005 06:57:00 -0000
@@ -1,3 +1,7 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * mail-to-task.c (add_attendee_cb): use the right type for attendees.
+
2005-05-11 Not Zed <NotZed Ximian com>
* Makefile.am: added built_sources/cleanfiles
Index: plugins/mail-to-task/mail-to-task.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/mail-to-task/mail-to-task.c,v
retrieving revision 1.3
diff -u -p -r1.3 mail-to-task.c
--- plugins/mail-to-task/mail-to-task.c 14 Jan 2005 16:20:53 -0000 1.3
+++ plugins/mail-to-task/mail-to-task.c 23 Aug 2005 06:57:00 -0000
@@ -30,7 +30,7 @@ add_attendee_cb (gpointer key, gpointer
{
ECalComponentAttendee *ca;
const char *str, *name;
- GList **attendees = user_data;
+ GSList **attendees = user_data;
if (!camel_internet_address_get (value, 0, &name, &str))
return;
Index: plugins/new-mail-notify/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/new-mail-notify/ChangeLog,v
retrieving revision 1.9
diff -u -p -r1.9 ChangeLog
--- plugins/new-mail-notify/ChangeLog 11 Jul 2005 06:36:29 -0000 1.9
+++ plugins/new-mail-notify/ChangeLog 23 Aug 2005 06:57:00 -0000
@@ -1,3 +1,9 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * new-mail-notify.c: forward-define e_plugin_lib_enable, remove
+ some unecessary headers.
+ (send_dbus_message): remove spurious check for bus==NULL.
+
2005-07-11 Vivek Jain <jvivek novell com>
* new-mail-notify.c :(send_dbus_message)
Index: plugins/new-mail-notify/new-mail-notify.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/new-mail-notify/new-mail-notify.c,v
retrieving revision 1.6
diff -u -p -r1.6 new-mail-notify.c
--- plugins/new-mail-notify/new-mail-notify.c 11 Jul 2005 06:36:29 -0000 1.6
+++ plugins/new-mail-notify/new-mail-notify.c 23 Aug 2005 06:57:00 -0000
@@ -25,11 +25,8 @@
#include <string.h>
#include <glib.h>
-#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include <gconf/gconf-client.h>
#include <e-util/e-config.h>
-#include <mail/em-config.h>
#include <mail/em-event.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
@@ -38,7 +35,6 @@
#define DBUS_PATH "/org/gnome/evolution/mail/newmail"
#define DBUS_INTERFACE "org.gnome.evolution.mail.dbus.Signal"
-GtkWidget *org_gnome_new_mail_config (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
void org_gnome_new_mail_notify (EPlugin *ep, EMEventTargetFolder *t);
void org_gnome_message_reading_notify (EPlugin *ep, EMEventTargetMessage *t);
@@ -49,9 +45,6 @@ send_dbus_message (const char *message_n
{
DBusMessage *message;
- if (bus == NULL)
- return;
-
/* Create a new message on the DBUS_INTERFACE */
message = dbus_message_new_signal (DBUS_PATH,
DBUS_INTERFACE,
@@ -90,6 +83,8 @@ org_gnome_new_mail_notify (EPlugin *ep,
send_dbus_message ("Newmail", t->uri);
}
+int e_plugin_lib_enable (EPluginLib *ep, int enable);
+
int
e_plugin_lib_enable (EPluginLib *ep, int enable)
{
@@ -104,7 +99,7 @@ e_plugin_lib_enable (EPluginLib *ep, int
/* Could not determine address of the D-BUS session bus */
/* Plugin will be disabled */
dbus_error_free (&error);
- return 1;
+ return -1;
}
/* Set up this connection to work in a GLib event loop */
Index: plugins/print-message/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/print-message/ChangeLog,v
retrieving revision 1.4
diff -u -p -r1.4 ChangeLog
--- plugins/print-message/ChangeLog 27 Jun 2005 00:55:24 -0000 1.4
+++ plugins/print-message/ChangeLog 23 Aug 2005 06:57:00 -0000
@@ -1,3 +1,9 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * print-message.c: Add missing headers
+ (org_gnome_print_message): define before defining, remove c99isms.
+ (org_gnome_print_preview): define before defining.
+
2005-06-27 Tor Lillqvist <tml novell com>
* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
Index: plugins/print-message/print-message.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/print-message/print-message.c,v
retrieving revision 1.1
diff -u -p -r1.1 print-message.c
--- plugins/print-message/print-message.c 19 May 2005 13:48:21 -0000 1.1
+++ plugins/print-message/print-message.c 23 Aug 2005 06:57:00 -0000
@@ -34,6 +34,7 @@
#include "mail/em-menu.h"
#include "mail/em-utils.h"
#include "e-util/e-print.h"
+#include "e-util/e-dialog-utils.h"
#include "composer/e-msg-composer.h"
void org_gnome_compose_print_message (EPlugin *ep, EMMenuTargetWidget *t);
@@ -68,25 +69,30 @@ print_response (GtkWidget *w, int resp,
}
+void org_gnome_print_message (EPlugin *ep, EMMenuTargetWidget *t);
+
void
org_gnome_print_message (EPlugin *ep, EMMenuTargetWidget *t)
{
EMsgComposer *composer = (EMsgComposer *)t->target.widget;
struct _print_data *data;
+ GtkDialog *dialog;
data = g_malloc0(sizeof(*data));
data->config = e_print_load_config ();
data->preview = 0;
data->msg = e_msg_composer_get_message (composer, 1);
- GtkDialog *dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), GNOME_PRINT_DIALOG_COPIES, data->config);
- gtk_dialog_set_default_response(dialog, GNOME_PRINT_DIALOG_RESPONSE_PRINT);
+ dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), GNOME_PRINT_DIALOG_COPIES, data->config);
+ gtk_dialog_set_default_response(dialog, GNOME_PRINT_DIALOG_RESPONSE_PRINT);
e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) composer);
g_signal_connect(dialog, "response", G_CALLBACK(print_response), data);
gtk_widget_show((GtkWidget *)dialog);
}
+
+void org_gnome_print_preview (EPlugin *ep, EMMenuTargetWidget *t);
void
org_gnome_print_preview (EPlugin *ep, EMMenuTargetWidget *t)
Index: plugins/sa-junk-plugin/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/sa-junk-plugin/ChangeLog,v
retrieving revision 1.2
diff -u -p -r1.2 ChangeLog
--- plugins/sa-junk-plugin/ChangeLog 6 Jul 2005 06:05:07 -0000 1.2
+++ plugins/sa-junk-plugin/ChangeLog 23 Aug 2005 06:57:00 -0000
@@ -1,3 +1,7 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * em-junk-filter.c (em_junk_sa_report_non_junk): pre-define.
+
2005-07-06 Vivek Jain <jvivek novell com>
* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
Index: plugins/sa-junk-plugin/em-junk-filter.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/sa-junk-plugin/em-junk-filter.c,v
retrieving revision 1.3
diff -u -p -r1.3 em-junk-filter.c
--- plugins/sa-junk-plugin/em-junk-filter.c 21 Aug 2005 19:34:58 -0000 1.3
+++ plugins/sa-junk-plugin/em-junk-filter.c 23 Aug 2005 06:57:00 -0000
@@ -36,6 +36,7 @@
#include <signal.h>
#include <time.h>
+#include <camel/camel-mime-message.h>
#include <camel/camel-debug.h>
#include <camel/camel-file-utils.h>
#include <camel/camel-data-wrapper.h>
@@ -58,7 +59,7 @@ static pthread_mutex_t em_junk_sa_spamd_
static const char *em_junk_sa_get_name (void);
gboolean em_junk_sa_check_junk (EPlugin *ep, EMJunkHookTarget *target);
void em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target);
-void em_junk_sa_report_notjunk (EPlugin *ep, EMJunkHookTarget *target);
+void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target);
void em_junk_sa_commit_reports (EPlugin *ep, EMJunkHookTarget *target);
static void em_junk_sa_init (void);
static void em_junk_sa_finalize (void);
Index: plugins/save-calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/save-calendar/ChangeLog,v
retrieving revision 1.22
diff -u -p -r1.22 ChangeLog
--- plugins/save-calendar/ChangeLog 16 May 2005 06:21:48 -0000 1.22
+++ plugins/save-calendar/ChangeLog 23 Aug 2005 06:57:00 -0000
@@ -1,3 +1,7 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * ical-format.c: include missing header.
+
2005-05-16 Not Zed <NotZed Ximian com>
* csv-format.c: moved e-error to e-util
Index: plugins/save-calendar/ical-format.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/save-calendar/ical-format.c,v
retrieving revision 1.3
diff -u -p -r1.3 ical-format.c
--- plugins/save-calendar/ical-format.c 22 Mar 2005 14:46:36 -0000 1.3
+++ plugins/save-calendar/ical-format.c 23 Aug 2005 06:57:00 -0000
@@ -40,6 +40,7 @@
#include <libecal/e-cal.h>
#include <libecal/e-cal-util.h>
#include <calendar/gui/e-cal-popup.h>
+#include <calendar/common/authentication.h>
#include <libgnomevfs/gnome-vfs.h>
#include <string.h>
Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1538
diff -u -p -r1.1538 ChangeLog
--- shell/ChangeLog 18 Aug 2005 04:35:30 -0000 1.1538
+++ shell/ChangeLog 23 Aug 2005 06:57:01 -0000
@@ -1,3 +1,10 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * e-shell-window-commands.c: include missing e-error.h
+
+ * e-component-registry.c (query_components): cast away a seemingly
+ spurious warning.
+
2005-08-17 Not Zed <NotZed Ximian com>
* e-shell.c (impl_Shell_handleURI): fix warning.
Index: shell/e-component-registry.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-component-registry.c,v
retrieving revision 1.56
diff -u -p -r1.56 e-component-registry.c
--- shell/e-component-registry.c 25 Jul 2005 08:15:34 -0000 1.56
+++ shell/e-component-registry.c 23 Aug 2005 06:57:01 -0000
@@ -189,7 +189,7 @@ query_components (EComponentRegistry *re
GNOME_Evolution_Component iface;
id = info_list->_buffer[i].iid;
- iface = bonobo_activation_activate_from_id (id, 0, NULL, &ev);
+ iface = bonobo_activation_activate_from_id ((char *)id, 0, NULL, &ev);
if (BONOBO_EX (&ev) || iface == CORBA_OBJECT_NIL) {
char *ex_text = bonobo_exception_get_text (&ev);
Index: shell/e-shell-window-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window-commands.c,v
retrieving revision 1.37
diff -u -p -r1.37 e-shell-window-commands.c
--- shell/e-shell-window-commands.c 21 Jul 2005 08:59:53 -0000 1.37
+++ shell/e-shell-window-commands.c 23 Aug 2005 06:57:02 -0000
@@ -33,6 +33,7 @@
#include "e-util/e-icon-factory.h"
#include "e-util/e-dialog-utils.h"
+#include "e-util/e-error.h"
#include <glib/gprintf.h>
Index: widgets/misc/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/ChangeLog,v
retrieving revision 1.372
diff -u -p -r1.372 ChangeLog
--- widgets/misc/ChangeLog 19 Aug 2005 05:30:15 -0000 1.372
+++ widgets/misc/ChangeLog 23 Aug 2005 06:57:02 -0000
@@ -1,3 +1,10 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * e-send-options.c (get_widgets): cast warning away.
+
+ * e-calendar-item.c (e_calendar_item_realize): remove some unused
+ vars.
+
2005-08-17 Srinivasa Ragavan <sragavan novell com>
* e-attachment-bar.c
Index: widgets/misc/e-calendar-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-calendar-item.c,v
retrieving revision 1.45
diff -u -p -r1.45 e-calendar-item.c
--- widgets/misc/e-calendar-item.c 17 Jun 2005 15:20:33 -0000 1.45
+++ widgets/misc/e-calendar-item.c 23 Aug 2005 06:57:03 -0000
@@ -681,8 +681,6 @@ e_calendar_item_realize (GnomeCanvasIte
{
ECalendarItem *calitem;
GdkColormap *colormap;
- gboolean success[E_CALENDAR_ITEM_COLOR_LAST];
- gint nfailed;
if (GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->realize)
(* GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->realize) (item);
Index: widgets/misc/e-send-options.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-send-options.c,v
retrieving revision 1.7
diff -u -p -r1.7 e-send-options.c
--- widgets/misc/e-send-options.c 20 Jul 2005 11:59:53 -0000 1.7
+++ widgets/misc/e-send-options.c 23 Aug 2005 06:57:03 -0000
@@ -417,7 +417,7 @@ get_widgets (ESendOptionsDialog *sod)
priv->priority = GW ("combo-priority");
priv->status = GW ("status-tracking");
priv->classification = GW ("classification-combo");
- priv->notebook = GW ("notebook");
+ priv->notebook = (GtkNotebook *)GW ("notebook");
priv->reply_request = GW ("reply-request-button");
priv->reply_convenient = GW ("reply-convinient");
priv->reply_within = GW ("reply-within");
Index: widgets/table/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/ChangeLog,v
retrieving revision 1.4
diff -u -p -r1.4 ChangeLog
--- widgets/table/ChangeLog 15 Aug 2005 03:18:01 -0000 1.4
+++ widgets/table/ChangeLog 23 Aug 2005 06:57:06 -0000
@@ -1,3 +1,7 @@
+2005-08-23 Not Zed <NotZed Ximian com>
+
+ * e-table-config.c (setup_fields): fix some missing casts.
+
2005-08-10 Not Zed <NotZed Ximian com>
** See bug #313063.
Index: widgets/table/e-table-config.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-config.c,v
retrieving revision 1.71
diff -u -p -r1.71 e-table-config.c
--- widgets/table/e-table-config.c 4 Aug 2005 04:56:54 -0000 1.71
+++ widgets/table/e-table-config.c 23 Aug 2005 06:57:07 -0000
@@ -363,8 +363,8 @@ setup_fields (ETableConfig *config)
{
int i;
- e_table_model_freeze (config->available_model);
- e_table_model_freeze (config->shown_model);
+ e_table_model_freeze ((ETableModel *)config->available_model);
+ e_table_model_freeze ((ETableModel *)config->shown_model);
e_table_without_show_all (config->available_model);
e_table_subset_variable_clear (config->shown_model);
@@ -379,8 +379,8 @@ setup_fields (ETableConfig *config)
e_table_without_hide (config->available_model, GINT_TO_POINTER(idx));
}
}
- e_table_model_thaw (config->available_model);
- e_table_model_thaw (config->shown_model);
+ e_table_model_thaw ((ETableModel *)config->available_model);
+ e_table_model_thaw ((ETableModel *)config->shown_model);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
