2005-09-14 [paul] 1.9.14cvs26

	* src/addrcache.c
	* src/codeconv.h
	* src/folder.h
	* src/mainwindow.h
	* src/mh.c
	* src/mimeview.h
	* src/partial_download.c
	* src/pop.c
	* src/prefs_account.c
	* src/prefs_account.h
	* src/prefs_actions.c
	* src/prefs_customheader.c
	* src/prefs_display_header.c
	* src/prefs_filtering_action.c
	* src/prefs_matcher.c
	* src/prefs_toolbar.c
	* src/privacy.h
	* src/procmime.c
	* src/procmime.h
	* src/procmsg.h
	* src/textview.c
	* src/undo.h
	* src/common/plugin.c
	* src/common/session.h
	* src/common/socket.c
	* src/common/socket.h
	* src/common/template.c
	* src/gtk/gtkaspell.c
	* src/gtk/quicksearch.h
	* src/plugins/pgpcore/passphrase.c
	* src/plugins/pgpcore/prefs_gpg.h
	* src/plugins/pgpcore/select-keys.c
	* src/plugins/pgpcore/select-keys.h
	* src/plugins/pgpcore/sgpgme.c
	* src/plugins/pgpinline/pgpinline.c
	* src/plugins/pgpmime/pgpmime.c
	* src/plugins/trayicon/trayicon.c
		fix compilation warnings
		Patch by Daniel Gustafson

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 1e3e1d9a0a0b7a371f9c1b1b5a9beeb1730fe8a8..21977b130747d2cfbdedbe4057ce2f68ddcbdf6e 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,45 @@
+2005-09-14 [paul]      1.9.14cvs26
+
+       * src/addrcache.c
+       * src/codeconv.h
+       * src/folder.h
+       * src/mainwindow.h
+       * src/mh.c
+       * src/mimeview.h
+       * src/partial_download.c
+       * src/pop.c
+       * src/prefs_account.c
+       * src/prefs_account.h
+       * src/prefs_actions.c
+       * src/prefs_customheader.c
+       * src/prefs_display_header.c
+       * src/prefs_filtering_action.c
+       * src/prefs_matcher.c
+       * src/prefs_toolbar.c
+       * src/privacy.h
+       * src/procmime.c
+       * src/procmime.h
+       * src/procmsg.h
+       * src/textview.c
+       * src/undo.h
+       * src/common/plugin.c
+       * src/common/session.h
+       * src/common/socket.c
+       * src/common/socket.h
+       * src/common/template.c
+       * src/gtk/gtkaspell.c
+       * src/gtk/quicksearch.h
+       * src/plugins/pgpcore/passphrase.c
+       * src/plugins/pgpcore/prefs_gpg.h
+       * src/plugins/pgpcore/select-keys.c
+       * src/plugins/pgpcore/select-keys.h
+       * src/plugins/pgpcore/sgpgme.c
+       * src/plugins/pgpinline/pgpinline.c
+       * src/plugins/pgpmime/pgpmime.c
+       * src/plugins/trayicon/trayicon.c
+               fix compilation warnings
+               Patch by Daniel Gustafson
+

 2005-09-14 [paul]      1.9.14cvs25
 
        * src/addressbook.c
 2005-09-14 [paul]      1.9.14cvs25
 
        * src/addressbook.c

diff --git a/PATCHSETS b/PATCHSETS
index 7490488fb2408f5248d9bf7173149308035e0bfc..a35732f56ea8878de547021dd33d0830b781db44 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -794,3 +794,4 @@
 ( cvs diff -u -r 1.382.2.167 -r 1.382.2.168 src/compose.c;  cvs diff -u -r 1.3.2.25 -r 1.3.2.26 src/prefs_themes.c;  cvs diff -u -r 1.49.2.58 -r 1.49.2.59 src/procmime.c;  cvs diff -u -r 1.150.2.43 -r 1.150.2.44 src/procmsg.c;  cvs diff -u -r 1.9.2.21 -r 1.9.2.22 src/gtk/gtkaspell.c;  ) > 1.9.14cvs23.patchset
 ( cvs diff -u -r 1.9.2.22 -r 1.9.2.23 src/gtk/gtkaspell.c;  ) > 1.9.14cvs24.patchset
 ( cvs diff -u -r 1.60.2.28 -r 1.60.2.29 src/addressbook.c;  ) > 1.9.14cvs25.patchset
 ( cvs diff -u -r 1.382.2.167 -r 1.382.2.168 src/compose.c;  cvs diff -u -r 1.3.2.25 -r 1.3.2.26 src/prefs_themes.c;  cvs diff -u -r 1.49.2.58 -r 1.49.2.59 src/procmime.c;  cvs diff -u -r 1.150.2.43 -r 1.150.2.44 src/procmsg.c;  cvs diff -u -r 1.9.2.21 -r 1.9.2.22 src/gtk/gtkaspell.c;  ) > 1.9.14cvs23.patchset
 ( cvs diff -u -r 1.9.2.22 -r 1.9.2.23 src/gtk/gtkaspell.c;  ) > 1.9.14cvs24.patchset
 ( cvs diff -u -r 1.60.2.28 -r 1.60.2.29 src/addressbook.c;  ) > 1.9.14cvs25.patchset

