--- ./doc/devel/calendar/cal-client/Makefile.in Wed Nov 6 17:52:06 2002 +++ ../evolution-1.2.0/./doc/devel/calendar/cal-client/Makefile.in Thu Jan 2 10:28:19 2003 @@ -266,7 +266,7 @@ GTKDOC_CFLAGS = -I$(top_srcdir)/calendar -I$(top_builddir)/calendar/cal-client -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/libical/src/libical -I$(top_srcdir)/libical/src/libical $(EVOLUTION_CALENDAR_CFLAGS) -GTKDOC_LIBS = $(EVOLUTION_CALENDAR_LIBS) $(top_builddir)/e-util/libeutil.la $(top_builddir)/calendar/cal-client/libcal-client-static.la $(top_builddir)/calendar/cal-util/libcal-util-static.la $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libversit/libversit.a $(top_builddir)/libwombat/libwombat.la +GTKDOC_LIBS = $(top_builddir)/e-util/libeutil.la $(top_builddir)/calendar/cal-client/libcal-client-static.la $(top_builddir)/calendar/cal-util/libcal-util-static.la $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libversit/libversit.a $(top_builddir)/libwombat/libwombat.la $(EVOLUTION_CALENDAR_LIBS) GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) --- ./doc/devel/calendar/cal-util/Makefile.in Wed Nov 6 17:52:05 2002 +++ ../evolution-1.2.0/./doc/devel/calendar/cal-util/Makefile.in Thu Jan 2 10:28:19 2003 @@ -266,7 +266,7 @@ GTKDOC_CFLAGS = -I$(top_srcdir)/calendar -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/libical/src/libical -I$(top_srcdir)/libical/src/libical $(EVOLUTION_CALENDAR_CFLAGS) -GTKDOC_LIBS = $(EVOLUTION_CALENDAR_LIBS) $(top_builddir)/calendar/cal-util/libcal-util-static.la $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libversit/libversit.a +GTKDOC_LIBS = $(top_builddir)/calendar/cal-util/libcal-util-static.la $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libversit/libversit.a $(EVOLUTION_CALENDAR_LIBS) GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) --- ./composer/Makefile.in Wed Nov 6 17:47:19 2002 +++ ../evolution-1.2.0/./composer/Makefile.in Thu Jan 2 22:31:54 2003 @@ -897,8 +897,9 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +.NOTPARALLEL: $(IDL_GENERATED) $(IDL_GENERATED): $(IDLS) $(selectnamesdir)/Evolution-Addressbook-SelectNames.idl - $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(ORBIT_IDL) -I $(srcdir) -I $(ROOT)$(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ -I $(selectnamesdir) $(srcdir)/Composer.idl Editor-commmon.c: $(GTKHTML_DATADIR)/Editor.idl --- ./mail/mail-session.c Mon Oct 21 11:15:49 2002 +++ ../evolution-1.2.0/./mail/mail-session.c Thu Jan 2 10:28:19 2003 @@ -262,7 +262,12 @@ /* assume we can use any widget to translate string for display */ check_label = gtk_label_new (""); title = e_utf8_to_gtk_string (GTK_WIDGET (check_label), m->prompt); +#if !defined (__sgi) password_dialogue = (GnomeDialog *)dialogue = gnome_request_dialog (m->secret, title, NULL, 0, pass_got, m, NULL); +#else + dialogue = gnome_request_dialog (m->secret, title, NULL, 0, pass_got, m, NULL); + password_dialogue = (GnomeDialog *)dialogue; +#endif g_free(title); password_destroy_id = gtk_signal_connect((GtkObject *)dialogue, "destroy", request_password_deleted, m); --- ./mail/mail-search.c Fri Mar 15 13:54:38 2002 +++ ../evolution-1.2.0/./mail/mail-search.c Thu Jan 2 10:28:19 2003 @@ -260,11 +260,15 @@ void mail_search_construct (MailSearch *ms, MailDisplay *mail) { +#if !defined (__sgi) const gchar *buttons[] = { _("Search"), GNOME_STOCK_BUTTON_CLOSE, NULL }; - gchar *title = NULL; +#else + const gchar *buttons[3]; +#endif + gchar *title = NULL; GtkWidget *find_hbox; GtkWidget *matches_hbox; GtkWidget *toggles_hbox; @@ -279,6 +283,12 @@ GtkWidget *msg_hbox; GtkWidget *msg_frame; + +#if defined (__sgi) + buttons[0] = _("Search"); + buttons[1] = GNOME_STOCK_BUTTON_CLOSE; + buttons[2] = NULL; +#endif g_return_if_fail (ms != NULL && IS_MAIL_SEARCH (ms)); g_return_if_fail (mail != NULL && IS_MAIL_DISPLAY (mail)); --- ./mail/message-list.c Fri Sep 13 12:53:20 2002 +++ ../evolution-1.2.0/./mail/message-list.c Thu Jan 2 10:28:19 2003 @@ -2364,7 +2364,13 @@ MESSAGE_LIST_LOCK (ml, hide_lock); if (ml->hidden && ml->folder) { /* this is a hack, should probably just maintain the hidden table better */ +#if !defined (__sgi) struct _glibsuxcrap x = { 0, ml->folder }; +#else + struct _glibsuxcrap x; + x.count = 0; + x.folder = ml->folder; +#endif g_hash_table_foreach(ml->hidden, glib_crapback, &x); hidden = x.count; } --- ./mail/Makefile.in Wed Nov 6 17:47:46 2002 +++ ../evolution-1.2.0/./mail/Makefile.in Thu Jan 2 11:18:54 2003 @@ -2824,7 +2824,7 @@ $(IDL_GENERATED): $(SPELL_IDL) - $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` \ + $(ORBIT_IDL) -I $(srcdir) -I $(ROOT)$(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` \ -I `$(GNOME_CONFIG) --datadir`/idl $(srcdir)/Spell.idl Spell-impl.o: Spell.h @@ -2832,7 +2832,7 @@ @XML_I18N_MERGE_OAF_RULE@ $(EVOLUTION_MAIL_CORBA_GENERATED): Mailer.idl - $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` \ + $(ORBIT_IDL) -I $(srcdir) -I $(ROOT)$(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` \ -I `$(GNOME_CONFIG) --datadir`/idl $(srcdir)/Mailer.idl @ENABLE_PURIFY_TRUE@all-local: evolution-mail.pure --- ./mail/mail-folder-cache.c Mon Aug 26 15:39:47 2002 +++ ../evolution-1.2.0/./mail/mail-folder-cache.c Thu Jan 2 10:28:20 2003 @@ -879,7 +879,13 @@ reffed folder if the folder has also already been opened */ int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp) { +#if !defined (__sgi) struct _find_info fi = { uri, NULL }; +#else + struct _find_info fi; + fi.uri = uri; + fi.fi = NULL; +#endif if (stores == NULL) return FALSE; --- ./mail/mail-callbacks.h Tue Aug 6 12:32:28 2002 +++ ../evolution-1.2.0/./mail/mail-callbacks.h Thu Jan 2 10:28:20 2003 @@ -129,7 +129,11 @@ void composer_send_cb (EMsgComposer *composer, gpointer data); void composer_save_draft_cb (EMsgComposer *composer, int quit, gpointer data); +#if !defined (__sgi) void forward_messages (CamelFolder *folder, GPtrArray *uids, gboolean inline); +#else +void forward_messages (CamelFolder *folder, GPtrArray *uids, gboolean inline_bool); +#endif /* CamelStore callbacks */ void folder_created (CamelStore *store, const char *prefix, CamelFolderInfo *fi); --- ./mail/mail-local.c Wed Sep 11 13:17:43 2002 +++ ../evolution-1.2.0/./mail/mail-local.c Thu Jan 2 10:28:20 2003 @@ -1086,7 +1086,13 @@ static void mail_local_store_remove_folder(MailLocalStore *mls, const char *path) { +#if !defined (__sgi) struct _search_info data = { path, NULL }; +#else + struct _search_info data; + data.path = path; + data.info = NULL; +#endif d(printf("shell removing folder? '%s'\n", path)); --- ./mail/e-searching-tokenizer.c Mon Sep 30 11:33:56 2002 +++ ../evolution-1.2.0/./mail/e-searching-tokenizer.c Thu Jan 2 10:28:20 2003 @@ -35,6 +35,14 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + +#if defined (__sgi) +#define __inline__ __inline +#endif + #include #include "e-searching-tokenizer.h" --- ./mail/mail-send-recv.c Tue Jul 9 16:29:22 2002 +++ ../evolution-1.2.0/./mail/mail-send-recv.c Thu Jan 2 10:28:20 2003 @@ -289,8 +289,13 @@ GtkHSeparator *line; struct _send_info *info; char *pretty_url; - + +#if !defined (__sgi) gd = (GnomeDialog *)send_recv_dialogue = gnome_dialog_new (_("Send & Receive Mail"), NULL); +#else + send_recv_dialogue = gnome_dialog_new (_("Send & Receive Mail"), NULL); + gd = (GnomeDialog *)send_recv_dialogue; +#endif gtk_signal_connect((GtkObject *)gd, "destroy", gtk_widget_destroyed, &send_recv_dialogue); gnome_dialog_append_button_with_pixmap (gd, _("Cancel All"), GNOME_STOCK_BUTTON_CANCEL); --- ./libical/src/libical/sspm.c Sat Oct 27 12:50:28 2001 +++ ../evolution-1.2.0/./libical/src/libical/sspm.c Thu Jan 2 21:39:30 2003 @@ -1163,7 +1163,7 @@ char *src, size_t *size) { - int cc; + int cc = 0; char buf[4] = {0,0,0,0}; int p = 0; int valid_data = 0; --- ./libical/src/libical/icallexer.c Sat Oct 27 20:15:10 2001 +++ ../evolution-1.2.0/./libical/src/libical/icallexer.c Thu Jan 2 10:28:20 2003 @@ -19,7 +19,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ + * $Header: /hosts/bonnie.engr.sgi.com/proj/irix6.5/isms/eoe/cmd/flex/flex-2.5.4/RCS/skel.c,v 1.3 1998/04/17 16:09:54 leedom Exp $ */ #define FLEX_SCANNER @@ -1220,7 +1220,21 @@ #endif { int c; + static int _xpg = -1; + if (_xpg == -1) + { + char *_xpgenv = getenv("_XPG"); + if (_xpgenv == NULL) + _xpg = 0; + else + { + _xpg = atoi(_xpgenv); + if (_xpg < 0) + _xpg = 0; + } + } + *yy_c_buf_p = yy_hold_char; if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) @@ -1257,18 +1271,21 @@ /* fall through */ case EOB_ACT_END_OF_FILE: - { - if ( yywrap() ) - return EOF; + if (_xpg) + return 0; + else + { + if ( yywrap() ) + return 0; - if ( ! yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; + if ( ! yy_did_buffer_switch_on_eof ) + YY_NEW_FILE; #ifdef __cplusplus - return yyinput(); + return yyinput(); #else - return input(); + return input(); #endif - } + } case EOB_ACT_CONTINUE_SCAN: yy_c_buf_p = yytext_ptr + offset; --- ./libical/src/libical/icalarray.c Sat Oct 27 12:50:24 2001 +++ ../evolution-1.2.0/./libical/src/libical/icalarray.c Thu Jan 2 10:28:20 2003 @@ -75,7 +75,7 @@ if (array->num_elements >= array->space_allocated) icalarray_expand (array, 1); - memcpy (array->data + array->num_elements * array->element_size, element, + memcpy ((char *) array->data + array->num_elements * array->element_size, element, array->element_size); array->num_elements++; } @@ -88,7 +88,7 @@ assert (position >= 0); assert (position < array->num_elements); - return array->data + position * array->element_size; + return (char *) array->data + position * array->element_size; } @@ -102,11 +102,11 @@ assert (position >= 0); assert (position < array->num_elements); - dest = array->data + position * array->element_size; + dest = (char *) array->data + position * array->element_size; elements_to_move = array->num_elements - position - 1; if (elements_to_move > 0) - memmove (dest, dest + array->element_size, + memmove (dest, (char *) dest + array->element_size, elements_to_move * array->element_size); array->num_elements--; --- ./libical/ltmain.sh Fri Mar 30 10:47:33 2001 +++ ../evolution-1.2.0/./libical/ltmain.sh Thu Jan 2 10:28:20 2003 @@ -60,7 +60,7 @@ default_mode= help="Try \`$progname --help' for more information." magic="%%%MAGIC variable%%%" -mkdir="mkdir" +mkdir="mkdir -p" mv="mv -f" rm="rm -f" --- ./camel/camel-store.c Thu Oct 24 11:00:51 2002 +++ ../evolution-1.2.0/./camel/camel-store.c Thu Jan 2 10:28:20 2003 @@ -31,6 +31,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-session.h" #include "camel-store.h" #include "camel-folder.h" @@ -441,8 +445,16 @@ { char *key; CamelFolder *folder, *oldfolder; - struct _get_info info = { store, NULL, old_name, new_name }; int i; +#if !defined (__sgi) + struct _get_info info = { store, NULL, old_name, new_name }; +#else + struct _get_info info; + info.store = store; + info.folders = NULL; + info.old = old_name; + info.new = new_name; +#endif d(printf("store rename folder %s '%s' '%s'\n", ((CamelService *)store)->url->protocol, old_name, new_name)); --- ./camel/Makefile.in Wed Nov 6 17:45:19 2002 +++ ../evolution-1.2.0/./camel/Makefile.in Thu Jan 2 10:28:20 2003 @@ -348,7 +348,7 @@ camel_lock_helper_OBJECTS = camel-lock-helper.$(OBJEXT) \ camel-lock.$(OBJEXT) -camel_lock_helper_LDADD = $(LDADD) +camel_lock_helper_LDADD = $(LDADD) $(INTLLIBS) camel_lock_helper_DEPENDENCIES = camel_lock_helper_LDFLAGS = camel_index_control_OBJECTS = camel-index-control.$(OBJEXT) --- ./camel/camel-mime-utils.c Mon Oct 7 14:44:40 2002 +++ ../evolution-1.2.0/./camel/camel-mime-utils.c Thu Jan 2 10:28:20 2003 @@ -35,6 +35,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN 1024 #endif --- ./camel/camel-vee-store.c Wed Jul 3 14:17:30 2002 +++ ../evolution-1.2.0/./camel/camel-vee-store.c Thu Jan 2 10:28:20 2003 @@ -22,6 +22,10 @@ #include #endif +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-exception.h" #include "camel-vee-store.h" #include "camel-vee-folder.h" @@ -41,6 +45,9 @@ static CamelFolderInfo *vee_get_folder_info(CamelStore *store, const char *top, guint32 flags, CamelException *ex); struct _CamelVeeStorePrivate { +#ifndef __GNUC__ + char filler; +#endif }; #define _PRIVATE(o) (((CamelVeeStore *)(o))->priv) --- ./camel/camel-store-summary.c Thu Oct 24 11:00:51 2002 +++ ../evolution-1.2.0/./camel/camel-store-summary.c Thu Jan 2 10:28:20 2003 @@ -795,7 +795,8 @@ void camel_store_info_set_string(CamelStoreSummary *s, CamelStoreInfo *mi, int type, const char *value) { - return ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->store_info_set_string(s, mi, type, value); + ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->store_info_set_string(s, mi, type, value); + return; } static CamelStoreInfo * --- ./camel/camel-lock-helper.c Fri Nov 2 19:26:18 2001 +++ ../evolution-1.2.0/./camel/camel-lock-helper.c Thu Jan 2 10:28:20 2003 @@ -21,8 +21,16 @@ /* lock helper process */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include + +#ifdef HAVE_ALLOCA_H +#include +#endif #include --- ./camel/camel-session.c Mon Aug 26 15:38:50 2002 +++ ../evolution-1.2.0/./camel/camel-session.c Thu Jan 2 10:28:20 2003 @@ -827,7 +827,8 @@ g_assert(msg != NULL); g_assert(msg->ops != NULL); - return CS_CLASS (session)->thread_msg_free(session, msg); + CS_CLASS (session)->thread_msg_free(session, msg); + return; } /** @@ -864,7 +865,8 @@ if (id == -1) return; - return CS_CLASS (session)->thread_wait(session, id); + CS_CLASS (session)->thread_wait(session, id); + return; } #endif --- ./camel/camel-text-index.c Tue Sep 24 13:45:19 2002 +++ ../evolution-1.2.0/./camel/camel-text-index.c Thu Jan 2 10:28:20 2003 @@ -31,6 +31,14 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + +#if defined (__sgi) +#define __inline__ __inline +#endif + #include #include #include --- ./camel/camel-lock-client.c Fri Nov 2 19:26:18 2001 +++ ../evolution-1.2.0/./camel/camel-lock-client.c Thu Jan 2 10:28:20 2003 @@ -26,6 +26,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #include --- ./camel/camel-object.c Wed Jul 3 14:17:28 2002 +++ ../evolution-1.2.0/./camel/camel-object.c Thu Jan 2 10:28:20 2003 @@ -28,6 +28,10 @@ #include #include "camel-object.h" +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #ifdef ENABLE_THREADS --- ./camel/camel-folder-thread.c Tue Sep 3 09:57:53 2002 +++ ../evolution-1.2.0/./camel/camel-folder-thread.c Thu Jan 2 10:28:20 2003 @@ -34,6 +34,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-folder-thread.h" #include "e-util/e-memory.h" --- ./camel/camel-certdb.c Mon Oct 21 11:14:40 2002 +++ ../evolution-1.2.0/./camel/camel-certdb.c Thu Jan 2 10:28:20 2003 @@ -35,6 +35,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-certdb.h" #include "camel-private.h" --- ./camel/camel-folder.c Mon Oct 21 11:14:41 2002 +++ ../evolution-1.2.0/./camel/camel-folder.c Thu Jan 2 10:28:20 2003 @@ -27,6 +27,11 @@ #endif #include + +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-folder.h" #include "camel-exception.h" #include "camel-store.h" @@ -814,7 +819,9 @@ if (info == NULL) return NULL; +#ifdef __GNUC__ #warning "Need to duplicate tag string" +#endif ret = camel_tag_get(&info->user_tags, name); camel_folder_summary_info_free(folder->summary, info); @@ -837,7 +844,9 @@ g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0); +#ifdef __GNUC__ #warning "get_message_user_tag() needs to copy the tag contents" +#endif ret = CF_CLASS (folder)->get_message_user_tag (folder, uid, name); return ret; --- ./camel/camel-multipart-signed.c Tue Jun 18 14:34:52 2002 +++ ../evolution-1.2.0/./camel/camel-multipart-signed.c Thu Jan 2 10:28:20 2003 @@ -25,10 +25,13 @@ #endif #include - #include #include #include + +#ifdef HAVE_ALLOCA_H +#include +#endif #include --- ./camel/camel-sasl-ntlm.c Thu Feb 7 20:56:44 2002 +++ ../evolution-1.2.0/./camel/camel-sasl-ntlm.c Thu Jan 2 10:28:20 2003 @@ -22,6 +22,10 @@ #include #endif +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-sasl-ntlm.h" #include --- ./camel/camel-search-private.c Tue Sep 24 13:45:18 2002 +++ ../evolution-1.2.0/./camel/camel-search-private.c Thu Jan 2 10:28:20 2003 @@ -35,6 +35,14 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + +#if defined (__sgi) +#define __inline__ __inline +#endif + #include "camel-exception.h" #include "camel-mime-message.h" #include "camel-multipart.h" --- ./camel/camel-index.c Tue Sep 24 13:45:17 2002 +++ ../evolution-1.2.0/./camel/camel-index.c Thu Jan 2 10:28:20 2003 @@ -391,6 +391,7 @@ void camel_index_cursor_reset(CamelIndexCursor *idc) { - return CIC_CLASS(idc)->reset(idc); + CIC_CLASS(idc)->reset(idc); + return; } --- ./camel/camel-medium.c Fri Nov 2 19:26:18 2001 +++ ../evolution-1.2.0/./camel/camel-medium.c Thu Jan 2 10:28:21 2003 @@ -227,7 +227,9 @@ g_return_val_if_fail (header_name != NULL, NULL); #ifndef NO_WARNINGS +#ifdef __GNUC__ #warning No way to get multi-valued headers? +#endif #endif return CM_CLASS (medium)->get_header (medium, header_name); --- ./camel/camel-vee-folder.c Fri Oct 4 12:19:36 2002 +++ ../evolution-1.2.0/./camel/camel-vee-folder.c Thu Jan 2 10:28:21 2003 @@ -25,6 +25,10 @@ #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-exception.h" #include "camel-vee-folder.h" #include "camel-store.h" --- ./camel/camel-mime-filter-from.c Fri Nov 2 19:26:19 2001 +++ ../evolution-1.2.0/./camel/camel-mime-filter-from.c Thu Jan 2 10:28:21 2003 @@ -19,12 +19,24 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include + +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-mime-filter-from.h" #define d(x) struct _CamelMimeFilterFromPrivate { +#ifndef __GNUC__ + char filler; +#endif }; #define _PRIVATE(o) (((CamelMimeFilterFrom *)(o))->priv) --- ./camel/camel-mime-part.c Mon Oct 7 12:13:33 2002 +++ ../evolution-1.2.0/./camel/camel-mime-part.c Thu Jan 2 10:28:21 2003 @@ -649,8 +649,10 @@ /* FIXME: something needs to be done about this ... */ /* FIXME: need to count these bytes too */ #ifndef NO_WARNINGS +#ifdef __GNUC__ #warning content-languages should be stored as a header #endif +#endif if (mp->headers) { struct _header_raw *h = mp->headers; @@ -816,7 +818,9 @@ d(printf("mime_part::construct_from_parser() leaving\n")); #ifndef NO_WARNINGS +#ifdef __GNUC__ #warning "Need to work out how to detect a (fatally) bad parse in the parser" +#endif #endif err = camel_mime_parser_errno(mp); --- ./camel/camel-mime-part.h Fri May 31 17:02:41 2002 +++ ../evolution-1.2.0/./camel/camel-mime-part.h Thu Jan 2 10:28:21 2003 @@ -107,7 +107,7 @@ const gchar *camel_mime_part_get_content_location (CamelMimePart *mime_part); void camel_mime_part_set_encoding (CamelMimePart *mime_part, CamelMimePartEncodingType type); -CamelMimePartEncodingType camel_mime_part_get_encoding (CamelMimePart *mime_part); +const CamelMimePartEncodingType camel_mime_part_get_encoding (CamelMimePart *mime_part); void camel_mime_part_set_content_languages (CamelMimePart *mime_part, GList *content_languages); const GList *camel_mime_part_get_content_languages (CamelMimePart *mime_part); --- ./camel/camel-mime-message.c Thu Sep 5 12:42:43 2002 +++ ../evolution-1.2.0/./camel/camel-mime-message.c Thu Jan 2 10:28:21 2003 @@ -31,6 +31,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #include @@ -105,7 +109,7 @@ header_name_table = g_hash_table_new (g_strcase_hash, g_strcase_equal); for (i=0;header_names[i];i++) - g_hash_table_insert (header_name_table, header_names[i], (gpointer)i+1); + g_hash_table_insert (header_name_table, header_names[i], (char *)i+1); /* virtual method overload */ camel_data_wrapper_class->write_to_stream = write_to_stream; @@ -481,7 +485,9 @@ d(printf("mime_message::construct_from_parser() leaving\n")); #ifndef NO_WARNINGS +#ifdef __GNUC__ #warning "return a real error code" +#endif #endif err = camel_mime_parser_errno(mp); if (err != 0) { --- ./camel/camel-stream-mem.c Fri Nov 2 19:26:20 2001 +++ ../evolution-1.2.0/./camel/camel-stream-mem.c Thu Jan 2 10:28:21 2003 @@ -186,7 +186,9 @@ nwrite = MIN(seekable->bound_end - seekable->position, n); #ifndef NO_WARNINGS +#ifdef __GNUC__ #warning "g_byte_arrays use g_malloc and so are totally unsuitable for this object" +#endif #endif if (seekable->position == stream_mem->buffer->len) { g_byte_array_append(stream_mem->buffer, (const guint8 *)buffer, nwrite); --- ./camel/providers/imap/camel-imap-store.c Thu Oct 24 11:00:52 2002 +++ ../evolution-1.2.0/./camel/providers/imap/camel-imap-store.c Thu Jan 2 10:28:21 2003 @@ -35,6 +35,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "e-util/e-path.h" #include "camel-imap-store.h" --- ./camel/providers/imap/camel-imap-store-summary.c Thu Oct 24 11:00:52 2002 +++ ../evolution-1.2.0/./camel/providers/imap/camel-imap-store-summary.c Thu Jan 2 10:28:21 2003 @@ -28,6 +28,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-imap-store-summary.h" #include "camel-file-utils.h" --- ./camel/providers/imap/camel-imap-folder.c Fri Oct 4 12:19:36 2002 +++ ../evolution-1.2.0/./camel/providers/imap/camel-imap-folder.c Thu Jan 2 10:28:21 2003 @@ -37,6 +37,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "e-util/e-path.h" #include "e-util/e-time-utils.h" @@ -276,7 +280,7 @@ count = camel_folder_summary_count (folder->summary); for (i = 0; i < response->untagged->len; i++) { - resp = response->untagged->pdata[i] + 2; + resp = (char *) response->untagged->pdata[i] + 2; if (!g_strncasecmp (resp, "FLAGS ", 6) && !folder->permanent_flags) { resp += 6; --- ./camel/providers/pop3/camel-pop3-store.c Wed Oct 23 14:08:08 2002 +++ ../evolution-1.2.0/./camel/providers/pop3/camel-pop3-store.c Thu Jan 2 10:28:21 2003 @@ -37,6 +37,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-operation.h" #include "camel-pop3-store.h" --- ./camel/providers/local/camel-maildir-summary.c Tue Aug 6 12:29:31 2002 +++ ../evolution-1.2.0/./camel/providers/local/camel-maildir-summary.c Thu Jan 2 10:28:21 2003 @@ -31,6 +31,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #include @@ -277,7 +281,12 @@ if (info) { d(printf("already seen uid '%s', just summarising instead\n", uid)); camel_folder_summary_info_free(s, mi); + #if !defined (__sgi) mdi = (CamelMaildirMessageInfo *)mi = info; + #else + mi = info; + mdi = (CamelMaildirMessageInfo *)mi; + #endif } /* with maildir we know the real received date, from the filename */ @@ -529,7 +538,13 @@ int forceindex; char *new, *cur; char *uid; +#if !defined (__sgi) struct _remove_data rd = { cls, changes }; +#else + struct _remove_data rd; + rd.cls = cls; + rd.changes = changes; +#endif new = g_strdup_printf("%s/new", cls->folder_path); cur = g_strdup_printf("%s/cur", cls->folder_path); --- ./camel/providers/local/camel-spool-summary.c Fri Jun 28 15:22:55 2002 +++ ../evolution-1.2.0/./camel/providers/local/camel-spool-summary.c Thu Jan 2 10:28:21 2003 @@ -32,6 +32,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #include "camel-spool-summary.h" @@ -45,6 +49,9 @@ #define CAMEL_SPOOL_SUMMARY_VERSION (0x400) struct _CamelSpoolSummaryPrivate { +#ifndef __GNUC__ + char filler; +#endif }; #define _PRIVATE(o) (((CamelSpoolSummary *)(o))->priv) --- ./camel/providers/local/camel-local-provider.c Tue Jul 16 13:05:44 2002 +++ ../evolution-1.2.0/./camel/providers/local/camel-local-provider.c Thu Jan 2 10:28:21 2003 @@ -26,6 +26,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-provider.h" #include "camel-session.h" #include "camel-url.h" --- ./camel/providers/local/camel-maildir-store.c Mon Jul 29 12:12:45 2002 +++ ../evolution-1.2.0/./camel/providers/local/camel-maildir-store.c Thu Jan 2 10:28:21 2003 @@ -348,7 +348,13 @@ tmp = g_strdup_printf("%s/%s", name, d->d_name); if (stat(tmp, &st) == 0 && S_ISDIR(st.st_mode)) { +#if !defined (__sgi) struct _inode in = { st.st_dev, st.st_ino }; +#else + struct _inode in; + in.dnode = st.st_dev; + in.inode = st.st_ino; +#endif /* see if we've visited already */ if (g_hash_table_lookup(visited, &in) == NULL) { --- ./camel/providers/local/camel-local-folder.c Tue Aug 6 12:29:25 2002 +++ ../evolution-1.2.0/./camel/providers/local/camel-local-folder.c Thu Jan 2 10:28:21 2003 @@ -33,6 +33,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #ifndef _POSIX_PATH_MAX #include #endif --- ./camel/providers/local/camel-mh-store.c Mon Jul 29 12:12:46 2002 +++ ../evolution-1.2.0/./camel/providers/local/camel-mh-store.c Thu Jan 2 10:28:21 2003 @@ -29,6 +29,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-mh-store.h" #include "camel-mh-folder.h" #include "camel-exception.h" --- ./camel/providers/local/camel-local-store.c Fri Sep 27 12:59:04 2002 +++ ../evolution-1.2.0/./camel/providers/local/camel-local-store.c Thu Jan 2 10:28:21 2003 @@ -29,6 +29,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #include "camel-private.h" --- ./camel/providers/local/camel-spool-store.c Fri Sep 27 12:59:05 2002 +++ ../evolution-1.2.0/./camel/providers/local/camel-spool-store.c Thu Jan 2 10:28:21 2003 @@ -32,6 +32,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-spool-store.h" #include "camel-spool-folder.h" #include "camel-exception.h" @@ -378,7 +382,13 @@ } } else if (S_ISDIR(st.st_mode)) { + #if !defined (__sgi) struct _inode in = { st.st_dev, st.st_ino }; + #else + struct _inode in; + in.dnode = st.st_dev; + in.inode = st.st_ino; + #endif /* see if we've visited already */ if (g_hash_table_lookup(visited, &in) == NULL) { --- ./camel/providers/local/camel-mbox-summary.c Tue Sep 3 09:57:58 2002 +++ ../evolution-1.2.0/./camel/providers/local/camel-mbox-summary.c Thu Jan 2 10:28:21 2003 @@ -36,6 +36,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "camel-mbox-summary.h" #include "camel/camel-file-utils.h" #include "camel/camel-mime-message.h" @@ -47,6 +51,9 @@ #define CAMEL_MBOX_SUMMARY_VERSION (0x1000) struct _CamelMboxSummaryPrivate { +#ifndef __GNUC__ + char filler; +#endif }; #define _PRIVATE(o) (((CamelMboxSummary *)(o))->priv) @@ -231,7 +238,12 @@ if ((info->flags & CAMEL_MESSAGE_FOLDER_NOTSEEN)) { info->flags &= ~CAMEL_MESSAGE_FOLDER_NOTSEEN; camel_folder_summary_info_free(s, mi); +#if !defined (__sgi) mbi = (CamelMboxMessageInfo *)mi = info; +#else + mi = info; + mbi = (CamelMboxMessageInfo *)mi; +#endif } else { add = 7; d(printf("seen '%s' before, adding anew\n", uid)); --- ./camel/camel-folder-summary.c Mon Sep 30 11:30:26 2002 +++ ../evolution-1.2.0/./camel/camel-folder-summary.c Thu Jan 2 10:28:21 2003 @@ -33,6 +33,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #include "camel-folder-summary.h" --- ./shell/Makefile.in Wed Nov 6 17:45:13 2002 +++ ../evolution-1.2.0/./shell/Makefile.in Thu Jan 2 22:31:15 2003 @@ -1222,12 +1222,13 @@ Evolution-impl.o: Evolution.h +.NOTPARALLEL: $(IDL_GENERATED) $(IDL_GENERATED): $(IDLS) - $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(ORBIT_IDL) -I $(srcdir) -I $(ROOT)$(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ $(srcdir)/Evolution.idl $(SELECT_NAMES_IDL_GENERATED): $(SELECT_NAMES_IDL) - $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(ORBIT_IDL) -I $(srcdir) -I $(ROOT)$(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ $(SELECT_NAMES_IDL) install-test-component: evolution-test-component --- ./shell/e-setup.c Wed Sep 11 16:39:26 2002 +++ ../evolution-1.2.0/./shell/e-setup.c Thu Jan 2 10:28:21 2003 @@ -150,7 +150,7 @@ char *command; char *shortpath; - shortpath = l->data + strlen (EVOLUTION_DATADIR "/evolution/default_user/"); + shortpath = (char *) l->data + strlen (EVOLUTION_DATADIR "/evolution/default_user/"); command = g_strconcat ("cp -r ", l->data, " ", evolution_directory, "/", --- ./shell/e-shell-view-menu.c Sat Oct 26 04:11:33 2002 +++ ../evolution-1.2.0/./shell/e-shell-view-menu.c Thu Jan 2 10:28:21 2003 @@ -81,6 +81,7 @@ static void launch_pilot_settings (const char *extra_arg) { + #if (!defined sgi) char *args[] = { "gpilotd-control-applet", (char *) extra_arg, @@ -87,6 +88,13 @@ NULL }; int pid; + #else + char *args[3]; + int pid; + args[0] = "gpilotd-control-applet"; + args[1] = (char *) extra_arg; + args[2] = NULL; + #endif args[0] = gnome_is_program_in_path ("gpilotd-control-applet"); if (!args[0]) { --- ./shell/importer/Makefile.in Wed Nov 6 17:45:16 2002 +++ ../evolution-1.2.0/./shell/importer/Makefile.in Thu Jan 2 11:18:28 2003 @@ -582,7 +582,7 @@ GNOME_Evolution_Importer-impl.o: GNOME_Evolution_Importer.h $(IDL_GENERATED): $(IDLS) - $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(ORBIT_IDL) -I $(srcdir) -I $(ROOT)$(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ $(srcdir)/GNOME_Evolution_Importer.idl dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) --- ./widgets/misc/e-dropdown-button.c Wed May 22 17:00:58 2002 +++ ../evolution-1.2.0/./widgets/misc/e-dropdown-button.c Thu Jan 2 10:28:21 2003 @@ -85,7 +85,7 @@ { EDropdownButton *dropdown_button; - puts (__FUNCTION__); + puts ("menu_deactivate_cb"); dropdown_button = E_DROPDOWN_BUTTON (data); --- ./widgets/misc/e-map.c Tue Dec 11 12:26:01 2001 +++ ../evolution-1.2.0/./widgets/misc/e-map.c Thu Jan 2 10:28:21 2003 @@ -87,7 +87,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint e_map_signals[LAST_SIGNAL]; +#else +static guint e_map_signals[LAST_SIGNAL+1]; +#endif /* Internal prototypes */ --- ./tools/evolution-addressbook-abuse.c Mon Aug 26 15:40:54 2002 +++ ../evolution-1.2.0/./tools/evolution-addressbook-abuse.c Thu Jan 2 10:28:21 2003 @@ -107,6 +107,7 @@ { char *filename = NULL; +#if !defined (__sgi) struct poptOption options[] = { { "input-file", '\0', POPT_ARG_STRING, &filename, 0, N_("Input File"), NULL }, { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &oaf_popt_options, 0, NULL, NULL }, @@ -113,6 +114,41 @@ POPT_AUTOHELP { NULL, '\0', 0, NULL, 0, NULL, NULL } }; +#else + struct poptOption options[4]; + + options[0].longName = "input-file"; + options[0].shortName = '\0'; + options[0].argInfo = POPT_ARG_STRING; + options[0].arg = &filename; + options[0].val = 0; + options[0].descrip = N_("Input File"); + options[0].argDescrip = NULL; + + options[1].longName = NULL; + options[1].shortName = '\0'; + options[1].argInfo = POPT_ARG_INCLUDE_TABLE; + options[1].arg = &oaf_popt_options; + options[1].val = 0; + options[1].descrip = NULL; + options[1].argDescrip = NULL; + + options[2].longName = NULL; + options[2].shortName = '\0'; + options[2].argInfo = POPT_ARG_INCLUDE_TABLE; + options[2].arg = poptHelpOptions; + options[2].val = 0; + options[2].descrip = "help options:"; + options[2].argDescrip = NULL; + + options[3].longName = NULL; + options[3].shortName = '\0'; + options[3].argInfo = 0; + options[3].arg = NULL; + options[3].val = 0; + options[3].descrip = NULL; + options[3].argDescrip = NULL; +#endif if (getenv ("ABUSE_THE_WOMBAT") == NULL) { g_print ("You probably don't want to use this program.\n" --- ./tools/evolution-addressbook-export.c Mon Aug 26 15:40:54 2002 +++ ../evolution-1.2.0/./tools/evolution-addressbook-export.c Thu Jan 2 10:28:21 2003 @@ -42,6 +42,7 @@ { char *filename = NULL; +#if !defined (__sgi) struct poptOption options[] = { { "output-file", '\0', POPT_ARG_STRING, &filename, 0, N_("Output File"), NULL }, { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &oaf_popt_options, 0, NULL, NULL }, @@ -48,6 +49,41 @@ POPT_AUTOHELP { NULL, '\0', 0, NULL, 0, NULL, NULL } }; +#else + struct poptOption options[4]; + + options[0].longName = "output-file"; + options[0].shortName = '\0'; + options[0].argInfo = POPT_ARG_STRING; + options[0].arg = &filename; + options[0].val = 0; + options[0].descrip = N_("Output File"); + options[0].argDescrip = NULL; + + options[1].longName = NULL; + options[1].shortName = '\0'; + options[1].argInfo = POPT_ARG_INCLUDE_TABLE; + options[1].arg = &oaf_popt_options; + options[1].val = 0; + options[1].descrip = NULL; + options[1].argDescrip = NULL; + + options[2].longName = NULL; + options[2].shortName = '\0'; + options[2].argInfo = POPT_ARG_INCLUDE_TABLE; + options[2].arg = poptHelpOptions; + options[2].val = 0; + options[2].descrip = "help options:"; + options[2].argDescrip = NULL; + + options[3].longName = NULL; + options[3].shortName = '\0'; + options[3].argInfo = 0; + options[3].arg = NULL; + options[3].val = 0; + options[3].descrip = NULL; + options[3].argDescrip = NULL; +#endif bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); textdomain (PACKAGE); --- ./tools/evolution-addressbook-import.c Mon Aug 26 15:40:54 2002 +++ ../evolution-1.2.0/./tools/evolution-addressbook-import.c Thu Jan 2 10:28:21 2003 @@ -63,6 +63,7 @@ { char *filename = NULL; +#if !defined (__sgi) struct poptOption options[] = { { "input-file", '\0', POPT_ARG_STRING, &filename, 0, N_("Input File"), NULL }, { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &oaf_popt_options, 0, NULL, NULL }, @@ -69,6 +70,41 @@ POPT_AUTOHELP { NULL, '\0', 0, NULL, 0, NULL, NULL } }; +#else + struct poptOption options[4]; + + options[0].longName = "input-file"; + options[0].shortName = '\0'; + options[0].argInfo = POPT_ARG_STRING; + options[0].arg = &filename; + options[0].val = 0; + options[0].descrip = N_("Input File"); + options[0].argDescrip = NULL; + + options[1].longName = NULL; + options[1].shortName = '\0'; + options[1].argInfo = POPT_ARG_INCLUDE_TABLE; + options[1].arg = &oaf_popt_options; + options[1].val = 0; + options[1].descrip = NULL; + options[1].argDescrip = NULL; + + options[2].longName = NULL; + options[2].shortName = '\0'; + options[2].argInfo = POPT_ARG_INCLUDE_TABLE; + options[2].arg = poptHelpOptions; + options[2].val = 0; + options[2].descrip = "help options:"; + options[2].argDescrip = NULL; + + options[3].longName = NULL; + options[3].shortName = '\0'; + options[3].argInfo = 0; + options[3].arg = NULL; + options[3].val = 0; + options[3].descrip = NULL; + options[3].argDescrip = NULL; +#endif bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); textdomain (PACKAGE); --- ./addressbook/gui/widgets/gal-view-minicard.c Wed Feb 20 14:11:54 2002 +++ ../evolution-1.2.0/./addressbook/gui/widgets/gal-view-minicard.c Thu Jan 2 10:28:21 2003 @@ -181,7 +181,7 @@ static void column_width_changed (ETable *table, double width, GalViewMinicard *view) { - d(g_print("%s: Old width = %f, New width = %f\n", __FUNCTION__, view->column_width, width)); + d(g_print("%s: Old width = %f, New width = %f\n", "column_width_changed", view->column_width, width)); if (view->column_width != width) { view->column_width = width; gal_view_changed(GAL_VIEW(view)); --- ./addressbook/gui/component/select-names/Makefile.in Wed Nov 6 17:47:15 2002 +++ ../evolution-1.2.0/./addressbook/gui/component/select-names/Makefile.in Thu Jan 2 11:18:12 2003 @@ -776,7 +776,7 @@ Evolution-Addressbook-SelectNames-impl.o: Evolution-Addressbook-SelectNames.h $(IDL_GENERATED): $(idl_DATA) - $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(ORBIT_IDL) -I $(srcdir) -I $(ROOT)$(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ $(srcdir)/Evolution-Addressbook-SelectNames.idl @XML_I18N_MERGE_OAF_RULE@ --- ./addressbook/backend/pas/Makefile.in Wed Nov 6 17:46:22 2002 +++ ../evolution-1.2.0/./addressbook/backend/pas/Makefile.in Thu Jan 2 11:18:04 2003 @@ -230,7 +230,7 @@ idls = $(srcdir)/../idl/addressbook.idl -idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl +idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(ROOT)$(datadir)/idl INCLUDES = $(DB3_CFLAGS) $(LDAP_CFLAGS) -DGNOMELOCALEDIR=\""$(localedir)"\" -DG_LOG_DOMAIN=\"wombat-pas\" -I$(top_srcdir) -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend $(EVOLUTION_ADDRESSBOOK_CFLAGS) --- ./addressbook/backend/ebook/Makefile.in Wed Nov 6 17:46:20 2002 +++ ../evolution-1.2.0/./addressbook/backend/ebook/Makefile.in Thu Jan 2 11:17:53 2003 @@ -231,7 +231,7 @@ idls = $(srcdir)/../idl/addressbook.idl $(srcdir)/../../../composer/Evolution-Composer.idl -idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl +idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(ROOT)$(datadir)/idl INCLUDES = -DGNOMELOCALEDIR=\""$(localedir)"\" -DG_LOG_DOMAIN=\"EBook\" -I$(top_srcdir) -I$(top_srcdir)/camel -I$(top_srcdir)/addressbook/backend -I$(top_srcdir)/addressbook/ename -I$(top_builddir)/addressbook/backend -I$(top_builddir)/addressbook/ename -I$(top_builddir)/shell -I$(top_srcdir)/shell $(EVOLUTION_ADDRESSBOOK_CFLAGS) --- ./addressbook/backend/ebook/load-pine-addressbook.c Sat Oct 27 13:25:28 2001 +++ ../evolution-1.2.0/./addressbook/backend/ebook/load-pine-addressbook.c Thu Jan 2 10:28:21 2003 @@ -110,7 +110,7 @@ if (!book) { printf ("%s: %s(): Couldn't create EBook, bailing.\n", __FILE__, - __FUNCTION__); + "ebook_create"); return FALSE; } --- ./addressbook/backend/ebook/evolution-ldif-importer.c Mon Aug 26 15:38:06 2002 +++ ../evolution-1.2.0/./addressbook/backend/ebook/evolution-ldif-importer.c Thu Jan 2 10:28:21 2003 @@ -457,7 +457,7 @@ if (!gci->book) { printf ("%s: %s(): Couldn't create EBook, bailing.\n", __FILE__, - __FUNCTION__); + "ebook_create"); return; } #if 0 --- ./addressbook/backend/ebook/test-client.c Wed Aug 7 11:32:15 2002 +++ ../evolution-1.2.0/./addressbook/backend/ebook/test-client.c Thu Jan 2 10:28:21 2003 @@ -42,7 +42,7 @@ /* we just added a card, so the length should be >1 */ printf ("\n%s: %s(): Number of cards is %ld\n", - __FILE__, __FUNCTION__, length); + __FILE__, "get_cursor_cb", length); if (length < 1) printf ("*** Why isn't this above zero?? ***\n\n"); @@ -131,7 +131,7 @@ if (!book) { printf ("%s: %s(): Couldn't create EBook, bailing.\n", __FILE__, - __FUNCTION__); + "ebook_create"); return FALSE; } --- ./addressbook/backend/ebook/load-gnomecard-addressbook.c Sat Oct 27 13:25:28 2001 +++ ../evolution-1.2.0/./addressbook/backend/ebook/load-gnomecard-addressbook.c Thu Jan 2 10:28:21 2003 @@ -54,7 +54,7 @@ if (!book) { printf ("%s: %s(): Couldn't create EBook, bailing.\n", __FILE__, - __FUNCTION__); + "ebook_create"); return FALSE; } --- ./addressbook/backend/ebook/evolution-vcard-importer.c Mon Aug 26 15:38:06 2002 +++ ../evolution-1.2.0/./addressbook/backend/ebook/evolution-vcard-importer.c Thu Jan 2 10:28:21 2003 @@ -54,7 +54,7 @@ if (!gci->book) { printf ("%s: %s(): Couldn't create EBook, bailing.\n", __FILE__, - __FUNCTION__); + "ebook_create"); return; } --- ./addressbook/printing/Makefile.in Wed Nov 6 17:46:23 2002 +++ ../evolution-1.2.0/./addressbook/printing/Makefile.in Thu Jan 2 10:28:21 2003 @@ -245,13 +245,13 @@ contact_print_test_SOURCES = test-print.c -contact_print_test_LDADD = $(top_builddir)/addressbook/backend/ebook/libebook.la $(top_builddir)/camel/libcamel.la $(top_builddir)/e-util/libeutil.la $(top_builddir)/libversit/libversit.a $(top_builddir)/e-util/ename/libename.la libecontactprint.a $(EVOLUTION_ADDRESSBOOK_LIBS) +contact_print_test_LDADD = $(top_builddir)/addressbook/backend/ebook/libebook.la $(top_builddir)/camel/libcamel.la $(top_builddir)/e-util/libeutil.la $(top_builddir)/libversit/libversit.a $(top_builddir)/e-util/ename/libename.la libecontactprint.a $(EVOLUTION_ADDRESSBOOK_LIBS) $(top_builddir)/addressbook/backend/ebook/libebook.la contact_print_style_editor_test_SOURCES = test-contact-print-style-editor.c -contact_print_style_editor_test_LDADD = $(top_builddir)/addressbook/backend/ebook/libebook.la $(top_builddir)/camel/libcamel.la $(top_builddir)/e-util/libeutil.la $(top_builddir)/libversit/libversit.a $(top_builddir)/e-util/ename/libename.la libecontactprint.a $(EVOLUTION_ADDRESSBOOK_LIBS) +contact_print_style_editor_test_LDADD = $(top_builddir)/addressbook/backend/ebook/libebook.la $(top_builddir)/camel/libcamel.la $(top_builddir)/e-util/libeutil.la $(top_builddir)/libversit/libversit.a $(top_builddir)/e-util/ename/libename.la libecontactprint.a $(EVOLUTION_ADDRESSBOOK_LIBS) $(top_builddir)/addressbook/backend/ebook/libebook.la EXTRA_DIST = $(glade_DATA) $(ecps_DATA) --- ./calendar/gui/alarm-notify/Makefile.in Wed Nov 6 17:49:09 2002 +++ ../evolution-1.2.0/./calendar/gui/alarm-notify/Makefile.in Thu Jan 2 11:17:47 2003 @@ -225,7 +225,7 @@ idls = $(top_srcdir)/calendar/idl/evolution-calendar.idl -idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl +idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(ROOT)$(datadir)/idl bin_PROGRAMS = evolution-alarm-notify --- ./calendar/gui/dialogs/Makefile.in Wed Nov 6 17:49:12 2002 +++ ../evolution-1.2.0/./calendar/gui/dialogs/Makefile.in Thu Jan 2 11:17:42 2003 @@ -783,7 +783,7 @@ $(IDL_GENERATED): $(IDLS) - $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(ORBIT_IDL) -I $(srcdir) -I $(ROOT)$(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl dist-hook: --- ./calendar/gui/Makefile.in Wed Nov 6 17:48:44 2002 +++ ../evolution-1.2.0/./calendar/gui/Makefile.in Thu Jan 2 22:27:00 2003 @@ -1295,12 +1295,13 @@ maintainer-clean +.NOTPARALLEL: $(IDL_GENERATED) $(IDL_GENERATED): $(IDLS) - $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(ORBIT_IDL) -I $(srcdir) -I $(ROOT)$(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ $(srcdir)/../../composer/Evolution-Composer.idl - $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(ORBIT_IDL) -I $(srcdir) -I $(ROOT)$(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ $(top_srcdir)/calendar/idl/evolution-calendar.idl - $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(ORBIT_IDL) -I $(srcdir) -I $(ROOT)$(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl @XML_I18N_MERGE_OAF_RULE@ --- ./calendar/gui/e-itip-control.c Thu Oct 24 11:00:43 2002 +++ ../evolution-1.2.0/./calendar/gui/e-itip-control.c Thu Jan 2 10:28:21 2003 @@ -1076,7 +1076,13 @@ gtk_object_unref (GTK_OBJECT (real_comp)); } else { +#if !defined(__sgi) CalComponentText text = {_("Unknown"), NULL}; +#else + CalComponentText text; + text.value = _("Unknown"); + text.altrep = NULL; +#endif cal_component_set_summary (comp, &text); } --- ./calendar/pcs/Makefile.in Wed Nov 6 17:48:36 2002 +++ ../evolution-1.2.0/./calendar/pcs/Makefile.in Thu Jan 2 11:17:08 2003 @@ -234,7 +234,7 @@ idls = $(srcdir)/../idl/evolution-calendar.idl -idl_flags = -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl +idl_flags = -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` -I $(ROOT)$(datadir)/idl pcsincludedir = $(includedir)/evolution/pcs --- ./calendar/pcs/cal-backend-file.c Mon Oct 7 12:13:28 2002 +++ ../evolution-1.2.0/./calendar/pcs/cal-backend-file.c Thu Jan 2 10:28:21 2003 @@ -139,6 +139,7 @@ static void notify_categories_changed (CalBackendFile *cbfile); static CalBackendClass *parent_class; +static void notify_error (CalBackendFile *cbfile, const char *message); --- ./calendar/cal-client/Makefile.in Wed Nov 6 17:48:39 2002 +++ ../evolution-1.2.0/./calendar/cal-client/Makefile.in Thu Jan 2 11:16:58 2003 @@ -233,7 +233,7 @@ idls = $(srcdir)/../idl/evolution-calendar.idl -idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl +idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(ROOT)$(datadir)/idl INCLUDES = -DGNOMELOCALEDIR=\""$(localedir)"\" -DG_LOG_DOMAIN=\"cal-client\" -I$(top_srcdir)/calendar -I$(srcdir) -I$(top_srcdir) -I. -I.. -I$(top_builddir) -I$(top_builddir)/libical/src/libical -I$(top_srcdir)/libical/src/libical -I$(top_builddir)/libwombat -I$(top_srcdir)/libwombat $(EVOLUTION_CALENDAR_CFLAGS) --- ./calendar/cal-client/cal-client.c Mon Oct 7 12:13:24 2002 +++ ../evolution-1.2.0/./calendar/cal-client/cal-client.c Thu Jan 2 10:28:22 2003 @@ -1054,8 +1054,8 @@ CORBA_Environment ev; CORBA_boolean read_only; - g_return_val_if_fail (client != NULL, NULL); - g_return_val_if_fail (IS_CAL_CLIENT (client), NULL); + g_return_val_if_fail (client != NULL, FALSE); + g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE); priv = client->priv; --- ./libwombat/Makefile.in Wed Nov 6 17:45:32 2002 +++ ../evolution-1.2.0/./libwombat/Makefile.in Thu Jan 2 11:16:49 2003 @@ -529,7 +529,7 @@ $(IDLS): $(ORBIT_IDL) $(IDL_GENERATED): $(IDLS) - $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(ORBIT_IDL) -I $(srcdir) -I $(ROOT)$(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ $(top_srcdir)/wombat/Evolution-Wombat.idl # Tell versions [3.59,3.63) of GNU make to not export all variables. --- ./filter/vfolder-editor.c Sat Oct 27 13:56:52 2001 +++ ../evolution-1.2.0/./filter/vfolder-editor.c Thu Jan 2 10:28:22 2003 @@ -43,6 +43,9 @@ #define _PRIVATE(x) (((VfolderEditor *)(x))->priv) struct _VfolderEditorPrivate { +#ifndef __GNUC__ + char filler; +#endif }; static RuleEditorClass *parent_class; @@ -51,7 +54,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif guint vfolder_editor_get_type (void) --- ./filter/filter-editor.c Sat Oct 27 19:47:32 2001 +++ ../evolution-1.2.0/./filter/filter-editor.c Thu Jan 2 10:28:22 2003 @@ -45,6 +45,9 @@ #define _PRIVATE(x) (((FilterEditor *)(x))->priv) struct _FilterEditorPrivate { +#ifndef __GNUC__ + char filler; +#endif }; static GnomeDialogClass *parent_class; @@ -53,7 +56,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif guint filter_editor_get_type (void) --- ./filter/filter-filter.c Sun Jul 14 23:49:45 2002 +++ ../evolution-1.2.0/./filter/filter-filter.c Thu Jan 2 10:28:22 2003 @@ -54,6 +54,9 @@ #define _PRIVATE(x) (((FilterFilter *)(x))->priv) struct _FilterFilterPrivate { +#ifndef __GNUC__ + char filler; +#endif }; static FilterRuleClass *parent_class; @@ -62,7 +65,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif guint filter_filter_get_type (void) --- ./filter/filter-folder.c Mon Sep 30 16:36:56 2002 +++ ../evolution-1.2.0/./filter/filter-folder.c Thu Jan 2 10:28:22 2003 @@ -51,6 +51,9 @@ #define _PRIVATE(x) (((FilterFolder *)(x))->priv) struct _FilterFolderPrivate { +#ifndef __GNUC__ + char filler; +#endif }; static FilterElementClass *parent_class; --- ./filter/filter-source.c Sun Jul 14 23:49:45 2002 +++ ../evolution-1.2.0/./filter/filter-source.c Thu Jan 2 10:28:22 2003 @@ -59,7 +59,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif static void filter_source_class_init (FilterSourceClass *); static void filter_source_init (FilterSource *); --- ./filter/filter-part.c Mon Jul 29 12:12:50 2002 +++ ../evolution-1.2.0/./filter/filter-part.c Thu Jan 2 10:28:22 2003 @@ -18,11 +18,17 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H #include +#endif #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #include #include @@ -43,6 +49,9 @@ #define _PRIVATE(x) (((FilterPart *)(x))->priv) struct _FilterPartPrivate { +#ifndef __GNUC__ + char filler; +#endif }; static GtkObjectClass *parent_class; @@ -51,7 +60,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif guint filter_part_get_type (void) --- ./filter/score-editor.c Sat Oct 27 13:55:59 2001 +++ ../evolution-1.2.0/./filter/score-editor.c Thu Jan 2 10:28:22 2003 @@ -43,6 +43,9 @@ #define _PRIVATE(x) (((ScoreEditor *)(x))->priv) struct _ScoreEditorPrivate { +#ifndef __GNUC__ + char filler; +#endif }; static RuleEditorClass *parent_class; @@ -51,7 +54,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif guint score_editor_get_type (void) --- ./filter/vfolder-rule.c Fri Sep 27 12:59:31 2002 +++ ../evolution-1.2.0/./filter/vfolder-rule.c Thu Jan 2 10:28:22 2003 @@ -55,6 +55,9 @@ #define _PRIVATE(x) (((VfolderRule *)(x))->priv) struct _VfolderRulePrivate { +#ifndef __GNUC__ + char filler; +#endif }; static FilterRuleClass *parent_class; @@ -473,7 +476,12 @@ gtk_object_set_data_full (GTK_OBJECT (frame), "data", data, g_free); for (i = 0; i < BUTTON_LAST; i++) { +#if !defined (__sgi) data->buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name); +#else + w = glade_xml_get_widget (gui, edit_buttons[i].name); + data->buttons[i] = (GtkButton *) w; +#endif gtk_signal_connect (GTK_OBJECT (w), "clicked", edit_buttons[i].func, data); } --- ./filter/filter-colour.c Sun Jul 14 23:49:45 2002 +++ ../evolution-1.2.0/./filter/filter-colour.c Thu Jan 2 10:28:22 2003 @@ -45,6 +45,9 @@ #define _PRIVATE(x) (((FilterColour *)(x))->priv) struct _FilterColourPrivate { +#ifndef __GNUC__ + char filler; +#endif }; static FilterElementClass *parent_class; @@ -53,7 +56,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif guint filter_colour_get_type (void) --- ./filter/score-rule.c Sat Oct 27 13:56:21 2001 +++ ../evolution-1.2.0/./filter/score-rule.c Thu Jan 2 10:28:22 2003 @@ -47,6 +47,9 @@ #define _PRIVATE(x) (((ScoreRule *)(x))->priv) struct _ScoreRulePrivate { +#ifndef __GNUC__ + char filler; +#endif }; static FilterRuleClass *parent_class; @@ -55,7 +58,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif guint score_rule_get_type (void) --- ./filter/filter-input.c Sun Jul 14 23:49:45 2002 +++ ../evolution-1.2.0/./filter/filter-input.c Thu Jan 2 10:28:22 2003 @@ -55,6 +55,9 @@ #define _PRIVATE(x) (((FilterInput *)(x))->priv) struct _FilterInputPrivate { +#ifndef __GNUC__ + char filler; +#endif }; static FilterElementClass *parent_class; @@ -63,7 +66,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif guint filter_input_get_type (void) --- ./filter/vfolder-context.c Sat Oct 27 13:50:49 2001 +++ ../evolution-1.2.0/./filter/vfolder-context.c Thu Jan 2 10:28:22 2003 @@ -34,6 +34,9 @@ #define _PRIVATE(x) (((VfolderContext *)(x))->priv) struct _VfolderContextPrivate { +#ifndef __GNUC__ + char filler; +#endif }; static RuleContextClass *parent_class; @@ -42,7 +45,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif guint vfolder_context_get_type (void) --- ./filter/filter-context.c Tue Sep 24 13:45:24 2002 +++ ../evolution-1.2.0/./filter/filter-context.c Thu Jan 2 10:28:22 2003 @@ -45,6 +45,9 @@ #define _PRIVATE(x) (((FilterContext *)(x))->priv) struct _FilterContextPrivate { +#ifndef __GNUC__ + char filler; +#endif }; static RuleContextClass *parent_class; @@ -53,7 +56,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif guint filter_context_get_type (void) --- ./filter/filter-element.c Mon Jul 29 12:12:50 2002 +++ ../evolution-1.2.0/./filter/filter-element.c Thu Jan 2 10:28:22 2003 @@ -55,7 +55,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif GtkType filter_element_get_type (void) @@ -154,7 +158,8 @@ void filter_element_xml_create (FilterElement *fe, xmlNodePtr node) { - return ((FilterElementClass *)((GtkObject *)fe)->klass)->xml_create(fe, node); + ((FilterElementClass *)((GtkObject *)fe)->klass)->xml_create(fe, node); + return; } /** @@ -226,7 +231,8 @@ void filter_element_build_code (FilterElement *fe, GString *out, struct _FilterPart *ff) { - return ((FilterElementClass *)((GtkObject *)fe)->klass)->build_code(fe, out, ff); + ((FilterElementClass *)((GtkObject *)fe)->klass)->build_code(fe, out, ff); + return; } /** @@ -240,7 +246,8 @@ void filter_element_format_sexp (FilterElement *fe, GString *out) { - return ((FilterElementClass *)((GtkObject *)fe)->klass)->format_sexp(fe, out); + ((FilterElementClass *)((GtkObject *)fe)->klass)->format_sexp(fe, out); + return; } /** --- ./filter/rule-editor.c Tue Nov 5 13:53:39 2002 +++ ../evolution-1.2.0/./filter/rule-editor.c Thu Jan 2 10:28:22 2003 @@ -74,7 +74,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif guint rule_editor_get_type(void) @@ -188,7 +192,8 @@ void rule_editor_set_sensitive (RuleEditor *re) { - return ((RuleEditorClass *)((GtkObject *)re)->klass)->set_sensitive(re); + ((RuleEditorClass *)((GtkObject *)re)->klass)->set_sensitive(re); + return; } /* used internally by implementations */ @@ -195,7 +200,8 @@ void rule_editor_set_source (RuleEditor *re, const char *source) { - return ((RuleEditorClass *)((GtkObject *)re)->klass)->set_source(re, source); + ((RuleEditorClass *)((GtkObject *)re)->klass)->set_source(re, source); + return; } /* factory method for "add" button */ @@ -664,11 +670,21 @@ gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (re)->vbox), w, TRUE, TRUE, 0); for (i = 0; i < BUTTON_LAST; i++) { +#if !defined (__sgi) re->priv->buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name); +#else + w = glade_xml_get_widget (gui, edit_buttons[i].name); + re->priv->buttons[i] = (GtkButton *)w; +#endif gtk_signal_connect (GTK_OBJECT (w), "clicked", edit_buttons[i].func, re); } - - re->list = (GtkList *) w = glade_xml_get_widget(gui, "rule_list"); + +#if !defined (__sgi) + re->list = (GtkList *) w = glade_xml_get_widget(gui, "rule_list"); +#else + w = glade_xml_get_widget(gui, "rule_list"); + re->list = (GtkList *) w; +#endif gtk_signal_connect (GTK_OBJECT (w), "select_child", select_rule, re); gtk_signal_connect (GTK_OBJECT (w), "button_press_event", GTK_SIGNAL_FUNC (double_click), re); --- ./filter/filter-label.c Thu Jul 18 14:17:23 2002 +++ ../evolution-1.2.0/./filter/filter-label.c Thu Jan 2 10:28:22 2003 @@ -62,7 +62,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif GtkType filter_label_get_type (void) --- ./filter/filter-int.c Mon Jul 29 12:12:50 2002 +++ ../evolution-1.2.0/./filter/filter-int.c Thu Jan 2 10:28:22 2003 @@ -50,7 +50,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif GtkType filter_int_get_type (void) --- ./filter/filter-file.c Fri Jul 26 12:44:36 2002 +++ ../evolution-1.2.0/./filter/filter-file.c Thu Jan 2 10:28:22 2003 @@ -59,6 +59,9 @@ #define _PRIVATE(x) (((FilterFile *)(x))->priv) struct _FilterFilePrivate { +#ifndef __GNUC__ + char filler; +#endif }; static FilterElementClass *parent_class; @@ -67,7 +70,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif GtkType filter_file_get_type (void) --- ./filter/filter-option.c Wed Jul 31 15:28:38 2002 +++ ../evolution-1.2.0/./filter/filter-option.c Thu Jan 2 10:28:22 2003 @@ -50,6 +50,9 @@ #define _PRIVATE(x) (((FilterOption *)(x))->priv) struct _FilterOptionPrivate { +#ifndef __GNUC__ + char filler; +#endif }; static FilterElementClass *parent_class; @@ -58,7 +61,11 @@ LAST_SIGNAL }; +#ifdef __GNUC__ static guint signals[LAST_SIGNAL] = { 0 }; +#else +static guint signals[LAST_SIGNAL+1] = { 0 }; +#endif guint filter_option_get_type (void) --- ./my-evolution/e-summary-weather.c Thu Oct 24 18:15:42 2002 +++ ../evolution-1.2.0/./my-evolution/e-summary-weather.c Thu Jan 2 10:28:22 2003 @@ -305,7 +305,7 @@ GList *w; if (summary->weather->online == FALSE) { - g_warning ("%s: Repolling but offline", __FUNCTION__); + g_warning ("%s: Repolling but offline", "e_summary_weather_update"); return TRUE; } --- ./my-evolution/e-summary-rdf.c Thu Oct 24 18:11:34 2002 +++ ../evolution-1.2.0/./my-evolution/e-summary-rdf.c Thu Jan 2 10:28:22 2003 @@ -356,7 +356,7 @@ GList *r; if (summary->rdf->online == FALSE) { - g_warning ("%s: Repolling but offline", __FUNCTION__); + g_warning ("%s: Repolling but offline", "e_summary_rdf_update"); return TRUE; } --- ./my-evolution/e-summary-calendar.c Thu Oct 24 18:34:00 2002 +++ ../evolution-1.2.0/./my-evolution/e-summary-calendar.c Thu Jan 2 10:28:22 2003 @@ -512,7 +512,7 @@ CORBA_exception_init (&ev); factory = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory", 0, NULL, &ev); if (BONOBO_EX (&ev)) { - g_message ("%s: Could not activate the component editor factory (%s)", __FUNCTION__, + g_message ("%s: Could not activate the component editor factory (%s)", "e_summary_calendar_protocol", CORBA_exception_id (&ev)); CORBA_exception_free (&ev); return; @@ -521,7 +521,7 @@ GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, comp_uri, (char *)uri + 10, &ev); if (BONOBO_EX (&ev)) { - g_message ("%s: Execption while editing the component (%s)", __FUNCTION__, + g_message ("%s: Execption while editing the component (%s)", "e_summary_calendar_protocol", CORBA_exception_id (&ev)); } --- ./my-evolution/e-summary-tasks.c Thu Oct 24 18:10:26 2002 +++ ../evolution-1.2.0/./my-evolution/e-summary-tasks.c Thu Jan 2 10:28:22 2003 @@ -456,7 +456,7 @@ CORBA_exception_init (&ev); factory = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory", 0, NULL, &ev); if (BONOBO_EX (&ev)) { - g_message ("%s: Could not activate the component editor factory (%s)", __FUNCTION__, + g_message ("%s: Could not activate the component editor factory (%s)", "e_summary_tasks_protocol", CORBA_exception_id (&ev)); CORBA_exception_free (&ev); return; @@ -465,7 +465,7 @@ GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, comp_uri, (char *)uri + 7, &ev); if (BONOBO_EX (&ev)) { - g_message ("%s: Execption while editing the component (%s)", __FUNCTION__, + g_message ("%s: Execption while editing the component (%s)", "e_summary_tasks_protocol", CORBA_exception_id (&ev)); } --- ./e-util/e-memory.c Tue Jul 16 13:05:47 2002 +++ ../evolution-1.2.0/./e-util/e-memory.c Thu Jan 2 10:28:22 2003 @@ -20,11 +20,19 @@ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "e-memory.h" #include /* memset() */ #include /* alloca() */ #include + +#ifdef HAVE_ALLOCA_H +#include +#endif #define s(x) /* strv debug */ #define p(x) /* poolv debug */ --- ./e-util/e-sexp.h Sat Oct 27 12:50:11 2001 +++ ../evolution-1.2.0/./e-util/e-sexp.h Thu Jan 2 10:28:22 2003 @@ -115,11 +115,11 @@ struct _EMemChunk *result_chunks; }; -struct _ESExpClass { #ifdef E_SEXP_IS_GTK_OBJECT +struct _ESExpClass { GtkObjectClass parent_class; -#endif }; +#endif #ifdef E_SEXP_IS_GTK_OBJECT guint e_sexp_get_type (void); --- ./e-util/e-sexp.c Tue Jul 16 13:05:48 2002 +++ ../evolution-1.2.0/./e-util/e-sexp.c Thu Jan 2 10:28:22 2003 @@ -82,6 +82,10 @@ Execute a sequence. The last function return is the return type. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "e-sexp.h" #include @@ -89,6 +93,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #include "e-memory.h" #define p(x) /* parse debug */ @@ -265,7 +273,7 @@ for (j=0;jtype == ESEXP_RES_BOOL) { bool = bool && r1->value.bool; --- ./ltmain.sh Wed Nov 6 16:01:40 2002 +++ ../evolution-1.2.0/./ltmain.sh Thu Jan 2 10:28:22 2003 @@ -61,7 +61,7 @@ default_mode= help="Try \`$progname --help' for more information." magic="%%%MAGIC variable%%%" -mkdir="mkdir" +mkdir="mkdir -p" mv="mv -f" rm="rm -f" --- ./configure Wed Nov 6 16:01:40 2002 +++ ../evolution-1.2.0/./configure Thu Jan 2 10:28:22 2003 @@ -781,7 +781,7 @@ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross ac_exeext= @@ -1399,7 +1399,7 @@ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF @@ -1427,7 +1427,7 @@ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 @@ -3214,7 +3214,7 @@ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&6 @@ -9730,7 +9730,7 @@ ac_cv_db3_ldadd="" for name in db db3 db-3.1; do - LIBS="$LIBS_save $with_db3_libs/lib${name}.a" + LIBS="$LIBS_save $with_db3_libs/lib${name}.a $PTHREAD_LIB" cat > conftest.$ac_ext <&6 else - LIBS="$DB3_LDADD $LIBS" + LIBS="$DB3_LDADD $PTHREAD_LIB $LIBS" if test "$cross_compiling" = yes; then ac_cv_db3_lib_version_match=yes else