2005-08-19 [paul] 1.9.13cvs39

	* configure.ac
		complete cvs38's sync
	* src/editaddress.c
	* src/gedit-print.c
	* src/mutt.c
	* src/etpan/etpan-log.c
	* src/etpan/imap-thread.c
	* src/gtk/gtksourceprintjob.c
		fix compilation warnings
		(patch by Colin)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 0fa1b51790ef5ab5a00d2722f1dcdfeb8c6c6836..9ca7d46c50699c6256cd9312551a11c347808ac9 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,16 @@
+2005-08-19 [paul]      1.9.13cvs39
+
+       * configure.ac
+               complete cvs38's sync
+       * src/editaddress.c
+       * src/gedit-print.c
+       * src/mutt.c
+       * src/etpan/etpan-log.c
+       * src/etpan/imap-thread.c
+       * src/gtk/gtksourceprintjob.c
+               fix compilation warnings
+               (patch by Colin)
+
 2005-08-19 [paul]      1.9.13cvs38
 
        sync with main:

diff --git a/PATCHSETS b/PATCHSETS
index d9b411926b2f26bf663b14a8a065a9843cdc0c8f..4326e1a67df822a1db5e82cc824743ae4d384ff9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -724,3 +724,4 @@
 ( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 commitHelper;  cvs diff -u -r 1.15.2.2 -r 1.15.2.3 src/addrcache.c;  cvs diff -u -r 1.6.10.6 -r 1.6.10.7 src/addrharvest.c;  cvs diff -u -r 1.28.2.6 -r 1.28.2.7 src/addrindex.c;  cvs diff -u -r 1.382.2.149 -r 1.382.2.150 src/compose.c;  cvs diff -u -r 1.14.2.9 -r 1.14.2.10 src/grouplistdialog.c;  cvs diff -u -r 1.115.2.48 -r 1.115.2.49 src/main.c;  cvs diff -u -r 1.274.2.55 -r 1.274.2.56 src/mainwindow.c;  cvs diff -u -r 1.16.2.24 -r 1.16.2.25 src/msgcache.c;  cvs diff -u -r 1.6.10.1 -r 1.6.10.2 src/mutt.c;  cvs diff -u -r 1.6.2.1 -r 1.6.2.2 src/pine.c;  cvs diff -u -r 1.105.2.30 -r 1.105.2.31 src/prefs_account.c;  cvs diff -u -r 1.3.2.22 -r 1.3.2.23 src/prefs_themes.c;  cvs diff -u -r 1.25.2.15 -r 1.25.2.16 src/stock_pixmap.c;  cvs diff -u -r 1.395.2.112 -r 1.395.2.113 src/summaryview.c;  cvs diff -u -r 1.4.2.15 -r 1.4.2.16 src/gtk/about.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/logwindow.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/select-keys.c;  ) > 1.9.13cvs36.patchset
 ( cvs diff -u -r 1.382.2.150 -r 1.382.2.151 src/compose.c;  cvs diff -u -r 1.213.2.50 -r 1.213.2.51 src/folder.c;  cvs diff -u -r 1.18.2.9 -r 1.18.2.10 src/jpilot.c;  cvs diff -u -r 1.150.2.37 -r 1.150.2.38 src/procmsg.c;  cvs diff -u -r 1.60.2.14 -r 1.60.2.15 src/procmsg.h;  cvs diff -u -r 1.395.2.113 -r 1.395.2.114 src/summaryview.c;  ) > 1.9.13cvs37.patchset
 ( cvs diff -u -r 1.61.2.36 -r 1.61.2.37 src/account.c;  cvs diff -u -r 1.12.2.24 -r 1.12.2.25 src/action.c;  cvs diff -u -r 1.22.2.3 -r 1.22.2.4 src/addrbook.c;  cvs diff -u -r 1.15.2.3 -r 1.15.2.4 src/addrcache.c;  cvs diff -u -r 1.6.10.7 -r 1.6.10.8 src/addrharvest.c;  cvs diff -u -r 1.28.2.7 -r 1.28.2.8 src/addrindex.c;  cvs diff -u -r 1.65.2.34 -r 1.65.2.35 src/codeconv.c;  cvs diff -u -r 1.382.2.151 -r 1.382.2.152 src/compose.c;  cvs diff -u -r 1.23.2.11 -r 1.23.2.12 src/crash.c;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/exporthtml.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/exportldif.c;  cvs diff -u -r 1.213.2.51 -r 1.213.2.52 src/folder.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/image_viewer.c;  cvs diff -u -r 1.149.2.30 -r 1.149.2.31 src/inc.c;  cvs diff -u -r 1.29.2.4 -r 1.29.2.5 src/inc.h;  cvs diff -u -r 1.18.2.10 -r 1.18.2.11 src/jpilot.c;  cvs diff -u -r 1.12.2.2 -r 1.12.2.3 src/ldif.c;  cvs diff -u -r 1.115.2.49 -r 1.115.2.50 src/main.c;  cvs diff -u -r 1.75.2.7 -r 1.75.2.8 src/matcher.c;  cvs diff -u -r 1.28.2.6 -r 1.28.2.7 src/mbox.c;  cvs diff -u -r 1.94.2.61 -r 1.94.2.62 src/messageview.c;  cvs diff -u -r 1.79.2.16 -r 1.79.2.17 src/mh.c;  cvs diff -u -r 1.83.2.35 -r 1.83.2.36 src/mimeview.c;  cvs diff -u -r 1.16.2.25 -r 1.16.2.26 src/msgcache.c;  cvs diff -u -r 1.6.10.2 -r 1.6.10.3 src/mutt.c;  cvs diff -u -r 1.101.2.12 -r 1.101.2.13 src/news.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/partial_download.c;  cvs diff -u -r 1.6.2.2 -r 1.6.2.3 src/pine.c;  cvs diff -u -r 1.56.2.37 -r 1.56.2.38 src/pop.c;  cvs diff -u -r 1.60.2.19 -r 1.60.2.20 src/prefs_actions.c;  cvs diff -u -r 1.204.2.50 -r 1.204.2.51 src/prefs_common.c;  cvs diff -u -r 1.16.2.11 -r 1.16.2.12 src/prefs_customheader.c;  cvs diff -u -r 1.16.2.11 -r 1.16.2.12 src/prefs_display_header.c;  cvs diff -u -r 1.10.2.12 -r 1.10.2.13 src/prefs_gtk.c;  cvs diff -u -r 1.3.2.23 -r 1.3.2.24 src/prefs_themes.c;  cvs diff -u -r 1.47.2.22 -r 1.47.2.23 src/procheader.c;  cvs diff -u -r 1.49.2.53 -r 1.49.2.54 src/procmime.c;  cvs diff -u -r 1.150.2.38 -r 1.150.2.39 src/procmsg.c;  cvs diff -u -r 1.17.2.4 -r 1.17.2.5 src/recv.c;  cvs diff -u -r 1.17.2.16 -r 1.17.2.17 src/send_message.c;  cvs diff -u -r 1.1 -r 1.2 src/simple-gettext.c;  cvs diff -u -r 1.9.2.13 -r 1.9.2.14 src/sourcewindow.c;  cvs diff -u -r 1.96.2.69 -r 1.96.2.70 src/textview.c;  cvs diff -u -r 1.14.2.3 -r 1.14.2.4 src/vcard.c;  cvs diff -u -r 1.9.2.12 -r 1.9.2.13 src/common/defs.h;  cvs diff -u -r 1.6.2.3 -r 1.6.2.4 src/common/log.c;  cvs diff -u -r 1.13.2.5 -r 1.13.2.6 src/common/plugin.c;  cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/common/prefs.c;  cvs diff -u -r 1.23.2.5 -r 1.23.2.6 src/common/session.c;  cvs diff -u -r 1.8.2.3 -r 1.8.2.4 src/common/session.h;  cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/common/socket.c;  cvs diff -u -r 1.13.2.1 -r 1.13.2.2 src/common/socket.h;  cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/common/ssl_certificate.c;  cvs diff -u -r 1.2.4.11 -r 1.2.4.12 src/common/template.c;  cvs diff -u -r 1.36.2.39 -r 1.36.2.40 src/common/utils.c;  cvs diff -u -r 1.20.2.21 -r 1.20.2.22 src/common/utils.h;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/common/xml.c;  cvs diff -u -r 1.4.2.16 -r 1.4.2.17 src/gtk/about.c;  ) > 1.9.13cvs38.patchset