+( cvs diff -u -r 1.15.2.4 -r 1.15.2.5 src/addrcache.c;  cvs diff -u -r 1.15.2.9 -r 1.15.2.10 src/codeconv.h;  cvs diff -u -r 1.87.2.17 -r 1.87.2.18 src/folder.h;  cvs diff -u -r 1.39.2.6 -r 1.39.2.7 src/mainwindow.h;  cvs diff -u -r 1.79.2.17 -r 1.79.2.18 src/mh.c;  cvs diff -u -r 1.20.2.3 -r 1.20.2.4 src/mimeview.h;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/partial_download.c;  cvs diff -u -r 1.56.2.38 -r 1.56.2.39 src/pop.c;  cvs diff -u -r 1.105.2.32 -r 1.105.2.33 src/prefs_account.c;  cvs diff -u -r 1.49.2.13 -r 1.49.2.14 src/prefs_account.h;  cvs diff -u -r 1.60.2.20 -r 1.60.2.21 src/prefs_actions.c;  cvs diff -u -r 1.16.2.12 -r 1.16.2.13 src/prefs_customheader.c;  cvs diff -u -r 1.16.2.12 -r 1.16.2.13 src/prefs_display_header.c;  cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.21 -r 1.43.2.22 src/prefs_matcher.c;  cvs diff -u -r 1.30.2.15 -r 1.30.2.16 src/prefs_toolbar.c;  cvs diff -u -r 1.10.2.3 -r 1.10.2.4 src/privacy.h;  cvs diff -u -r 1.49.2.59 -r 1.49.2.60 src/procmime.c;  cvs diff -u -r 1.17.2.10 -r 1.17.2.11 src/procmime.h;  cvs diff -u -r 1.60.2.16 -r 1.60.2.17 src/procmsg.h;  cvs diff -u -r 1.96.2.74 -r 1.96.2.75 src/textview.c;  cvs diff -u -r 1.5.14.1 -r 1.5.14.2 src/undo.h;  cvs diff -u -r 1.13.2.6 -r 1.13.2.7 src/common/plugin.c;  cvs diff -u -r 1.8.2.4 -r 1.8.2.5 src/common/session.h;  cvs diff -u -r 1.13.2.14 -r 1.13.2.15 src/common/socket.c;  cvs diff -u -r 1.13.2.2 -r 1.13.2.3 src/common/socket.h;  cvs diff -u -r 1.2.4.12 -r 1.2.4.13 src/common/template.c;  cvs diff -u -r 1.9.2.23 -r 1.9.2.24 src/gtk/gtkaspell.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/quicksearch.h;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/prefs_gpg.h;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/select-keys.h;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/pgpmime/pgpmime.c;  cvs diff -u -r 1.14.2.18 -r 1.14.2.19 src/plugins/trayicon/trayicon.c;  ) > 1.9.14cvs26.patchset

diff --git a/configure.ac b/configure.ac
index 108f9ece13becd01db841a1d4dcf9a047e96acc4..dbf5d40f826d30710db086cd8ec5bff8fa4a95e7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=25
+EXTRA_VERSION=26

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addrcache.c b/src/addrcache.c
index 33a675a10542f92b16c7631a3246816f1d511206..45d709b03ee9290b3be60700ff28db824df6e416 100644 (file)
--- a/src/addrcache.c
+++ b/src/addrcache.c
@@ -342,7 +342,7 @@ void addrcache_print( AddressCache *cache, FILE *stream ) {
        fprintf( stream, "cache id : %s\n",  cache->cacheID );
        fprintf( stream, "next id  : %d\n",  cache->nextID );
        fprintf( stream, "name     : %s\n",  cache->name );
        fprintf( stream, "cache id : %s\n",  cache->cacheID );
        fprintf( stream, "next id  : %d\n",  cache->nextID );
        fprintf( stream, "name     : %s\n",  cache->name );

-       fprintf( stream, "mod time : %ld\n", cache->modifyTime );
+       fprintf( stream, "mod time : %ld\n", (long int)cache->modifyTime );

        fprintf( stream, "modified : %s\n",  cache->modified ? "yes" : "no" );
        fprintf( stream, "data read: %s\n",  cache->dataRead ? "yes" : "no" );
 }
        fprintf( stream, "modified : %s\n",  cache->modified ? "yes" : "no" );
        fprintf( stream, "data read: %s\n",  cache->dataRead ? "yes" : "no" );
 }

diff --git a/src/codeconv.h b/src/codeconv.h
index 86efe905a0f8e6ae09d2d1312b12d0a869fb82d1..0eb547aeb827902f7600db6b45622e1284134a76 100644 (file)
--- a/src/codeconv.h
+++ b/src/codeconv.h
@@ -170,7 +170,7 @@ struct _CodeConverter
 #define C_INTERNAL             C_UTF_8
 #define CS_INTERNAL            CS_UTF_8
 
 #define C_INTERNAL             C_UTF_8
 #define CS_INTERNAL            CS_UTF_8
 

-//void conv_mb_alnum(gchar *str);
+/* void conv_mb_alnum(gchar *str); */

 
 CharSet conv_guess_ja_encoding(const gchar *str);
 
 
 CharSet conv_guess_ja_encoding(const gchar *str);
 

diff --git a/src/common/plugin.c b/src/common/plugin.c
index 65bcf99da45b9cfec7cd540d22a485a4622cf1df..633bb24a5914e8ccbdc8d25eb2877b96c6b3ff8d 100644 (file)
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -197,11 +197,11 @@ Plugin *plugin_load(const gchar *filename, gchar **error)
        g_return_val_if_fail(filename != NULL, NULL);
        g_return_val_if_fail(error != NULL, NULL);
 
        g_return_val_if_fail(filename != NULL, NULL);
        g_return_val_if_fail(error != NULL, NULL);
 

-        /* check duplicate plugin path name */
-        if (plugin_is_loaded(filename)) {
-                *error = g_strdup(_("Plugin already loaded"));
-                return NULL;                
-        }                               
+       /* check duplicate plugin path name */
+       if (plugin_is_loaded(filename)) {
+               *error = g_strdup(_("Plugin already loaded"));
+               return NULL;                
+       }                               

        
        if (plugin_load_deps(filename, error) < 0)
                return NULL;
        
        if (plugin_load_deps(filename, error) < 0)
                return NULL;


