[evolution-patches] [build] compilation under Solaris failed

[Irene <Irene Huang Sun COM>]

hi, Harish

        I found this bug when I was  trying to build evolution head
(2.6) on
Solaris x86. The struct _ECalModelMemosPrivate in
evolution/calendar/gui/e-cal-model-memos.c have no member. I created a
patch for this. 

In evolution/plugins/groupwise-features/mail-send-options.c,
function org_gnome_compose_send_options should not return a value when
building on Solaris. 

        Please review. 

Thanks 

Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2838
diff -u -r1.2838 ChangeLog
--- calendar/ChangeLog	9 Nov 2005 11:49:36 -0000	1.2838
+++ calendar/ChangeLog	10 Nov 2005 03:15:19 -0000
@@ -1,3 +1,10 @@
+2005-11-09  Irene Huang <Irene Huang sun com>
+
+	* gui/e-cal-model-memos.c: struct _ECalModelMemosPrivate
+        should not be zero sized, add gboolean dummy to make it
+        compilable on Solaris.
+
+
 2005-11-09  Veerapuram Varadhan <vvaradhan novell com>
 
 	Committing for Nathan Owens <pianocomp81 yahoo com>	
Index: calendar/gui/e-cal-model-memos.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model-memos.c,v
retrieving revision 1.1
diff -u -r1.1 e-cal-model-memos.c
--- calendar/gui/e-cal-model-memos.c	19 Oct 2005 11:39:33 -0000	1.1
+++ calendar/gui/e-cal-model-memos.c	10 Nov 2005 03:15:19 -0000
@@ -33,6 +33,7 @@
 #define d(x) (x)
 
 struct _ECalModelMemosPrivate {
+	int dummy;
 };
 
 static void e_cal_model_memos_finalize (GObject *object);

Index: plugins/groupwise-features/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/ChangeLog,v
retrieving revision 1.41
diff -u -r1.41 ChangeLog
--- plugins/groupwise-features/ChangeLog	20 Oct 2005 08:19:37 -0000	1.41
+++ plugins/groupwise-features/ChangeLog	9 Nov 2005 14:00:20 -0000
@@ -1,3 +1,8 @@
+2005-11-09  Irene Huang <Irene Huang sun com>
+
+	* mail-send-options.c: (org_gnome_compose_send_options): Should
+	not return NULL in void funciton.
+
 2005-10-20  Sankar P  <psankar novell com>
 
 	* proxy-login.c (org_gnome_proxy_account_login) (proxy_login_get_cnc): 
Index: plugins/groupwise-features/mail-send-options.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/mail-send-options.c,v
retrieving revision 1.4
diff -u -r1.4 mail-send-options.c
--- plugins/groupwise-features/mail-send-options.c	8 Nov 2005 03:59:07 -0000	1.4
+++ plugins/groupwise-features/mail-send-options.c	9 Nov 2005 14:00:20 -0000
@@ -145,7 +145,7 @@
 	temp = strstr (url, "groupwise") ;
 	if (!temp) {
 		g_print ("Sorry send options only available for a groupwise account\n") ;
-		return NULL;
+		return;
 	} 
 	g_free (temp) ;
 	/*disply the send options dialog*/