[evolution-patches] *NEW* Patch fix #310198 for Evolution and Evolution-data-server

[Mengjie Yu <Meng-Jie Yu Sun COM>]

Dear all,


When I build evolution trunk on Sun Solaris, I found there were several
code failed while comiling with Sun's compiler 'Vulcan / Forte'.

I have checked these code, and most of them are grammar errors, for example, a void function returns a value, some variable have the name 'inline' which
conflicts with the inline keyword, some empty struct declarations. It seems that Sun's compiler is stricter than Gcc so these codes failed.

Attachment is my patch against these code. It is about evolution as well as evolution-data-server.


Could someone help me to review these two patches??


Thanks a lot!

Yours,
Mengjie

Index: calendar/gui/e-cal-model-calendar.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model-calendar.c,v
retrieving revision 1.19
diff -u -p -r1.19 e-cal-model-calendar.c
--- calendar/gui/e-cal-model-calendar.c	22 Jun 2005 08:16:26 -0000	1.19
+++ calendar/gui/e-cal-model-calendar.c	13 Jul 2005 08:58:48 -0000
@@ -32,6 +32,7 @@
 #include "dialogs/send-comp.h"
 
 struct _ECalModelCalendarPrivate {
+	guint reserved;
 };
 
 static void e_cal_model_calendar_finalize (GObject *object);
Index: calendar/gui/e-cal-model-tasks.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model-tasks.c,v
retrieving revision 1.30
diff -u -p -r1.30 e-cal-model-tasks.c
--- calendar/gui/e-cal-model-tasks.c	12 May 2005 09:36:20 -0000	1.30
+++ calendar/gui/e-cal-model-tasks.c	13 Jul 2005 08:58:52 -0000
@@ -32,6 +32,7 @@
 #include "misc.h"
 
 struct _ECalModelTasksPrivate {
+	guint reserved;
 };
 
 static void e_cal_model_tasks_finalize (GObject *object);
Index: calendar/gui/dialogs/comp-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor.c,v
retrieving revision 1.140
diff -u -p -r1.140 comp-editor.c
--- calendar/gui/dialogs/comp-editor.c	11 Jul 2005 08:59:38 -0000	1.140
+++ calendar/gui/dialogs/comp-editor.c	13 Jul 2005 08:59:06 -0000
@@ -2023,13 +2023,13 @@ set_attachment_list (CompEditor *editor,
 		/* return if it's not a regular file */
 		if (!S_ISREG (statbuf.st_mode)) {
 			g_warning ("Cannot attach file %s: not a regular file", file_name);
-			return NULL;
+			return;
 		}
 		
 		stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0);
 		if (!stream) {
 			g_warning ("Cannot attach file %s: %s", file_name, g_strerror (errno));
-			return NULL;
+			return;
 		}
 
 		mime_type = attachment_guess_mime_type (file_name);
Index: composer/e-msg-composer-select-file.h
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer-select-file.h,v
retrieving revision 1.7
diff -u -p -r1.7 e-msg-composer-select-file.h
--- composer/e-msg-composer-select-file.h	10 Feb 2005 04:34:29 -0000	1.7
+++ composer/e-msg-composer-select-file.h	13 Jul 2005 08:59:07 -0000
@@ -28,7 +28,7 @@
 struct _EMsgComposer;
 
 typedef void (*EMsgComposerSelectFileFunc)(struct _EMsgComposer *composer, const char *filename);
-typedef void (*EMsgComposerSelectAttachFunc)(struct _EMsgComposer *composer, GSList *names, int inline);
+typedef void (*EMsgComposerSelectAttachFunc)(struct _EMsgComposer *composer, GSList *names, int isinline);
 
 void e_msg_composer_select_file(struct _EMsgComposer *composer, GtkWidget **w, EMsgComposerSelectFileFunc func, const char *title, int save);
 void e_msg_composer_select_file_attachments(struct _EMsgComposer *composer, GtkWidget **, EMsgComposerSelectAttachFunc func);
Index: plugins/calendar-weather/calendar-weather.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/calendar-weather/calendar-weather.c,v
retrieving revision 1.6
diff -u -p -r1.6 calendar-weather.c
--- plugins/calendar-weather/calendar-weather.c	25 Jan 2005 12:28:23 -0000	1.6
+++ plugins/calendar-weather/calendar-weather.c	13 Jul 2005 08:59:22 -0000
@@ -107,7 +107,6 @@ e_calendar_weather_migrate (EPlugin *epl
 		g_object_unref (weather);
 
 	e_source_list_sync (source_list, NULL);
-	return 0;
 }
 
 static void