@@ -220,8 +220,8 @@ Plugin *plugin_load(const gchar *filename, gchar **error)
 
        if (!g_module_symbol(plugin->module, "plugin_name", &plugin_name) ||
            !g_module_symbol(plugin->module, "plugin_desc", &plugin_desc) ||
 
        if (!g_module_symbol(plugin->module, "plugin_name", &plugin_name) ||
            !g_module_symbol(plugin->module, "plugin_desc", &plugin_desc) ||

-           !g_module_symbol(plugin->module, "plugin_type", (gpointer *) &plugin_type) ||
-           !g_module_symbol(plugin->module, "plugin_init", (gpointer *) &plugin_init)) {
+           !g_module_symbol(plugin->module, "plugin_type", (gpointer)&plugin_type) ||
+           !g_module_symbol(plugin->module, "plugin_init", (gpointer)&plugin_init)) {

                *error = g_strdup(g_module_error());
                g_module_close(plugin->module);
                g_free(plugin);
                *error = g_strdup(g_module_error());
                g_module_close(plugin->module);
                g_free(plugin);


@@ -259,7 +259,7 @@ void plugin_unload(Plugin *plugin)
 
        plugin_unload_rdeps(plugin);
 
 
        plugin_unload_rdeps(plugin);
 

-       if (g_module_symbol(plugin->module, "plugin_done", (gpointer *)&plugin_done)) {
+       if (g_module_symbol(plugin->module, "plugin_done", (gpointer) &plugin_done)) {

                plugin_done();
        }
 
                plugin_done();
        }
 

diff --git a/src/common/session.h b/src/common/session.h
index 4a6517ceec7ea7c7d1a7cb3df6988bd97922419e..ed2d328b8840e4e5ee9ecc840c227866a012c1f2 100644 (file)
--- a/src/common/session.h
+++ b/src/common/session.h
@@ -42,7 +42,7 @@ typedef enum {
        SESSION_IMAP,
        SESSION_NEWS,
        SESSION_SMTP,
        SESSION_IMAP,
        SESSION_NEWS,
        SESSION_SMTP,

-       SESSION_POP3,
+       SESSION_POP3

 } SessionType;
 
 typedef enum {
 } SessionType;
 
 typedef enum {

diff --git a/src/common/socket.c b/src/common/socket.c
index 4d56e5cf516b8c76c576c2e90baa3378cc1d9206..918ab1826457cb60f2b55d1d0409df4aa4ea74fc 100644 (file)
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -671,7 +671,6 @@ SockInfo *sock_connect(const gchar *hostname, gushort port)
 #else
        gint sock;
 #endif
 #else
        gint sock;
 #endif

-       SockInfo *sockinfo;

 
 #ifdef INET6
        if ((sock = sock_connect_by_getaddrinfo(hostname, port)) < 0)
 
 #ifdef INET6
        if ((sock = sock_connect_by_getaddrinfo(hostname, port)) < 0)

diff --git a/src/common/socket.h b/src/common/socket.h
index d7ffa2232e4747d2570c96706b2503e411f64966..75136fd159ec39e521607fee90173701920ddb22 100644 (file)
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -42,7 +42,7 @@ typedef enum
        CONN_ESTABLISHED,
        CONN_LOOKUPFAILED,
        CONN_FAILED,
        CONN_ESTABLISHED,
        CONN_LOOKUPFAILED,
        CONN_FAILED,

-       CONN_DISCONNECTED,
+       CONN_DISCONNECTED

 } ConnectionState;
 
 typedef gint (*SockConnectFunc)                (SockInfo       *sock,
 } ConnectionState;
 
 typedef gint (*SockConnectFunc)                (SockInfo       *sock,

diff --git a/src/common/template.c b/src/common/template.c
index 7677f764abd07f2884a77e6a79521f1dabc4a913..bbacc49830c2472213ff52bc080965543a916e3b 100644 (file)
--- a/src/common/template.c
+++ b/src/common/template.c
@@ -109,15 +109,16 @@ void template_clear_config(GSList *tmpl_list)
        g_slist_free(tmpl_list);
 }
 
        g_slist_free(tmpl_list);
 }
 

-int tmpl_compare(Template *tmpl1, Template *tmpl2)
+gint tmpl_compare(gconstpointer tmpl1, gconstpointer tmpl2)

 {
 {

-       if (tmpl1 == NULL || tmpl2 == NULL)
+       if ((Template *)tmpl1 == NULL || (Template *)tmpl2 == NULL)

                return 0;
 
                return 0;
 

-       if (tmpl1->name == NULL || tmpl2->name == NULL)
+       if (((Template *)tmpl1)->name == NULL || ((Template *)tmpl2)->name == NULL)

                return 0;
 
                return 0;
 

-       return strcmp(tmpl1->name, tmpl2->name);
+       return (gint) strcmp((char *)((Template *)tmpl1)->name, 
+                            (char *)((Template *)tmpl2)->name);

 }
 
 GSList *template_read_config(void)
 }
 
 GSList *template_read_config(void)

diff --git a/src/folder.h b/src/folder.h
index 297423c82b2af903bfa7f329fe9ae046d9340212..dcd7bfcf78101d468358381fd93e30eca1603ba6 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -95,7 +95,7 @@ typedef enum
        F_MOVE_FAILED_DEST_IS_PARENT = -1,
        F_MOVE_FAILED_DEST_IS_CHILD = -2,
        F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX = -3,
        F_MOVE_FAILED_DEST_IS_PARENT = -1,
        F_MOVE_FAILED_DEST_IS_CHILD = -2,
        F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX = -3,

-       F_MOVE_FAILED = -4,
+       F_MOVE_FAILED = -4

 } FolderItemMoveResult;
 
 typedef enum
 } FolderItemMoveResult;
 
 typedef enum


@@ -104,7 +104,7 @@ typedef enum
        FOLDER_REMOVE_FOLDER            = 1 << 1,
        FOLDER_TREE_CHANGED             = 1 << 2,
        FOLDER_ADD_FOLDERITEM           = 1 << 3,
        FOLDER_REMOVE_FOLDER            = 1 << 1,
        FOLDER_TREE_CHANGED             = 1 << 2,
        FOLDER_ADD_FOLDERITEM           = 1 << 3,

-       FOLDER_REMOVE_FOLDERITEM        = 1 << 4,
+       FOLDER_REMOVE_FOLDERITEM        = 1 << 4

 } FolderUpdateFlags;
 
 typedef enum
 } FolderUpdateFlags;
 
 typedef enum


@@ -113,7 +113,7 @@ typedef enum
        F_ITEM_UPDATE_CONTENT = 1 << 1,
        F_ITEM_UPDATE_ADDMSG = 1 << 2,
        F_ITEM_UPDATE_REMOVEMSG = 1 << 3,
        F_ITEM_UPDATE_CONTENT = 1 << 1,
        F_ITEM_UPDATE_ADDMSG = 1 << 2,
        F_ITEM_UPDATE_REMOVEMSG = 1 << 3,

-       F_ITEM_UPDATE_NAME = 1 << 4,
+       F_ITEM_UPDATE_NAME = 1 << 4

 } FolderItemUpdateFlags;
 
 typedef void (*FolderUIFunc)           (Folder         *folder,
 } FolderItemUpdateFlags;
 
 typedef void (*FolderUIFunc)           (Folder         *folder,

diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index 7144718f845d1ffa4bd88093d00d0b202d0739a3..285059d7bed089d295d2563f685777e1163212d7 100644 (file)
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -437,19 +437,19 @@ GtkAspell *gtkaspell_new(const gchar *dictionary_path,
        return gtkaspell;
 }
 
        return gtkaspell;
 }
 

