--- ./src/balsa-mblist.c Wed Nov 20 18:10:40 2002 +++ ../balsa-1.4.4/./src/balsa-mblist.c Fri May 30 11:43:49 2003 @@ -1132,14 +1132,20 @@ { static const int num_core_mailboxes = 5; LibBalsaMailbox* core_mailbox[] = { - balsa_app.inbox, - balsa_app.sentbox, - balsa_app.draftbox, - balsa_app.outbox, - balsa_app.trash + NULL /* balsa_app.inbox */, + NULL /* balsa_app.sentbox */, + NULL /* balsa_app.draftbox */, + NULL /* balsa_app.outbox */, + NULL /* balsa_app.trash */ }; gint i = 0; + core_mailbox[0] = balsa_app.inbox; + core_mailbox[1] = balsa_app.sentbox; + core_mailbox[2] = balsa_app.draftbox; + core_mailbox[3] = balsa_app.outbox; + core_mailbox[4] = balsa_app.trash; + for (i = 0; i < num_core_mailboxes; ++i) { if (mailbox == core_mailbox[i]) { /* we want to return as if from a base-1 array */ --- ./src/Makefile.in Sat May 10 18:35:40 2003 +++ ../balsa-1.4.4/./src/Makefile.in Fri May 30 11:43:49 2003 @@ -224,7 +224,6 @@ $(top_builddir)/libmutt/libmutt.a \ $(top_builddir)/libinit_balsa/libinit_balsa.a \ -lpspell \ - -lltdl \ $(INTLLIBS) \ $(PCRE_LIBS) \ $(PTHREAD_LIB) --- ./src/main-window.h Tue May 14 06:07:40 2002 +++ ../balsa-1.4.4/./src/main-window.h Fri May 30 11:43:49 2003 @@ -96,7 +96,7 @@ #endif #if defined(__FILE__) && defined(__LINE__) -# ifdef __FUNCTION__ +# ifdef __GNUC__ # define BALSA_DEBUG_MSG(message) if (balsa_app.debug) fprintf(stderr, "[%lu] %12s | %4d | %30s: %s\n", (unsigned long) time(NULL), __FILE__, __LINE__, __FUNCTION__, message) # define BALSA_DEBUG() if (balsa_app.debug) fprintf (stderr, "[%lu] %12s | %4d | %30s\n", (unsigned long) time(NULL), __FILE__, __LINE__, __FUNCTION__) # else --- ./src/filter-edit-callbacks.c Wed Oct 16 17:08:03 2002 +++ ../balsa-1.4.4/./src/filter-edit-callbacks.c Fri May 30 11:43:49 2003 @@ -1417,12 +1417,14 @@ void fe_new_pressed(GtkWidget * widget, gpointer data) { - const static char FLT_NAME_TEMPLATE[] = N_("New filter"); + const static char *FLT_NAME_TEMPLATE = N_("New filter"); gint new_row, filter_number; LibBalsaFilter* fil; guint len = strlen(_(FLT_NAME_TEMPLATE))+4; - gchar *new_item[] = { g_new(gchar,len) }; + gchar *new_item[] = { NULL }; + new_item[0] = g_new(gchar,len); + /* Put a number behind 'New filter' */ for(filter_number = 0; filter_number<1000; filter_number++){ if(filter_number == 0) @@ -1600,7 +1602,7 @@ if (fil->action!=FILTER_TRASH) fil->action_string = g_strdup(balsa_mblist_mru_option_menu_get(fe_mailboxes)); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(fe_popup_button))) { - static gchar defstring[] = N_("Filter has matched"); + static gchar *defstring = N_("Filter has matched"); gchar *tmpstr; tmpstr = gtk_entry_get_text(GTK_ENTRY(fe_popup_entry)); --- ./src/sendmsg-window.c Sat Jan 4 04:40:31 2003 +++ ../balsa-1.4.4/./src/sendmsg-window.c Fri May 30 11:43:49 2003 @@ -1398,12 +1398,22 @@ char *last_slash = strrchr(attach->filename, '/'); if (balsa_app.debug) - fprintf (stderr, "%s:%s: unlink `%s'\n", __FILE__, __FUNCTION__, + fprintf (stderr, "%s:%s: unlink `%s'\n", __FILE__, +#ifdef __GNUC__ + __FUNCTION__, +#else + "destroy_attachemnt", +#endif attach->filename); unlink(attach->filename); *last_slash = 0; if (balsa_app.debug) - fprintf (stderr, "%s:%s: rmdir `%s'\n", __FILE__, __FUNCTION__, + fprintf (stderr, "%s:%s: rmdir `%s'\n", __FILE__, +#ifdef __GNUC__ + __FUNCTION__, +#else + "destroy_attachement", +#endif attach->filename); rmdir(attach->filename); } --- ./help/C/Makefile.in Sat May 10 18:35:37 2003 +++ ../balsa-1.4.4/./help/C/Makefile.in Mon Jun 2 12:00:53 2003 @@ -299,7 +299,7 @@ if test "$(HAVE_JW)" = 'yes' ; then \ jw -V '%use-id-as-filename%' -o balsa balsa.sgml; \ else \ - db2html -V '%use-id-as-filename%' balsa.sgml; \ + db2html balsa.sgml; \ fi -cp balsa/index.html index.html || touch index.html --- ./libbalsa/pop3.c Wed Feb 5 18:11:03 2003 +++ ../balsa-1.4.4/./libbalsa/pop3.c Fri May 30 11:43:49 2003 @@ -71,11 +71,29 @@ } +#ifdef __sgi +# include +static DM(const char *fmt, ...) +{ +#ifdef BALSA_TEST_POP3 + va_list args; + va_start(args, fmt); + + if (PopDebug) { + vfprintf(stderr, fmt, args ); + fprintf(stderr, "\n" ); + } + + va_end(args); +#endif +} +#else #ifdef BALSA_TEST_POP3 #define DM( fmt, args... ) G_STMT_START { if(PopDebug) { fprintf(stderr, fmt, ##args ); fprintf(stderr, "\n" );} } G_STMT_END #else #define DM( fmt, args... ) #endif +#endif static int safe_read_char(int fd, char *ch) @@ -229,7 +247,12 @@ provide a patch. */ #ifdef _REENTRANT -#warning "getaddrinfo() is not available, using a thread unsafe code." + struct hostent hent_buf; + char buffer[16384]; + int h_errno_buf; +# define GETHOSTBYNAME(host) gethostbyname_r(host, &hent_buf, buffer, sizeof(buffer), &h_errno_buf) +#else +# define GETHOSTBYNAME(host) gethostbyname(host) #endif struct sockaddr_in sin; gint32 n; @@ -248,7 +271,7 @@ if ((n = inet_addr (hostname)) == -1) { /* Must be a DNS name */ - if ((he = gethostbyname (hostname)) == NULL) + if ((he = GETHOSTBYNAME (hostname)) == NULL) return POP_HOST_NOT_FOUND; memcpy ((void *)&sin.sin_addr, *(he->h_addr_list), he->h_length); } --- ./libmutt/configure Sat May 10 17:42:14 2003 +++ ../balsa-1.4.4/./libmutt/configure Fri May 30 11:43:50 2003 @@ -10514,12 +10514,10 @@ echo "$as_me: error: SSL support is only for IMAP, but IMAP is not enabled" >&2;} { (exit 1); exit 1; }; } fi - if pkg-config openssl >& /dev/null; then - echo here + if pkg-config openssl >/dev/null 2>&1; then LDFLAGS="$LIBS `pkg-config --libs openssl`" CPPFLAGS="`pkg-config --cflags-only-I openssl` $CPPFLAGS" else - echo failed echo "$as_me:$LINENO: checking for ssldir" >&5 echo $ECHO_N "checking for ssldir... $ECHO_C" >&6 if test "${ac_cv_path_openssl+set}" = set; then --- ./libinit_balsa/balsa-druid-page-welcome.c Sat Mar 9 03:14:34 2002 +++ ../balsa-1.4.4/./libinit_balsa/balsa-druid-page-welcome.c Fri May 30 11:43:50 2003 @@ -34,8 +34,8 @@ { GnomeDruidPageEdge *page; #endif /* BALSA_MAJOR < 2 */ - static const gchar title[] = N_("Welcome to Balsa!"); - static const gchar text[] = + static const gchar *title = N_("Welcome to Balsa!"); + static const gchar *text = N_ ("You seem to be running Balsa for the first time. The following\n" "steps will set up Balsa by asking a few simple questions. Once\n" --- ./configure Sat May 10 17:42:10 2003 +++ ../balsa-1.4.4/./configure Fri May 30 11:43:50 2003 @@ -9287,7 +9287,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS" +LIBS="-lpspell -lC -lpspell-modules $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -9340,7 +9340,7 @@ #define HAVE_LIBPSPELL 1 _ACEOF - LIBS="-lpspell $LIBS" + LIBS="-lpspell -lC $LIBS" else @@ -14479,7 +14479,7 @@ echo $ECHO_N "checking whether to build SSL support... $ECHO_C" >&6 if test "x$with_ssl" != xno ; then # openssl >=0.9.7 is pkg-config compatible. - if pkg-config openssl >&/dev/null; then + if pkg-config openssl >/dev/null 2>&1; then LIBS="$LIBS `pkg-config --libs openssl`" CPPFLAGS="`pkg-config --cflags-only-I openssl` $CPPFLAGS" echo "$as_me:$LINENO: result: yes" >&5