+( cvs diff -u -r 1.654.2.765 -r 1.654.2.766 configure.ac;  cvs diff -u -r 1.14.2.8 -r 1.14.2.9 src/editaddress.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gedit-print.c;  cvs diff -u -r 1.6.10.3 -r 1.6.10.4 src/mutt.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/etpan-log.c;  cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtksourceprintjob.c;  ) > 1.9.13cvs39.patchset

diff --git a/configure.ac b/configure.ac
index 2a8d1b2fbeb0952d874de15412202599a9fbb010..71cb484c12accd30cb74303079a60ad2af63f142 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=38
+EXTRA_VERSION=39
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -128,6 +128,10 @@ case "$target" in
 *-darwin*)
        CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
        ;;
+*-*-mingw*)
+       CFLAGS="$CFLAGS -mms-bitfields"
+       LIBS="$LIBS -lws2_32"
+       ;;
 esac
   
 dnl Checks for iconv
@@ -151,11 +155,21 @@ AM_GLIB_GNU_GETTEXT
 dnl AM_GNU_GETTEXT
 dnl AC_CHECK_FUNC(gettext, AC_CHECK_LIB(intl, gettext))
 localedir='${prefix}/${DATADIRNAME}/locale'
+AC_ARG_WITH(localedir,
+       [  --with-localedir=DIR    Locale directory],
+       [localedir="$withval"])
 AC_SUBST(localedir)
 
 manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual'