-void gtkaspell_delete(GtkAspell * gtkaspell) 
+void gtkaspell_delete(GtkAspell *gtkaspell) 

 {
        GtkTextView *gtktext = gtkaspell->gtktext;
        
         g_signal_handlers_disconnect_by_func(G_OBJECT(gtktext),
                                             G_CALLBACK(entry_insert_cb),
 {
        GtkTextView *gtktext = gtkaspell->gtktext;
        
         g_signal_handlers_disconnect_by_func(G_OBJECT(gtktext),
                                             G_CALLBACK(entry_insert_cb),

-                                     gtkaspell);
+                                            gtkaspell);

        g_signal_handlers_disconnect_by_func(G_OBJECT(gtktext),
                                             G_CALLBACK(entry_delete_cb),
        g_signal_handlers_disconnect_by_func(G_OBJECT(gtktext),
                                             G_CALLBACK(entry_delete_cb),

-                                            gtkaspell);
+                                            gtkaspell);

        g_signal_handlers_disconnect_by_func(G_OBJECT(gtktext),
        g_signal_handlers_disconnect_by_func(G_OBJECT(gtktext),

-                                            G_CALLBACK(button_press_intercept_cb),
-                                            gtkaspell);
+                                            G_CALLBACK(button_press_intercept_cb),
+                                            gtkaspell);

 
        gtkaspell_uncheck_all(gtkaspell);
        
 
        gtkaspell_uncheck_all(gtkaspell);
        


@@ -898,7 +898,7 @@ static GList *misspelled_suggest(GtkAspell *gtkaspell, guchar *word)
                elements    = aspell_word_list_elements(suggestions);
                list        = g_list_append(list, g_strdup(word)); 
                
                elements    = aspell_word_list_elements(suggestions);
                list        = g_list_append(list, g_strdup(word)); 
                

-               while (newword = aspell_string_enumeration_next(elements))
+               while ((newword = aspell_string_enumeration_next(elements)) != NULL)

                        list = g_list_append(list, g_strdup(newword));
 
                gtkaspell->max_sug          = g_list_length(list) - 1;
                        list = g_list_append(list, g_strdup(newword));
 
                gtkaspell->max_sug          = g_list_length(list) - 1;

diff --git a/src/gtk/quicksearch.h b/src/gtk/quicksearch.h
index ac27cf3360a1c988869f4eedb15fafbeee577eb1..4fbd5d6be3b3ea27c3d08b7724b50eec716e3d82 100644 (file)
--- a/src/gtk/quicksearch.h
+++ b/src/gtk/quicksearch.h
@@ -25,7 +25,7 @@ typedef enum
        QUICK_SEARCH_SUBJECT,
        QUICK_SEARCH_FROM,
        QUICK_SEARCH_TO,
        QUICK_SEARCH_SUBJECT,
        QUICK_SEARCH_FROM,
        QUICK_SEARCH_TO,

-       QUICK_SEARCH_EXTENDED,
+       QUICK_SEARCH_EXTENDED

 } QuickSearchType;
 
 typedef struct _QuickSearch QuickSearch;
 } QuickSearchType;
 
 typedef struct _QuickSearch QuickSearch;

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 840688655928f9e33550ebad321f0061b8fdbda8..543e6c13c44adcc52b9b0a0fff2abd808ddd4328 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -49,7 +49,7 @@ typedef enum
        M_HIDE_READ_MSG       = 1 << 13,
        M_DELAY_EXEC          = 1 << 14,
        M_NOT_NEWS            = 1 << 15,
        M_HIDE_READ_MSG       = 1 << 13,
        M_DELAY_EXEC          = 1 << 14,
        M_NOT_NEWS            = 1 << 15,

-       M_DELAYED_FLAGS       = 1 << 16,
+       M_DELAYED_FLAGS       = 1 << 16

 } SensitiveCond;
 
 typedef enum
 } SensitiveCond;
 
 typedef enum

diff --git a/src/mh.c b/src/mh.c
index 0010a419e42f1dcf65c104d76404189c594ab033..e56b9dd3e9bca2a8a4111ae033816481b63e64e8 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -189,16 +189,16 @@ gboolean mh_scan_required(Folder *folder, FolderItem *item)
                (s.st_mtime - 3600 != item->mtime)) {
                debug_print("MH scan required, folder updated: %s (%ld > %ld)\n",
                            path,
                (s.st_mtime - 3600 != item->mtime)) {
                debug_print("MH scan required, folder updated: %s (%ld > %ld)\n",
                            path,

-                           s.st_mtime,
-                           item->mtime);
+                           (long int) s.st_mtime,
+                           (long int) item->mtime);

                g_free(path);
                return TRUE;
        }
 
        debug_print("MH scan not required: %s (%ld <= %ld)\n",
                    path,
                g_free(path);
                return TRUE;
        }
 
        debug_print("MH scan not required: %s (%ld <= %ld)\n",
                    path,

-                   s.st_mtime,
-                   item->mtime);
+                   (long int) s.st_mtime,
+                   (long int) item->mtime);

        g_free(path);
        return FALSE;
 }
        g_free(path);
        return FALSE;
 }

diff --git a/src/mimeview.h b/src/mimeview.h
index 09b47d853f828a069ddcc23c47a151d86878fb59..7d61071ca5ef4a6a18111bfac03a7092c63307c0 100644 (file)
--- a/src/mimeview.h
+++ b/src/mimeview.h
@@ -38,7 +38,7 @@ typedef struct _MimeViewer            MimeViewer;
 typedef enum
 {
        MIMEVIEW_TEXT,
 typedef enum
 {
        MIMEVIEW_TEXT,

-       MIMEVIEW_VIEWER,
+       MIMEVIEW_VIEWER

 } MimeViewType;
 
 struct _MimeView
 } MimeViewType;
 
 struct _MimeView

diff --git a/src/partial_download.c b/src/partial_download.c
index be206d6ff4669eeb223f75aadf9f6cc30329c2c2..23ee519e104033168ce965b83b0281b2e0a355e9 100644 (file)
--- a/src/partial_download.c
+++ b/src/partial_download.c
@@ -108,7 +108,8 @@ int partial_msg_in_uidl_list(MsgInfo *msginfo)
                recv_time = RECV_TIME_NONE;
                partial_recv = POP3_TOTALLY_RECEIVED;
                
                recv_time = RECV_TIME_NONE;
                partial_recv = POP3_TOTALLY_RECEIVED;
                

-               if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, tmp) < 2) {
+               if (sscanf(buf, "%s\t%ld\t%s", uidl, (long int *) &recv_time, 
+                          tmp) < 2) {

                        if (sscanf(buf, "%s", uidl) != 1)
                                continue;
                        else {
                        if (sscanf(buf, "%s", uidl) != 1)
                                continue;
                        else {


@@ -197,7 +198,7 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
                sprintf(partial_recv,"0");
                
                if (sscanf(buf, "%s\t%ld\t%s", 
                sprintf(partial_recv,"0");
                
                if (sscanf(buf, "%s\t%ld\t%s", 

-                          uidl, &recv_time, partial_recv) < 2) {
+                          uidl, (long int *) &recv_time, partial_recv) < 2) {

                        if (sscanf(buf, "%s", uidl) != 1)
                                continue;
                        else {
                        if (sscanf(buf, "%s", uidl) != 1)
                                continue;
                        else {


@@ -206,7 +207,7 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
                }
                if (strcmp(tinfo->partial_recv, uidl)) {
                        fprintf(fpnew, "%s\t%ld\t%s\n", 
                }
                if (strcmp(tinfo->partial_recv, uidl)) {
                        fprintf(fpnew, "%s\t%ld\t%s\n", 

-                               uidl, recv_time, partial_recv);
+                               uidl, (long int) recv_time, partial_recv);

                } else {
                        gchar *stat = NULL;
                        if (download == POP3_PARTIAL_DLOAD_DLOAD) {
                } else {
                        gchar *stat = NULL;
                        if (download == POP3_PARTIAL_DLOAD_DLOAD) {


@@ -222,7 +223,7 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
                                stat = g_strdup("0");
                        
                        fprintf(fpnew, "%s\t%ld\t%s\n", 
                                stat = g_strdup("0");
                        
                        fprintf(fpnew, "%s\t%ld\t%s\n", 

-                               uidl, recv_time, stat);
+                               uidl, (long int) recv_time, stat);

                        g_free(stat);
                }
        }
                        g_free(stat);
                }
        }


@@ -365,7 +366,8 @@ gchar *partial_get_filename(const gchar *server, const gchar *login,
                recv_time = RECV_TIME_NONE;
                partial_recv = POP3_TOTALLY_RECEIVED;
                
                recv_time = RECV_TIME_NONE;
                partial_recv = POP3_TOTALLY_RECEIVED;
                

-               if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, tmp) < 2) {
+               if (sscanf(buf, "%s\t%ld\t%s", uidl, (long int *) &recv_time, 
+                          tmp) < 2) {

                        if (sscanf(buf, "%s", uidl) != 1)
                                continue;
                        else {
                        if (sscanf(buf, "%s", uidl) != 1)
                                continue;
                        else {

diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index 913b0ba7d97e5f56b67634435308246228b8c6fb..bb0139fdf9acbd9c1f4b583bf067d1f53f993435 100644 (file)
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -320,7 +320,7 @@ gpgmegtk_passphrase_cb(void *opaque, const char *uid_hint,
 
 void gpgmegtk_free_passphrase()
 {
 
 void gpgmegtk_free_passphrase()
 {

-    (void)free_passphrase(NULL); // could be inline
+    (void)free_passphrase(NULL); /* could be inline */

 }
 
 #endif /* USE_GPGME */
 }
 
 #endif /* USE_GPGME */

diff --git a/src/plugins/pgpcore/prefs_gpg.h b/src/plugins/pgpcore/prefs_gpg.h
index c9ad350a5fa8c7956bd96242eec1624fc51fc176..78c88e2a74f3f185f5298ffdb1df6a41f898e293 100644 (file)
--- a/src/plugins/pgpcore/prefs_gpg.h
+++ b/src/plugins/pgpcore/prefs_gpg.h
@@ -23,7 +23,7 @@ typedef struct GPGAccountConfig GPGAccountConfig;
 typedef enum {
        SIGN_KEY_DEFAULT,
        SIGN_KEY_BY_FROM,
 typedef enum {
        SIGN_KEY_DEFAULT,
        SIGN_KEY_BY_FROM,

-       SIGN_KEY_CUSTOM,
+       SIGN_KEY_CUSTOM

 } SignKeyType;
 
 #include "prefs_account.h"
 } SignKeyType;
 
 #include "prefs_account.h"

diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index 4b055552769ddcf237fb57081a1d152d1221bd0a..254ed080cee5443efafee582a737257db390ac9e 100644 (file)
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -171,7 +171,7 @@ set_row (GtkCList *clist, gpgme_key_t key)
     const char *text[N_COL_TITLES];
     char *algo_buf;
     int row;
     const char *text[N_COL_TITLES];
     char *algo_buf;
     int row;

-    gssize by_read = 0, by_written = 0;
+    gsize by_read = 0, by_written = 0;

     gchar *ret_str;
 
     /* first check whether the key is capable of encryption which is not
     gchar *ret_str;
 
     /* first check whether the key is capable of encryption which is not

diff --git a/src/plugins/pgpcore/select-keys.h b/src/plugins/pgpcore/select-keys.h
index 307b4633e485772c7d6b19d74b72a55e1c10cf3f..239bfa9ee03b9abb66ac6b9e556d2523998bd78c 100644 (file)
--- a/src/plugins/pgpcore/select-keys.h
+++ b/src/plugins/pgpcore/select-keys.h
@@ -25,7 +25,7 @@
 typedef enum {
        KEY_SELECTION_OK,
        KEY_SELECTION_CANCEL,
 typedef enum {
        KEY_SELECTION_OK,
        KEY_SELECTION_CANCEL,

-       KEY_SELECTION_DONT,
+       KEY_SELECTION_DONT

 } SelectionResult;
        
 gpgme_key_t *gpgmegtk_recipient_selection (GSList *recp_names, SelectionResult *result);
 } SelectionResult;
        
 gpgme_key_t *gpgmegtk_recipient_selection (GSList *recp_names, SelectionResult *result);

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 6cfe3ced16b1f1ff6b73eb1f04880359145fdbc3..228aa5772f1231572e1c6e5b1bd9a01b86256f4c 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -119,7 +119,6 @@ static const gchar *get_validity_str(unsigned long validity)
 gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
 {
        gpgme_signature_t sig = NULL;
 gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
 {
        gpgme_signature_t sig = NULL;

-       gpgme_user_id_t user = NULL;

        gchar *uname = NULL;
        gpgme_key_t key;
 
        gchar *uname = NULL;
        gpgme_key_t key;
 


@@ -247,10 +246,10 @@ gpgme_data_t sgpgme_data_from_mimeinfo(MimeInfo *mimeinfo)
        g_unlink(tmp_file);
        g_free(tmp_file);
 
        g_unlink(tmp_file);
        g_free(tmp_file);
 

-       debug_print("data %p (%d %d)\n", data, mimeinfo->offset, mimeinfo->length);
+       debug_print("data %p (%d %d)\n", (void *)&data, mimeinfo->offset, mimeinfo->length);

        if (err) {
                debug_print ("gpgme_data_new_from_file failed: %s\n",
        if (err) {
                debug_print ("gpgme_data_new_from_file failed: %s\n",

-                   gpgme_strerror (err));
+                            gpgme_strerror (err));

                return NULL;
        }
        return data;
                return NULL;
        }
        return data;

diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c
index ed3893ba8f047202d4d96cf35539aaaa7cf6bd03..81e29c3564f85f56f5b2c5c132826e662409b667 100644 (file)
--- a/src/plugins/pgpinline/pgpinline.c
+++ b/src/plugins/pgpinline/pgpinline.c
@@ -262,7 +262,7 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
        PrivacyDataPGP *data = NULL;
        gpgme_ctx_t ctx;
        gchar *chars;
        PrivacyDataPGP *data = NULL;
        gpgme_ctx_t ctx;
        gchar *chars;

-       int len;
+       size_t len;

        
        if (gpgme_new(&ctx) != GPG_ERR_NO_ERROR)
                return NULL;
        
        if (gpgme_new(&ctx) != GPG_ERR_NO_ERROR)
                return NULL;

diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
index 49e480bf61c1d2e5fefa7d7b923998ac5763c8d8..158a41534cd8b44bf99023e43e127b00c60ab764 100644 (file)
--- a/src/plugins/pgpmime/pgpmime.c
+++ b/src/plugins/pgpmime/pgpmime.c
@@ -280,7 +280,7 @@ static MimeInfo *pgpmime_decrypt(MimeInfo *mimeinfo)
        PrivacyDataPGP *data = NULL;
        gpgme_ctx_t ctx;
        gchar *chars;
        PrivacyDataPGP *data = NULL;
        gpgme_ctx_t ctx;
        gchar *chars;

-       int len;
+       size_t len;

 
        if (gpgme_new(&ctx) != GPG_ERR_NO_ERROR)
                return NULL;
 
        if (gpgme_new(&ctx) != GPG_ERR_NO_ERROR)
                return NULL;

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index 14c4a0ccfa5ed308a09e443b40dcc9d95ea26f85..d42634f18c17a6df58f4dbede7e5dca18275593f 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -76,7 +76,7 @@ typedef enum
        TRAYICON_NEWMARKED,
        TRAYICON_UNREAD,
        TRAYICON_UNREADMARKED,
        TRAYICON_NEWMARKED,
        TRAYICON_UNREAD,
        TRAYICON_UNREADMARKED,

-       TRAYICON_NOTHING,
+       TRAYICON_NOTHING

 } TrayIconType;
 
 static void trayicon_get_cb        (gpointer data, guint action, GtkWidget *widget);
 } TrayIconType;
 
 static void trayicon_get_cb        (gpointer data, guint action, GtkWidget *widget);


@@ -136,7 +136,7 @@ static void set_trayicon_pixmap(TrayIconType icontype)
 
 static void update(void)
 {
 
 static void update(void)
 {

-       gint new, unread, unreadmarked, marked, total;
+       guint new, unread, unreadmarked, marked, total;

        gchar *buf;
        TrayIconType icontype = TRAYICON_NOTHING;
 
        gchar *buf;
        TrayIconType icontype = TRAYICON_NOTHING;
 

diff --git a/src/pop.c b/src/pop.c
index 0b71afdd64f47bf1c60e22c10d1a70c34ea39538..a55a8ce1d7be0c336c1bccebce3904b930460244 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -599,8 +599,8 @@ void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session)
                recv_time = RECV_TIME_NONE;
                partial_recv = POP3_TOTALLY_RECEIVED;
                
                recv_time = RECV_TIME_NONE;
                partial_recv = POP3_TOTALLY_RECEIVED;
                

-               if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, tmp) < 3) {
-                       if (sscanf(buf, "%s\t%ld", uidl, &recv_time) != 2) {
+               if (sscanf(buf, "%s\t%ld\t%s", uidl, (long int *) &recv_time, tmp) < 3) {
+                       if (sscanf(buf, "%s\t%ld", uidl, (long int *) &recv_time) != 2) {

                                if (sscanf(buf, "%s", uidl) != 1)
                                        continue;
                                else {
                                if (sscanf(buf, "%s", uidl) != 1)
                                        continue;
                                else {


@@ -663,7 +663,7 @@ gint pop3_write_uidl_list(Pop3Session *session)
                if (msg->uidl && msg->received &&
                    (!msg->deleted || session->state != POP3_DONE))
                        fprintf(fp, "%s\t%ld\t%d\n", 
                if (msg->uidl && msg->received &&
                    (!msg->deleted || session->state != POP3_DONE))
                        fprintf(fp, "%s\t%ld\t%d\n", 

-                               msg->uidl, msg->recv_time, msg->partial_recv);
+                               msg->uidl, (long int) msg->recv_time, msg->partial_recv);

        }
 
        if (fclose(fp) == EOF) FILE_OP_ERROR(path, "fclose");
        }
 
        if (fclose(fp) == EOF) FILE_OP_ERROR(path, "fclose");

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 6ddf366d579a59870b9d2f122ec7fc0d2b4db66d..de3ddb305863549808135903cfa6cc2f4fff74b9 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -875,7 +875,7 @@ void prefs_account_set_privacy_prefs(PrefsAccount *account, gchar *id, gchar *ne
 {
        gchar *orig_key = NULL, *value;
 
 {
        gchar *orig_key = NULL, *value;
 

-       if (g_hash_table_lookup_extended(account->privacy_prefs, id, (gpointer *) &orig_key, (gpointer *) &value)) {
+       if (g_hash_table_lookup_extended(account->privacy_prefs, id, (gpointer *)(gchar *) &orig_key, (gpointer *)(gchar *) &value)) {

                g_hash_table_remove(account->privacy_prefs, id);
 
                g_free(orig_key);
                g_hash_table_remove(account->privacy_prefs, id);
 
                g_free(orig_key);

diff --git a/src/prefs_account.h b/src/prefs_account.h
index dea35af005edebc9d2b4ecaaf198c2b0f78d7240..ece169258b1809df1c18a4e3d4d9d15137a8b9d7 100644 (file)
--- a/src/prefs_account.h
+++ b/src/prefs_account.h
@@ -33,7 +33,7 @@ typedef enum {
        A_IMAP4,
        A_NNTP,
        A_LOCAL,
        A_IMAP4,
        A_NNTP,
        A_LOCAL,

-       A_NONE,         /* SMTP only */
+       A_NONE          /* SMTP only */

 } RecvProtocol;
 
 typedef enum {
 } RecvProtocol;
 
 typedef enum {

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index a246a131cb89986644fe24990dcfaaccc57676f1..dbba7e8d6155115bafbdf359f91b56cf5dc052ac 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -601,13 +601,13 @@ static void prefs_actions_up(GtkWidget *w, gpointer data)
 {
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;
 {
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;

-       GtkListStore *store;
+       GtkListStore *store = NULL;

        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(actions.actions_list_view)),
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(actions.actions_list_view)),

-                (GtkTreeModel **) &store,      
+                (GtkTreeModel **)(GtkListStore *) store,       

                 &isel))
                return;
 
                 &isel))
                return;
 


@@ -643,14 +643,14 @@ static void prefs_actions_up(GtkWidget *w, gpointer data)
 
 static void prefs_actions_down(GtkWidget *w, gpointer data)
 {
 
 static void prefs_actions_down(GtkWidget *w, gpointer data)
 {

-       GtkListStore *store;
+       GtkListStore *store = NULL;

        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(actions.actions_list_view)),
        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(actions.actions_list_view)),

-                (GtkTreeModel **) &store,
+                (GtkTreeModel **)(GtkListStore *) store,

                 &sel))
                return;
 
                 &sel))
                return;
 

diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index dc4d7138d1f21a0bddd1fd1157178bd41071869b..8328e4c940d9383afdda757f2b7fbe178c851d2f 100644 (file)
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -561,13 +561,13 @@ static void prefs_custom_header_up(void)
 {
        GtkTreePath *prev, *sel;
        GtkTreeIter isel;
 {
        GtkTreePath *prev, *sel;
        GtkTreeIter isel;

-       GtkListStore *store;
+       GtkListStore *store = NULL;

        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(customhdr.list_view)),
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(customhdr.list_view)),

-                (GtkTreeModel **) &store,
+                (GtkTreeModel **)(GtkListStore *) store,

                 &isel))
                return;
 
                 &isel))
                return;
 