+AC_ARG_WITH(manualdir,
+       [  --with-manualdir=DIR    Manual directory],
+       [manualdir="$withval"])
 AC_SUBST(manualdir)
+
 faqdir='${prefix}/${DATADIRNAME}/${PACKAGE}/faq'
+AC_ARG_WITH(faqdir,
+       [  --with-faqdir=DIR       FAQ directory],
+       [faqdir="$withval"])
 AC_SUBST(faqdir)
 
 dnl Set PACKAGE_DATA_DIR in config.h.
@@ -209,7 +223,7 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h sys/file.h unistd.h paths.h \
                 sys/param.h sys/utsname.h sys/select.h \
-                wchar.h wctype.h locale.h)
+                wchar.h wctype.h locale.h netdb.h)
 
 dnl alf - Check for apache installation f*ck up. apache may also install an 
 dnl fnmatch, which includes their own regex stuff if USE_HSREGEX is defined
@@ -251,7 +265,7 @@ AC_CHECK_FUNCS(gethostname mkdir mktime socket strstr strchr \
               wcsstr wcswcs iswalnum iswspace towlower \
               wcslen wcscpy wcsncpy \
               uname flock lockf inet_aton inet_addr \
-              fchmod mkstemp)
+              fchmod mkstemp truncate getuid regcomp)
 
 dnl *****************
 dnl ** common code **