@@ -594,13 +594,13 @@ static void prefs_custom_header_up(void)
 
 static void prefs_custom_header_down(void)
 {
 
 static void prefs_custom_header_down(void)
 {

-       GtkListStore *store;
+       GtkListStore *store = NULL;

        GtkTreeIter next, sel;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(customhdr.list_view)),
        GtkTreeIter next, sel;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(customhdr.list_view)),

-                (GtkTreeModel **) &store,
+                (GtkTreeModel **)(GtkListStore *) store,

                 &sel))
                return;
 
                 &sel))
                return;
 

diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index e2a94a808bcf36bb0b5231241fe2924897b1b611..f1eb2976bf9b8feaa35c23777757bcbc70949a85 100644 (file)
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -614,13 +614,13 @@ static void prefs_display_header_up(void)
 {
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;
 {
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;

-       GtkListStore *store;
+       GtkListStore *store = NULL;

        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(dispheader.headers_list_view)),
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(dispheader.headers_list_view)),

-                (GtkTreeModel **) &store,      
+                (GtkTreeModel **)(GtkListStore *) store,       

                 &isel))
                return;
 
                 &isel))
                return;
 


@@ -647,14 +647,14 @@ static void prefs_display_header_up(void)
 
 static void prefs_display_header_down(void)
 {
 
 static void prefs_display_header_down(void)
 {

-       GtkListStore *store;
+       GtkListStore *store = NULL;

        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(dispheader.headers_list_view)),
        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(dispheader.headers_list_view)),

-                (GtkTreeModel **) &store,
+                (GtkTreeModel **)(GtkListStore *) store,

                 &sel))
                return;
 
                 &sel))
                return;
 

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 80b8413ff3b29869ab5a2b02de75321af9e41da9..e307421bc19047fe8f818bff81142f322dfe5af5 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -898,13 +898,13 @@ static void prefs_filtering_action_up(void)
 {
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;
 {
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;

-       GtkListStore *store;
+       GtkListStore *store = NULL;

        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(filtering_action.action_list_view)),
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(filtering_action.action_list_view)),

-                (GtkTreeModel **) &store,      
+                (GtkTreeModel **)(GtkListStore *) store,       

                 &isel))
                return;
 
                 &isel))
                return;
 


@@ -939,14 +939,14 @@ static void prefs_filtering_action_up(void)
  */
 static void prefs_filtering_action_down(void)
 {
  */
 static void prefs_filtering_action_down(void)
 {

-       GtkListStore *store;
+       GtkListStore *store = NULL;

        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(filtering_action.action_list_view)),
        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(filtering_action.action_list_view)),

-                (GtkTreeModel **) &store,
+                (GtkTreeModel **)(GtkListStore *) store,

                 &sel))
                return;
 
                 &sel))
                return;
 

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 86453025e3608c0f8d448c93f30e2fe4719a2190..e1da458a9bf8d282c8a898fc6b349e5ae7394ace 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -1288,13 +1288,13 @@ static void prefs_matcher_up(void)
 {
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;
 {
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;

-       GtkListStore *store;
+       GtkListStore *store = NULL;

        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(matcher.cond_list_view)),
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(matcher.cond_list_view)),

-                (GtkTreeModel **) &store,      
+                (GtkTreeModel **)(GtkListStore *) store,       

                 &isel))
                return;
 
                 &isel))
                return;
 


@@ -1329,14 +1329,14 @@ static void prefs_matcher_up(void)
  */
 static void prefs_matcher_down(void)
 {
  */
 static void prefs_matcher_down(void)
 {

-       GtkListStore *store;
+       GtkListStore *store = NULL;

        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(matcher.cond_list_view)),
        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(matcher.cond_list_view)),

-                (GtkTreeModel **) &store,
+                (GtkTreeModel **)(GtkListStore *) store,

                 &sel))
                return;
 
                 &sel))
                return;
 

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index d2269e90dd12b855fc16866a544cb5e26edb5741..e8028ff0a0cf9e45b21070f944e64046f642af30 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -574,13 +574,13 @@ static void prefs_toolbar_up(GtkButton *button, ToolbarPage *prefs_toolbar)
 {
        GtkTreePath *prev, *sel;
        GtkTreeIter isel;
 {
        GtkTreePath *prev, *sel;
        GtkTreeIter isel;

-       GtkListStore *store;
+       GtkListStore *store = NULL;

        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(prefs_toolbar->list_view_set)),
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(prefs_toolbar->list_view_set)),

-                (GtkTreeModel **) &store,      
+                (GtkTreeModel **)(GtkListStore *) store,       

                 &isel))
                return;
 
                 &isel))
                return;
 