diff --git a/src/editaddress.c b/src/editaddress.c
index b530504d9ada43c780bd546152a39aa6cd847f91..694102f8270b7bced326fcfc349b031685a4ccde 100644 (file)
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -663,7 +663,7 @@ static gboolean email_adding = FALSE, email_saving = FALSE;
 
 static void edit_person_entry_email_changed (GtkWidget *entry, gpointer data)
 {
-       gboolean non_empty = gtk_clist_get_row_data(personeditdlg.clist_email, 0) != NULL;
+       gboolean non_empty = gtk_clist_get_row_data(GTK_CLIST(personeditdlg.clist_email), 0) != NULL;
 
        if (gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_email)) == NULL
        ||  strlen(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_email))) == 0) {
@@ -858,7 +858,7 @@ static gboolean attrib_adding = FALSE, attrib_saving = FALSE;
 
 static void edit_person_entry_att_changed (GtkWidget *entry, gpointer data)
 {
-       gboolean non_empty = gtk_clist_get_row_data(personeditdlg.clist_attrib, 0) != NULL;
+       gboolean non_empty = gtk_clist_get_row_data(GTK_CLIST(personeditdlg.clist_attrib), 0) != NULL;
 
        if (gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_atname)) == NULL
        ||  strlen(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_atname))) == 0) {

diff --git a/src/etpan/etpan-log.c b/src/etpan/etpan-log.c
index 83d4547eed6b1cfec07df27fd07c1449e541f9ab..d0e7a7545b5944e8920748901ef5f0d3ef0f9ae6 100644 (file)
--- a/src/etpan/etpan-log.c
+++ b/src/etpan/etpan-log.c
@@ -159,7 +159,6 @@ extern char **backtrace_symbols (void *__const *__array, int __size) __THROW;
 void etpan_log_stack(void)
 {
   void * buffer[256];
-  char ** table;
   int num_frames;
   int i;
   char output[1024];

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 43e083b68715fc6d2f440e7c1af565b69b5dfee0..7f888b53b6ad2487f4b07d8611acc765eaa88ca1 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -1489,7 +1489,7 @@ static void fetch_content_run(struct etpan_thread_op * op)
                
                r = fclose(f);
                if (r == EOF) {
-                       unlink(param->filename);
+                       g_unlink(param->filename);
                        goto close;
                }
                goto free;
@@ -1500,7 +1500,7 @@ static void fetch_content_run(struct etpan_thread_op * op)
        close:
                close(fd);
        unlink:
-               unlink(param->filename);
+               g_unlink(param->filename);
        
        free:
                if (mmap_string_unref(content) != 0)

diff --git a/src/gedit-print.c b/src/gedit-print.c
index bd2353c8fe512a4ec1d310aae8a80d6136916c28..4d0bb06a8b03a4872dafff1c50eabbb2efbe78df 100644 (file)
--- a/src/gedit-print.c
+++ b/src/gedit-print.c
@@ -108,8 +108,6 @@ static void gedit_print_preview_real                        (GeditPrintJobInfo *pji,
 static void
 gedit_print_job_info_destroy (GeditPrintJobInfo *pji, gboolean save_config)
 {
-       GnomePrintConfig *config = NULL;
-       
        gedit_debug (DEBUG_PRINT, "");
 
        g_return_if_fail (pji != NULL);
@@ -164,7 +162,6 @@ static void
 gedit_print_dialog_response (GtkWidget *dialog, int response, GeditPrintJobInfo *pji)
 {
        GtkTextIter start, end;
-       gint line_start, line_end;
 
        pji->range_type = gnome_print_dialog_get_range (GNOME_PRINT_DIALOG (dialog));
        gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (pji->doc), &start, &end);
@@ -336,7 +333,6 @@ gedit_print (GtkTextView *view)
 {
        GeditPrintJobInfo *pji;
        GtkWidget *dialog;
-       PangoContext *pango_context;
 
        gedit_debug (DEBUG_PRINT, "");
 

diff --git a/src/gtk/gtksourceprintjob.c b/src/gtk/gtksourceprintjob.c
index 87cafad9725b9d06bc05dd354fe68863e1d205fb..e959e6be3bf49fae0a0faee62e16a6cf69f2889f 100644 (file)
--- a/src/gtk/gtksourceprintjob.c
+++ b/src/gtk/gtksourceprintjob.c
@@ -982,8 +982,6 @@ text_style_new (GtkSourcePrintJob *job, GtkTextTag *tag)
 {
        TextStyle *style;
        gboolean bg_set, fg_set;
-       gdouble scale;
-       PangoFontDescription *font_desc;
        
        g_return_val_if_fail (tag != NULL && GTK_IS_TEXT_TAG (tag), NULL);
 

diff --git a/src/mutt.c b/src/mutt.c
index acc99637d1387b573ea3d015bccbffa32e6ee4f5..aee9795ceb371cb0f3053d6d322fcb57bb3727a6 100644 (file)
--- a/src/mutt.c
+++ b/src/mutt.c
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <glib.h>
 
+#include "utils.h"
 #include "mgutils.h"
 #include "mutt.h"
 #include "addritem.h"