@@ -606,13 +606,13 @@ static void prefs_toolbar_up(GtkButton *button, ToolbarPage *prefs_toolbar)
 
 static void prefs_toolbar_down(GtkButton *button, ToolbarPage *prefs_toolbar)
 {
 
 static void prefs_toolbar_down(GtkButton *button, ToolbarPage *prefs_toolbar)
 {

-       GtkListStore *store;
+       GtkListStore *store = NULL;

        GtkTreeIter next, sel;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(prefs_toolbar->list_view_set)),
        GtkTreeIter next, sel;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(prefs_toolbar->list_view_set)),

-                (GtkTreeModel **) &store,
+                (GtkTreeModel **)(GtkListStore *) store,

                 &sel))
                return;
 
                 &sel))
                return;
 

diff --git a/src/privacy.h b/src/privacy.h
index 90c3c7b6ad8a53d846d847202134a95a17926086..08bebf49a5efdee7f32672b275699e84136bbfd8 100644 (file)
--- a/src/privacy.h
+++ b/src/privacy.h
@@ -28,7 +28,7 @@ typedef enum {
        SIGNATURE_OK,
        SIGNATURE_WARN,
        SIGNATURE_INVALID,
        SIGNATURE_OK,
        SIGNATURE_WARN,
        SIGNATURE_INVALID,

-       SIGNATURE_CHECK_FAILED,
+       SIGNATURE_CHECK_FAILED

 } SignatureStatus;
 
 #include <glib.h>
 } SignatureStatus;
 
 #include <glib.h>

diff --git a/src/procmime.c b/src/procmime.c
index ab0d11bb3eaefc0771c6a7dfbd5948b6c0b43016..d01dd2433d5f963e4758aca5cd6eb9dacad51b5c 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1571,7 +1571,8 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
                gchar *charset, *lang, *oldvalue, *newvalue;
 
                attribute = (gchar *) cur->data;
                gchar *charset, *lang, *oldvalue, *newvalue;
 
                attribute = (gchar *) cur->data;

-               if (!g_hash_table_lookup_extended(table, attribute, (gpointer *) &key, (gpointer *) &value))
+               if (!g_hash_table_lookup_extended(
+                       table, attribute, (gpointer *)(gchar *) &key, (gpointer *)(gchar *) &value))

                        continue;
 
                charset = value;
                        continue;
 
                charset = value;

diff --git a/src/procmime.h b/src/procmime.h
index c0e56e0cb519af5691fa91a614482dd31c06d95a..7bbbe296db0b04059b61b0a5f503433ed9c55f33 100644 (file)
--- a/src/procmime.h
+++ b/src/procmime.h
@@ -50,21 +50,21 @@ typedef enum
        MIMETYPE_APPLICATION,
        MIMETYPE_MESSAGE,
        MIMETYPE_MULTIPART,
        MIMETYPE_APPLICATION,
        MIMETYPE_MESSAGE,
        MIMETYPE_MULTIPART,

-       MIMETYPE_UNKNOWN,
+       MIMETYPE_UNKNOWN

 } MimeMediaType;
 
 typedef enum
 {
        DISPOSITIONTYPE_INLINE,
        DISPOSITIONTYPE_ATTACHMENT,
 } MimeMediaType;
 
 typedef enum
 {
        DISPOSITIONTYPE_INLINE,
        DISPOSITIONTYPE_ATTACHMENT,

-       DISPOSITIONTYPE_UNKNOWN,
+       DISPOSITIONTYPE_UNKNOWN

 } DispositionType;
 
 typedef enum
 {
        MIMECONTENT_EMPTY,
        MIMECONTENT_FILE,               /* the file contains all content including sub parts */
 } DispositionType;
 
 typedef enum
 {
        MIMECONTENT_EMPTY,
        MIMECONTENT_FILE,               /* the file contains all content including sub parts */

-       MIMECONTENT_MEM,
+       MIMECONTENT_MEM

 } MimeContent;
 
 #include <glib.h>
 } MimeContent;
 
 #include <glib.h>

diff --git a/src/procmsg.h b/src/procmsg.h
index bd89894c43f378c1c8b006458b7076c0acff814b..671f7181e7a67d1ae4ae8c839bbe80e7258c28ba 100644 (file)
--- a/src/procmsg.h
+++ b/src/procmsg.h
@@ -151,7 +151,7 @@ typedef guint32 MsgTmpFlags;
 
 typedef enum {
        MSGINFO_UPDATE_FLAGS = 1 << 0,
 
 typedef enum {
        MSGINFO_UPDATE_FLAGS = 1 << 0,

-       MSGINFO_UPDATE_DELETED = 1 << 1,
+       MSGINFO_UPDATE_DELETED = 1 << 1

 } MsgInfoUpdateFlags;
 
 #include "procmime.h"
 } MsgInfoUpdateFlags;
 
 #include "procmime.h"

diff --git a/src/textview.c b/src/textview.c
index 2a3df05aa144b5fa35be4663e4260e6585885fbe..c5a512baa57e3fd3170358e81b469667b6347280 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -738,7 +738,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
                charset = textview->messageview->forced_charset;
        else
                charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
                charset = textview->messageview->forced_charset;
        else
                charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");

-
+printf("charset %s\n", charset);

        textview_set_font(textview, charset);
 
        conv = conv_code_converter_new(charset);
        textview_set_font(textview, charset);
 
        conv = conv_code_converter_new(charset);

diff --git a/src/undo.h b/src/undo.h
index 5f50c8b6e7e57135d6645e592800c4e282041c51..dd00ca15f9dd1d87d750a9e6b9e41a5b7354c968 100644 (file)
--- a/src/undo.h
+++ b/src/undo.h
@@ -31,7 +31,7 @@ typedef enum
        UNDO_ACTION_INSERT,
        UNDO_ACTION_DELETE,
        UNDO_ACTION_REPLACE_INSERT,
        UNDO_ACTION_INSERT,
        UNDO_ACTION_DELETE,
        UNDO_ACTION_REPLACE_INSERT,

-       UNDO_ACTION_REPLACE_DELETE,
+       UNDO_ACTION_REPLACE_DELETE

 } UndoAction;
 
 typedef enum 
 } UndoAction;
 
 typedef enum 


@@ -39,7 +39,7 @@ typedef enum
        UNDO_STATE_TRUE,
        UNDO_STATE_FALSE,
        UNDO_STATE_UNCHANGED,
        UNDO_STATE_TRUE,
        UNDO_STATE_FALSE,
        UNDO_STATE_UNCHANGED,

-       UNDO_STATE_REFRESH,
+       UNDO_STATE_REFRESH

 } UndoState;
 
 typedef struct _UndoMain UndoMain;
 } UndoState;
 
 typedef struct _UndoMain UndoMain;