2007-10-15 [colin] 3.0.2cvs76

	* src/edittags.c
	* src/edittags.h
	* src/filtering.c
	* src/filtering.h
	* src/importmutt.c
	* src/importpine.c
	* src/main.c
	* src/messageview.c
	* src/messageview.h
	* src/mimeview.c
	* src/mimeview.h
	* src/pop.c
	* src/pop.h
	* src/prefs_common.c
	* src/prefs_common.h
	* src/prefs_customheader.c
	* src/prefs_customheader.h
	* src/prefs_display_header.c
	* src/prefs_display_header.h
	* src/prefs_filtering_action.c
	* src/prefs_filtering_action.h
	* src/prefs_folder_column.c
	* src/prefs_folder_column.h
	* src/prefs_folder_item.c
	* src/prefs_folder_item.h
	* src/prefs_gtk.c
	* src/prefs_gtk.h
	* src/prefs_logging.h
	* src/prefs_matcher.c
	* src/prefs_matcher.h
	* src/prefs_summary_column.c
	* src/prefs_summary_column.h
	* src/prefs_summary_open.c
	* src/procheader.c
	* src/procheader.h
	* src/procmime.c
	* src/procmime.h
	* src/recv.c
	* src/recv.h
	* src/sourcewindow.c
	* src/sourcewindow.h
	* src/summaryview.c
	* src/summaryview.h
	* src/textview.c
	* src/textview.h
	* src/toolbar.c
	* src/toolbar.h
	* src/common/mgutils.c
	* src/common/mgutils.h
	* src/common/nntp.c
	* src/common/nntp.h
	* src/common/prefs.c
	* src/common/prefs.h
	* src/common/socket.c
	* src/common/socket.h
	* src/common/stringtable.c
	* src/common/stringtable.h
	* src/common/template.c
	* src/common/template.h
	* src/common/uuencode.c
	* src/common/uuencode.h
	* src/gtk/gtkshruler.c
	* src/gtk/gtkshruler.h
	* src/gtk/menu.c
	* src/gtk/menu.h
	* src/gtk/progressdialog.c
	* src/gtk/progressdialog.h
		Remove/staticalize, the return of the revenge

diff --git a/ChangeLog b/ChangeLog
index 00097d008364873861f65ace0c1000c532d40e96..8858a778edfe39965f158a5769b066b03af7edcb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,74 @@
+2007-10-15 [colin]     3.0.2cvs76
+
+       * src/edittags.c
+       * src/edittags.h
+       * src/filtering.c
+       * src/filtering.h
+       * src/importmutt.c
+       * src/importpine.c
+       * src/main.c
+       * src/messageview.c
+       * src/messageview.h
+       * src/mimeview.c
+       * src/mimeview.h
+       * src/pop.c
+       * src/pop.h
+       * src/prefs_common.c
+       * src/prefs_common.h
+       * src/prefs_customheader.c
+       * src/prefs_customheader.h
+       * src/prefs_display_header.c
+       * src/prefs_display_header.h
+       * src/prefs_filtering_action.c
+       * src/prefs_filtering_action.h
+       * src/prefs_folder_column.c
+       * src/prefs_folder_column.h
+       * src/prefs_folder_item.c
+       * src/prefs_folder_item.h
+       * src/prefs_gtk.c
+       * src/prefs_gtk.h
+       * src/prefs_logging.h
+       * src/prefs_matcher.c
+       * src/prefs_matcher.h
+       * src/prefs_summary_column.c
+       * src/prefs_summary_column.h
+       * src/prefs_summary_open.c
+       * src/procheader.c
+       * src/procheader.h
+       * src/procmime.c
+       * src/procmime.h
+       * src/recv.c
+       * src/recv.h
+       * src/sourcewindow.c
+       * src/sourcewindow.h
+       * src/summaryview.c
+       * src/summaryview.h
+       * src/textview.c
+       * src/textview.h
+       * src/toolbar.c
+       * src/toolbar.h
+       * src/common/mgutils.c
+       * src/common/mgutils.h
+       * src/common/nntp.c
+       * src/common/nntp.h
+       * src/common/prefs.c
+       * src/common/prefs.h
+       * src/common/socket.c
+       * src/common/socket.h
+       * src/common/stringtable.c
+       * src/common/stringtable.h
+       * src/common/template.c
+       * src/common/template.h
+       * src/common/uuencode.c
+       * src/common/uuencode.h
+       * src/gtk/gtkshruler.c
+       * src/gtk/gtkshruler.h
+       * src/gtk/menu.c
+       * src/gtk/menu.h
+       * src/gtk/progressdialog.c
+       * src/gtk/progressdialog.h
+               Remove/staticalize, the return of the revenge
+

 2007-10-15 [colin]     3.0.2cvs75
 
        * src/matcher.c
 2007-10-15 [colin]     3.0.2cvs75
 
        * src/matcher.c

diff --git a/PATCHSETS b/PATCHSETS
index b59c3bb026b8eb84c8ccc3e0f2642c703c71f49d..95e7f59c59dfa08d0165d49a689afbc5597b2b9f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2988,3 +2988,4 @@
 ( cvs diff -u -r 1.179.2.192 -r 1.179.2.193 src/imap.c;  cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/common/md5.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/common/md5.h;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/manage_window.c;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/manage_window.h;  ) > 3.0.2cvs73.patchset
 ( cvs diff -u -r 1.179.2.193 -r 1.179.2.194 src/imap.c;  ) > 3.0.2cvs74.patchset
 ( cvs diff -u -r 1.75.2.50 -r 1.75.2.51 src/matcher.c;  ) > 3.0.2cvs75.patchset
 ( cvs diff -u -r 1.179.2.192 -r 1.179.2.193 src/imap.c;  cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/common/md5.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/common/md5.h;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/manage_window.c;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/manage_window.h;  ) > 3.0.2cvs73.patchset
 ( cvs diff -u -r 1.179.2.193 -r 1.179.2.194 src/imap.c;  ) > 3.0.2cvs74.patchset
 ( cvs diff -u -r 1.75.2.50 -r 1.75.2.51 src/matcher.c;  ) > 3.0.2cvs75.patchset

+( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/edittags.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/edittags.h;  cvs diff -u -r 1.60.2.39 -r 1.60.2.40 src/filtering.c;  cvs diff -u -r 1.21.2.15 -r 1.21.2.16 src/filtering.h;  cvs diff -u -r 1.4.12.17 -r 1.4.12.18 src/importmutt.c;  cvs diff -u -r 1.1.14.17 -r 1.1.14.18 src/importpine.c;  cvs diff -u -r 1.115.2.172 -r 1.115.2.173 src/main.c;  cvs diff -u -r 1.94.2.161 -r 1.94.2.162 src/messageview.c;  cvs diff -u -r 1.19.2.17 -r 1.19.2.18 src/messageview.h;  cvs diff -u -r 1.83.2.119 -r 1.83.2.120 src/mimeview.c;  cvs diff -u -r 1.20.2.22 -r 1.20.2.23 src/mimeview.h;  cvs diff -u -r 1.56.2.58 -r 1.56.2.59 src/pop.c;  cvs diff -u -r 1.17.2.19 -r 1.17.2.20 src/pop.h;  cvs diff -u -r 1.204.2.149 -r 1.204.2.150 src/prefs_common.c;  cvs diff -u -r 1.103.2.95 -r 1.103.2.96 src/prefs_common.h;  cvs diff -u -r 1.16.2.29 -r 1.16.2.30 src/prefs_customheader.c;  cvs diff -u -r 1.2.16.5 -r 1.2.16.6 src/prefs_customheader.h;  cvs diff -u -r 1.16.2.31 -r 1.16.2.32 src/prefs_display_header.c;  cvs diff -u -r 1.1.16.5 -r 1.1.16.6 src/prefs_display_header.h;  cvs diff -u -r 1.1.4.41 -r 1.1.4.42 src/prefs_filtering_action.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/prefs_filtering_action.h;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/prefs_folder_column.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_folder_column.h;  cvs diff -u -r 1.52.2.52 -r 1.52.2.53 src/prefs_folder_item.c;  cvs diff -u -r 1.17.2.5 -r 1.17.2.6 src/prefs_folder_item.h;  cvs diff -u -r 1.10.2.35 -r 1.10.2.36 src/prefs_gtk.c;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/prefs_gtk.h;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_logging.h;  cvs diff -u -r 1.43.2.62 -r 1.43.2.63 src/prefs_matcher.c;  cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/prefs_matcher.h;  cvs diff -u -r 1.10.2.21 -r 1.10.2.22 src/prefs_summary_column.c;  cvs diff -u -r 1.1.16.5 -r 1.1.16.6 src/prefs_summary_column.h;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_summary_open.c;  cvs diff -u -r 1.47.2.45 -r 1.47.2.46 src/procheader.c;  cvs diff -u -r 1.11.2.9 -r 1.11.2.10 src/procheader.h;  cvs diff -u -r 1.49.2.100 -r 1.49.2.101 src/procmime.c;  cvs diff -u -r 1.17.2.20 -r 1.17.2.21 src/procmime.h;  cvs diff -u -r 1.17.2.12 -r 1.17.2.13 src/recv.c;  cvs diff -u -r 1.6.12.6 -r 1.6.12.7 src/recv.h;  cvs diff -u -r 1.9.2.21 -r 1.9.2.22 src/sourcewindow.c;  cvs diff -u -r 1.1.1.1.16.6 -r 1.1.1.1.16.7 src/sourcewindow.h;  cvs diff -u -r 1.395.2.331 -r 1.395.2.332 src/summaryview.c;  cvs diff -u -r 1.68.2.40 -r 1.68.2.41 src/summaryview.h;  cvs diff -u -r 1.96.2.187 -r 1.96.2.188 src/textview.c;  cvs diff -u -r 1.12.2.21 -r 1.12.2.22 src/textview.h;  cvs diff -u -r 1.43.2.89 -r 1.43.2.90 src/toolbar.c;  cvs diff -u -r 1.19.2.24 -r 1.19.2.25 src/toolbar.h;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/common/mgutils.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/mgutils.h;  cvs diff -u -r 1.6.2.14 -r 1.6.2.15 src/common/nntp.c;  cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/common/nntp.h;  cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/common/prefs.c;  cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/common/prefs.h;  cvs diff -u -r 1.13.2.35 -r 1.13.2.36 src/common/socket.c;  cvs diff -u -r 1.13.2.15 -r 1.13.2.16 src/common/socket.h;  cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/common/stringtable.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/stringtable.h;  cvs diff -u -r 1.2.4.22 -r 1.2.4.23 src/common/template.c;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/template.h;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/common/uuencode.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/common/uuencode.h;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/gtkshruler.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/gtkshruler.h;  cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/gtk/menu.c;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/gtk/menu.h;  cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/gtk/progressdialog.c;  cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/gtk/progressdialog.h;  ) > 3.0.2cvs76.patchset

diff --git a/configure.ac b/configure.ac
index 926dac80830b5ca898d7add3c9140272a6b322ba..c6e3fafa5bd3edfcf05ddd96a5615b7e4beec902 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=75
+EXTRA_VERSION=76

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/mgutils.c b/src/common/mgutils.c
index d256ffcc394d9130aa36d25870aaaea21d5baba0..257fe48fe7684b4dff4e72a670081afb4c12f310 100644 (file)
--- a/src/common/mgutils.c
+++ b/src/common/mgutils.c
@@ -342,35 +342,6 @@ gchar *mgu_slist_longest_entry( GSList *list ) {
        return name;
 }      
 
        return name;
 }      
 

-/*
- * Return reference to longest entry in the specified linked list.
- * It is assumed that the list contains only gchar objects.
- * Enter:  list List of gchar strings to examine.
- * Return: Reference to longest entry, or NULL if nothing found.
- */
-gchar *mgu_list_longest_entry( GList *list ) {
-       GList *node;
-       gchar *name = NULL;
-       gint iLen = 0, iLenT = 0;
-
-       node = list;
-       while( node ) {
-               if( name == NULL ) {
-                       name = node->data;
-                       iLen = strlen( name );
-               }
-               else {
-                       iLenT = strlen( node->data );
-                       if( iLenT > iLen ) {
-                               name = node->data;
-                               iLen = iLenT;
-                       }
-               }
-               node = g_list_next( node );
-       }
-       return name;
-}      
-

 /*
  * Test whether string appears in list of strings, ignoring case. NULL or empty
  * strings will be ignored.
 /*
  * Test whether string appears in list of strings, ignoring case. NULL or empty
  * strings will be ignored.

diff --git a/src/common/mgutils.h b/src/common/mgutils.h
index 2dc15444c89a15ceda5950c1141e49ae07343c57..1de337e80e0a62da17a7ce8b3b9f381da795880f 100644 (file)
--- a/src/common/mgutils.h
+++ b/src/common/mgutils.h
@@ -55,7 +55,6 @@ GList *mgu_parse_string               ( gchar *line, const gint maxTokens,
 void mgu_str_unescape          ( gchar *str );
 void mgu_str_ltc2space         ( gchar *str, gchar chlead, gchar chtail );
 gchar *mgu_slist_longest_entry ( GSList *list );
 void mgu_str_unescape          ( gchar *str );
 void mgu_str_ltc2space         ( gchar *str, gchar chlead, gchar chtail );
 gchar *mgu_slist_longest_entry ( GSList *list );

-gchar *mgu_list_longest_entry  ( GList *list );

 gboolean mgu_slist_test_unq_nc ( GSList *list, gchar *str );
 gboolean mgu_list_test_unq_nc  ( GList *list, gchar *str );
 
 gboolean mgu_slist_test_unq_nc ( GSList *list, gchar *str );
 gboolean mgu_list_test_unq_nc  ( GList *list, gchar *str );
 

diff --git a/src/common/nntp.c b/src/common/nntp.c
index d7aa17da55dd419a39a5c37491d3f1f42a0ccf9b..1733efd8a612ee82fb50cd3857487221acb4976e 100644 (file)
--- a/src/common/nntp.c
+++ b/src/common/nntp.c
@@ -210,52 +210,6 @@ gint nntp_get_article(NNTPSession *session, const gchar *cmd, gint num,
        return NN_SUCCESS;
 }
 
        return NN_SUCCESS;
 }
 

-gint nntp_article(NNTPSession *session, gint num, gchar **msgid)
-{
-       return nntp_get_article(session, "ARTICLE", num, msgid);
-}
-
-gint nntp_body(NNTPSession *session, gint num, gchar **msgid)
-{
-       return nntp_get_article(session, "BODY", num, msgid);
-}
-
-gint nntp_head(NNTPSession *session, gint num, gchar **msgid)
-{
-       return nntp_get_article(session, "HEAD", num, msgid);
-}
-
-gint nntp_stat(NNTPSession *session, gint num, gchar **msgid)
-{
-       return nntp_get_article(session, "STAT", num, msgid);
-}
-
-gint nntp_next(NNTPSession *session, gint *num, gchar **msgid)
-{
-       gint ok;
-       gint resp;
-       gchar buf[NNTPBUFSIZE];
-
-       ok = nntp_gen_command(session, buf, "NEXT");
-
-       if (ok != NN_SUCCESS)
-               return ok;
-
-       if (sscanf(buf, "%d %d", &resp, num) != 2) {
-               log_warning(LOG_PROTOCOL, _("protocol error: %s\n"), buf);
-               return NN_PROTOCOL;
-       }
-
-       extract_parenthesis(buf, '<', '>');
-       if (buf[0] == '\0') {
-               log_warning(LOG_PROTOCOL, _("protocol error\n"));
-               return NN_PROTOCOL;
-       }
-       *msgid = g_strdup(buf);
-
-       return NN_SUCCESS;
-}
-

 gint nntp_xover(NNTPSession *session, gint first, gint last)
 {
        gint ok;
 gint nntp_xover(NNTPSession *session, gint first, gint last)
 {
        gint ok;


@@ -313,16 +267,6 @@ gint nntp_post(NNTPSession *session, FILE *fp)
        return NN_SUCCESS;
 }
 
        return NN_SUCCESS;
 }
 

-gint nntp_newgroups(NNTPSession *session)
-{
-       return NN_SUCCESS;
-}
-
-gint nntp_newnews(NNTPSession *session)
-{
-       return NN_SUCCESS;
-}
-

 gint nntp_mode(NNTPSession *session, gboolean stream)
 {
        gint ok;
 gint nntp_mode(NNTPSession *session, gboolean stream)
 {
        gint ok;

diff --git a/src/common/nntp.h b/src/common/nntp.h
index d16ecdd1e8e700ea66b6b1975e4811aeee897038..fde9e239ef7f760f51222c209fc3b60b1cb2d97b 100644 (file)
--- a/src/common/nntp.h
+++ b/src/common/nntp.h
@@ -83,21 +83,6 @@ gint nntp_get_article                (NNTPSession    *session,
                                 const gchar    *cmd,
                                 gint            num,
                                 gchar         **msgid);
                                 const gchar    *cmd,
                                 gint            num,
                                 gchar         **msgid);

-gint nntp_article              (NNTPSession    *session,
-                                gint            num,
-                                gchar         **msgid);
-gint nntp_body                 (NNTPSession    *session,
-                                gint            num,
-                                gchar         **msgid);
-gint nntp_head                 (NNTPSession    *session,
-                                gint            num,
-                                gchar         **msgid);
-gint nntp_stat                 (NNTPSession    *session,
-                                gint            num,
-                                gchar         **msgid);
-gint nntp_next                 (NNTPSession    *session,
-                                gint           *num,
-                                gchar         **msgid);

 gint nntp_xover                        (NNTPSession    *session,
                                 gint            first,
                                 gint            last);
 gint nntp_xover                        (NNTPSession    *session,
                                 gint            first,
                                 gint            last);


@@ -108,8 +93,6 @@ gint nntp_xhdr                       (NNTPSession    *session,
 gint nntp_list                 (NNTPSession    *session);
 gint nntp_post                 (NNTPSession    *session,
                                 FILE           *fp);
 gint nntp_list                 (NNTPSession    *session);
 gint nntp_post                 (NNTPSession    *session,
                                 FILE           *fp);

-gint nntp_newgroups            (NNTPSession    *session);
-gint nntp_newnews              (NNTPSession    *session);

 gint nntp_mode                 (NNTPSession    *sessio,
                                 gboolean        stream);
 
 gint nntp_mode                 (NNTPSession    *sessio,
                                 gboolean        stream);
 

diff --git a/src/common/prefs.c b/src/common/prefs.c
index d00d23bb6f94e80a816883ad41c84f76aabacfa1..580f1c4bdf9e4d40f9bbf3b18bcfa4802effba8c 100644 (file)
--- a/src/common/prefs.c
+++ b/src/common/prefs.c
@@ -28,6 +28,8 @@
 #include "prefs.h"
 #include "utils.h"
 
 #include "prefs.h"
 #include "utils.h"
 

+static gboolean prefs_is_readonly      (const gchar    *path);
+

 /*!
  *\brief       Open preferences file for reading
  *
 /*!
  *\brief       Open preferences file for reading
  *


@@ -234,7 +236,7 @@ gint prefs_file_close_revert(PrefFile *pfile)
 /*!
  *\brief       Check if "path" is a file and readonly
  */
 /*!
  *\brief       Check if "path" is a file and readonly
  */

-gboolean prefs_is_readonly(const gchar * path)
+static gboolean prefs_is_readonly(const gchar * path)

 {
        if (path == NULL)
                return TRUE;
 {
        if (path == NULL)
                return TRUE;

diff --git a/src/common/prefs.h b/src/common/prefs.h
index 48058f2390d39b5b84b8f85b557506b566a94270..f8e202a150e8f4d085d702370c6f771ab66b894e 100644 (file)
--- a/src/common/prefs.h
+++ b/src/common/prefs.h
@@ -37,7 +37,6 @@ PrefFile *prefs_read_open     (const gchar    *path);
 PrefFile *prefs_write_open     (const gchar    *path);
 gint prefs_file_close          (PrefFile       *pfile);
 gint prefs_file_close_revert   (PrefFile       *pfile);
 PrefFile *prefs_write_open     (const gchar    *path);
 gint prefs_file_close          (PrefFile       *pfile);
 gint prefs_file_close_revert   (PrefFile       *pfile);

-gboolean prefs_is_readonly     (const gchar    *path);

 gboolean prefs_rc_is_readonly  (const gchar    *rcfile);
 gint prefs_set_block_label     (PrefFile       *pfile,
                                 const gchar    *block_label);
 gboolean prefs_rc_is_readonly  (const gchar    *rcfile);
 gint prefs_set_block_label     (PrefFile       *pfile,
                                 const gchar    *block_label);

diff --git a/src/common/socket.c b/src/common/socket.c
index 81ff2f96c8210984c5767b1a2ffd49448a553907..83529d5a0c865db05024c9eb419b1206b2e66683 100644 (file)
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -675,40 +675,6 @@ static gint sock_connect_by_getaddrinfo(const gchar *hostname, gushort     port)
 }
 #endif /* !INET6 */
 
 }
 #endif /* !INET6 */
 

-
-/* Open a connection using an external program.  May be useful when
- * you need to tunnel through a SOCKS or other firewall, or to
- * establish an IMAP-over-SSH connection. */
-/* TODO: Recreate this for sock_connect_thread() */
-SockInfo *sock_connect_cmd(const gchar *hostname, const gchar *tunnelcmd)
-{
-#ifdef G_OS_UNIX
-       gint fd[2];
-       int r;
-                    
-       if ((r = socketpair(AF_UNIX, SOCK_STREAM, 0, fd)) == -1) {
-               perror("socketpair");
-               return NULL;
-       }
-       log_message(LOG_PROTOCOL, "launching tunnel command \"%s\"\n", tunnelcmd);
-       if (fork() == 0) {
-               close(fd[0]);
-               close(0);
-               close(1);
-               dup(fd[1]);     /* set onto stdin */
-               dup(fd[1]);
-               execlp("/bin/sh", "/bin/sh", "-c", tunnelcmd, NULL);
-       }
-
-       close(fd[1]);
-       return sockinfo_from_fd(hostname, 0, fd[0]);
-#else
-        /* We would need a special implementation for W32. */
-        return NULL;
-#endif
-}
-
-

 SockInfo *sock_connect(const gchar *hostname, gushort port)
 {
 #ifdef G_OS_WIN32
 SockInfo *sock_connect(const gchar *hostname, gushort port)
 {
 #ifdef G_OS_WIN32

diff --git a/src/common/socket.h b/src/common/socket.h
index 4ee703c15757f0c6d7b7e612d8f976ea978006aa..916ba39c32d5dfed13c8bdad2732416db758baab 100644 (file)
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -89,7 +89,6 @@ guint sock_add_watch                  (SockInfo *sock, GIOCondition condition,
 struct hostent *my_gethostbyname       (const gchar *hostname);
 
 SockInfo *sock_connect                 (const gchar *hostname, gushort port);
 struct hostent *my_gethostbyname       (const gchar *hostname);
 
 SockInfo *sock_connect                 (const gchar *hostname, gushort port);

-SockInfo *sock_connect_cmd             (const gchar *hostname, const gchar *tunnelcmd);

 gint sock_connect_async                        (const gchar *hostname, gushort port,
                                         SockConnectFunc func, gpointer data);
 gint sock_connect_async_cancel         (gint id);
 gint sock_connect_async                        (const gchar *hostname, gushort port,
                                         SockConnectFunc func, gpointer data);
 gint sock_connect_async_cancel         (gint id);

diff --git a/src/common/stringtable.c b/src/common/stringtable.c
index 31efa77ff9b0ec3db7892e82ca2758631715e8a5..cdcbee351384da8beb9fefc00e1e89d66474db2a 100644 (file)
--- a/src/common/stringtable.c
+++ b/src/common/stringtable.c
@@ -68,19 +68,6 @@ StringTable *string_table_new(void)
        return strtable;
 }
 
        return strtable;
 }
 

-gchar *string_table_lookup_string(StringTable *table, const gchar *str)
-{
-       StringEntry *entry;
-
-       entry = g_hash_table_lookup(table->hash_table, str);
-
-       if (entry) {
-               return entry->string;
-       } else {
-               return NULL;
-       }
-}
-

 gchar *string_table_insert_string(StringTable *table, const gchar *str)
 {
        StringEntry *entry;
 gchar *string_table_insert_string(StringTable *table, const gchar *str)
 {
        StringEntry *entry;

diff --git a/src/common/stringtable.h b/src/common/stringtable.h
index 2fe4d42f3df0f2353a3b1ecdbf8fe0dd9637dbb7..f1531a3ba406844b164bc62cb6bbb7b40f8b1c39 100644 (file)
--- a/src/common/stringtable.h
+++ b/src/common/stringtable.h
@@ -28,7 +28,6 @@ typedef struct {
 StringTable *string_table_new     (void);
 void         string_table_free    (StringTable *table);
 
 StringTable *string_table_new     (void);
 void         string_table_free    (StringTable *table);
 

-gchar *string_table_lookup_string (StringTable *table, const gchar *str);

 gchar *string_table_insert_string (StringTable *table, const gchar *str);
 void   string_table_free_string   (StringTable *table, const gchar *str);
 
 gchar *string_table_insert_string (StringTable *table, const gchar *str);
 void   string_table_free_string   (StringTable *table, const gchar *str);
 

diff --git a/src/common/template.c b/src/common/template.c
index 8412e057267d9ca21b5e6281c07735955373479f..2a5a6738d588b24db0636647808fb77fa0aa16ff 100644 (file)
--- a/src/common/template.c
+++ b/src/common/template.c
@@ -99,7 +99,7 @@ void template_free(Template *tmpl)
        g_free(tmpl);
 }
 
        g_free(tmpl);
 }
 

-void template_clear_config(GSList *tmpl_list)
+static void template_clear_config(GSList *tmpl_list)

 {
        GSList *cur;
        Template *tmpl;
 {
        GSList *cur;
        Template *tmpl;


@@ -200,7 +200,7 @@ if (!(func)) \
 } \
 }
 
 } \
 }
 

-void template_write_config(GSList *tmpl_list)
+static void template_write_config(GSList *tmpl_list)

 {
        const gchar *path;
        GSList *cur;
 {
        const gchar *path;
        GSList *cur;

diff --git a/src/common/template.h b/src/common/template.h
index 870675e6f442e9fa134cae9f3e8489ed536cb599..458c170f92b8ff907a9aab9f0facf3d70df18466 100644 (file)
--- a/src/common/template.h
+++ b/src/common/template.h
@@ -36,10 +36,8 @@ struct _Template {
 };
 
 void template_free             (Template       *tmpl);
 };
 
 void template_free             (Template       *tmpl);

-void template_clear_config     (GSList         *tmpl_list);

 
 GSList *template_read_config   (void);
 
 GSList *template_read_config   (void);

-void template_write_config     (GSList         *tmpl_list);

 
 GSList *template_get_config    (void);
 void template_set_config       (GSList         *tmpl_list);
 
 GSList *template_get_config    (void);
 void template_set_config       (GSList         *tmpl_list);

diff --git a/src/common/uuencode.c b/src/common/uuencode.c
index 55c218a5740c39f6f598e39dec2216c45b4d603b..0e5c82cc0d0545900daf09cea6539cfebd0a74c1 100644 (file)
--- a/src/common/uuencode.c
+++ b/src/common/uuencode.c
@@ -34,36 +34,6 @@ const char uudigit[64] =
   'X', 'Y', 'Z', '[', '\\', ']', '^', '_'
 };
 
   'X', 'Y', 'Z', '[', '\\', ']', '^', '_'
 };
 

-int touufrombits(unsigned char *out, const unsigned char *in, int inlen)
-{
-    int len;
-
-    if (inlen > 45) return -1;
-    len = (inlen * 4 + 2) / 3 + 1;
-    *out++ = uudigit[inlen];
-
-    for (; inlen >= 3; inlen -= 3) {
-       *out++ = uudigit[in[0] >> 2];
-       *out++ = uudigit[((in[0] << 4) & 0x30) | (in[1] >> 4)];
-       *out++ = uudigit[((in[1] << 2) & 0x3c) | (in[2] >> 6)];
-       *out++ = uudigit[in[2] & 0x3f];
-       in += 3;
-    }
-
-    if (inlen > 0) {
-       *out++ = uudigit[(in[0] >> 2)];
-       if (inlen == 1) {
-           *out++ = uudigit[((in[0] << 4) & 0x30)];
-       } else {
-           *out++ = uudigit[(((in[0] << 4) & 0x30) | (in[1] >> 4))] ;      
-           *out++ = uudigit[((in[1] << 2) & 0x3c)];
-       }
-    }
-    *out = '\0';
-
-    return len;
-}
-

 int fromuutobits(char *out, const char *in)
 {
     int len, outlen, inlen;
 int fromuutobits(char *out, const char *in)
 {
     int len, outlen, inlen;

diff --git a/src/common/uuencode.h b/src/common/uuencode.h
index 6251c79b7d30d8ced1e12b0fc32340789a14aaf8..a5060596493523b8dd11274b00980d4bb7def5f6 100644 (file)
--- a/src/common/uuencode.h
+++ b/src/common/uuencode.h
@@ -17,7 +17,6 @@
  * 
  */
 
  * 
  */
 

-void touufrombits(unsigned char *, const unsigned char *, int);

 int fromuutobits(char *, const char *);
 
 #define X_UUENCODE_END_LINE '`'
 int fromuutobits(char *, const char *);
 
 #define X_UUENCODE_END_LINE '`'

diff --git a/src/edittags.c b/src/edittags.c
index 396ad0a779b5ca6d8499db2b39e7d19b931a1e0a..a1a010541e67227b5c353772f579095f4c34652a 100644 (file)
--- a/src/edittags.c
+++ b/src/edittags.c
@@ -556,29 +556,6 @@ static gboolean prefs_tags_selected(GtkTreeSelection *selector,
        return TRUE;
 }
 
        return TRUE;
 }
 

-gint prefs_tags_create_new(MainWindow *mainwin)
-{
-       gchar *new_tag = input_dialog(_("New tag"),
-                               _("New tag name:"), 
-                               ""); 
-       gint id = -1;
-       if (!new_tag || !(*new_tag))
-               return -1;
-       
-       g_strstrip(new_tag);
-       id = tags_get_id_for_str(new_tag);
-       if (id != -1) {
-               g_free(new_tag);
-               return id;
-       }
-       id = tags_add_tag(new_tag);
-       g_free(new_tag);
-       
-       tags_write_tags();
-       return id;
-       
-}
-

 enum {
        TAG_SELECTED,
        TAG_SELECTED_INCONSISTENT,
 enum {
        TAG_SELECTED,
        TAG_SELECTED_INCONSISTENT,

diff --git a/src/edittags.h b/src/edittags.h
index 3d4fa30c8034215797ddc0234175ce493fba0a7e..f4388f6b2f8ad0c0021e056be622250ad5c8b41a 100644 (file)
--- a/src/edittags.h
+++ b/src/edittags.h
@@ -23,7 +23,6 @@
 #include "mainwindow.h"
 
 void prefs_tags_open(MainWindow *mainwin);
 #include "mainwindow.h"
 
 void prefs_tags_open(MainWindow *mainwin);

-gint prefs_tags_create_new(MainWindow *mainwin);

 
 void tag_apply_open(GSList *msglist);
 #endif
 
 void tag_apply_open(GSList *msglist);
 #endif

diff --git a/src/filtering.c b/src/filtering.c
index 9477abeb2e54661718ecb9103d78705a6a699ffc..7e32fba99264a01da334e847eca9df3ef4143626 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -1004,7 +1004,7 @@ gchar * filteringprop_to_string(FilteringProp * prop)
        return filtering_str;
 }
 
        return filtering_str;
 }
 

-void prefs_filtering_free(GSList * prefs_filtering)
+static void prefs_filtering_free(GSList * prefs_filtering)

 {
        while (prefs_filtering != NULL) {
                FilteringProp * filtering = (FilteringProp *)
 {
        while (prefs_filtering != NULL) {
                FilteringProp * filtering = (FilteringProp *)

diff --git a/src/filtering.h b/src/filtering.h
index c0b072cda04ca312b547d1c6f35538c2ef6f0b69..ec8a00786befb18f614ab872531a418d5e954d55 100644 (file)
--- a/src/filtering.h
+++ b/src/filtering.h
@@ -97,7 +97,6 @@ gchar * filteringprop_to_string(FilteringProp *prop);
 
 void prefs_filtering_clear(void);
 void prefs_filtering_clear_folder(Folder *folder);
 
 void prefs_filtering_clear(void);
 void prefs_filtering_clear_folder(Folder *folder);

-void prefs_filtering_free(GSList *prefs_filtering);

 
 FilteringProp * filteringprop_copy(FilteringProp *src);
 void filtering_move_and_copy_msgs(GSList *msglist);
 
 FilteringProp * filteringprop_copy(FilteringProp *src);
 void filtering_move_and_copy_msgs(GSList *msglist);

diff --git a/src/gtk/gtkshruler.c b/src/gtk/gtkshruler.c
index 894820d00a5da1224e09539f9729552d04542236..41839e6e92669abf7123cea38abd9d5262d82145 100644 (file)
--- a/src/gtk/gtkshruler.c
+++ b/src/gtk/gtkshruler.c
@@ -173,25 +173,3 @@ gtk_shruler_draw_ticks(GtkRuler *ruler)
                }
        }
 }
                }
        }
 }

-
-/* gtk_ruler_set_pos() - does not work yet, need to reimplement 
- * gtk_ruler_draw_pos(). */
-void
-gtk_shruler_set_pos(GtkSHRuler * ruler, gfloat pos)
-{
-       GtkRuler * ruler_;
-       g_return_if_fail( ruler != NULL );
-       
-       ruler_ = GTK_RULER(ruler);
-       
-       if ( pos < ruler_->lower ) 
-               pos = ruler_->lower;
-       if ( pos > ruler_->upper )
-               pos = ruler_->upper;
-       
-       ruler_->position = pos; 
-       
-       /*  Make sure the ruler has been allocated already  */
-       if ( ruler_->backing_store != NULL )
-               gtk_ruler_draw_pos(ruler_);
-}

diff --git a/src/gtk/gtkshruler.h b/src/gtk/gtkshruler.h
index 817bf82400482a3180c72853c4eb4b7105556dcc..e0eff7057208cfa250fba2671999c8623322be9b 100644 (file)
--- a/src/gtk/gtkshruler.h
+++ b/src/gtk/gtkshruler.h
@@ -49,9 +49,6 @@ struct _GtkSHRulerClass
 
 GType      gtk_shruler_get_type (void);
 GtkWidget* gtk_shruler_new      (void);
 
 GType      gtk_shruler_get_type (void);
 GtkWidget* gtk_shruler_new      (void);

-void       gtk_shruler_set_pos  (GtkSHRuler *ruler,
-                                gfloat      pos);
-

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }

diff --git a/src/gtk/menu.c b/src/gtk/menu.c
index b8d4f422f0e2e4fe73301babc5e4058e8704783e..0791115bdab036fcd5e259bd6ca4bf2cd0217e40 100644 (file)
--- a/src/gtk/menu.c
+++ b/src/gtk/menu.c
@@ -78,22 +78,6 @@ GtkWidget *menu_create_items(GtkItemFactoryEntry *entries,
        return gtk_item_factory_get_widget(*factory, path);
 }
 
        return gtk_item_factory_get_widget(*factory, path);
 }
 

-GtkWidget *popupmenu_create(GtkWidget *window, GtkItemFactoryEntry *entries,
-                            guint n_entries, const gchar *path, gpointer data)
-{
-       GtkItemFactory *factory;
-       GtkAccelGroup *accel_group;
-
-       accel_group = gtk_accel_group_new();
-       factory = gtk_item_factory_new(GTK_TYPE_MENU, path, accel_group);
-       gtk_item_factory_set_translate_func(factory, menu_translate,
-                                           NULL, NULL);
-       gtk_item_factory_create_items(factory, n_entries, entries, data);
-       gtk_window_add_accel_group(GTK_WINDOW (window), accel_group);
-
-       return gtk_item_factory_get_widget(factory, path);
-}
-

 gchar *menu_translate(const gchar *path, gpointer data)
 {
        gchar *retval;
 gchar *menu_translate(const gchar *path, gpointer data)
 {
        gchar *retval;


@@ -201,17 +185,6 @@ gint menu_find_option_menu_index(GtkOptionMenu *optmenu, gpointer data,
        return -1;
 }
 
        return -1;
 }
 

-gpointer menu_get_option_menu_active_user_data(GtkOptionMenu *optmenu)
-{
-       GtkWidget *menu;
-       GtkWidget *menuitem;
-
-       menu = gtk_option_menu_get_menu(optmenu);
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-
-       return g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID);
-}
-

 static void connect_accel_change_signals(GtkWidget* widget, GtkWidget *wid2) 
 {
 #if 0
 static void connect_accel_change_signals(GtkWidget* widget, GtkWidget *wid2) 
 {
 #if 0


@@ -294,27 +267,3 @@ void menu_connect_identical_items(void)
                }                               
        }
 }
                }                               
        }
 }

-
-void menu_select_by_data(GtkMenu *menu, gpointer data)
-{
-       GList *children, *cur;
-       GtkWidget *select_item = NULL;
-       
-       g_return_if_fail(menu != NULL);
-
-       children = gtk_container_get_children(GTK_CONTAINER(menu));
-
-       for (cur = children; cur != NULL; cur = g_list_next(cur)) {
-               GObject *child = G_OBJECT(cur->data);
-
-               if (g_object_get_data(child, MENU_VAL_ID) == data) {
-                       select_item = GTK_WIDGET(child);
-               }
-       }
-       if (select_item != NULL) {
-               gtk_menu_shell_select_item(GTK_MENU_SHELL(menu), select_item);
-               gtk_menu_shell_activate_item(GTK_MENU_SHELL(menu), select_item, FALSE);
-       }
-
-       g_list_free(children);
-}

diff --git a/src/gtk/menu.h b/src/gtk/menu.h
index c26c2878b904a63475ec91eee0747e4332c9b275..ccdf66ef36258f9f1cd58e26970aa2d17cfdab92 100644 (file)
--- a/src/gtk/menu.h
+++ b/src/gtk/menu.h
@@ -59,18 +59,11 @@ GtkWidget *menu_create_items        (GtkItemFactoryEntry    *entries,
                                 const gchar            *path,
                                 GtkItemFactory        **factory,
                                 gpointer                data);
                                 const gchar            *path,
                                 GtkItemFactory        **factory,
                                 gpointer                data);

-GtkWidget *popupmenu_create    (GtkWidget *window,
-                                GtkItemFactoryEntry *entries,
-                                guint n_entries,
-                                const gchar *path,
-                                gpointer data);

 gchar *menu_translate          (const gchar *path, gpointer data);
 
 void menu_set_sensitive                (GtkItemFactory         *ifactory,
                                 const gchar            *path,
                                 gboolean                sensitive);
 gchar *menu_translate          (const gchar *path, gpointer data);
 
 void menu_set_sensitive                (GtkItemFactory         *ifactory,
                                 const gchar            *path,
                                 gboolean                sensitive);

-void menu_set_sensitive_all    (GtkMenuShell           *menu_shell,
-                                gboolean                sensitive);

 
 void menu_set_active           (GtkItemFactory         *ifactory,
                                 const gchar            *path,
 
 void menu_set_active           (GtkItemFactory         *ifactory,
                                 const gchar            *path,


@@ -84,12 +77,7 @@ void menu_button_position    (GtkMenu                *menu,
 gint menu_find_option_menu_index(GtkOptionMenu         *optmenu,
                                 gpointer                data,
                                 GCompareFunc            func);
 gint menu_find_option_menu_index(GtkOptionMenu         *optmenu,
                                 gpointer                data,
                                 GCompareFunc            func);

-
-gpointer menu_get_option_menu_active_user_data
-                               (GtkOptionMenu          *optmenu);
+void menu_set_sensitive_all(GtkMenuShell *menu_shell, gboolean sensitive);

 void menu_connect_identical_items(void);
 
 void menu_connect_identical_items(void);
 

-void menu_select_by_data       (GtkMenu                *menu,
-                                gpointer                data);
-

 #endif /* __MENU_H__ */
 #endif /* __MENU_H__ */

diff --git a/src/gtk/progressdialog.c b/src/gtk/progressdialog.c
index 47da039e78ad5d516253d54d681d18d638b10757..da7e0d2fee68cad3ee86d93e71acd99ad0a6a27e 100644 (file)
--- a/src/gtk/progressdialog.c
+++ b/src/gtk/progressdialog.c
@@ -185,28 +185,6 @@ void progress_dialog_destroy(ProgressDialog *progress)
        }
 }
 
        }
 }
 

-/*!
- *\return      gint Row where account was set
- */
-gint progress_dialog_list_set_account(ProgressDialog *progress,
-                                     gint            row,
-                                     const gchar    *account_name)
-{
-       return progress_dialog_insert_account(progress, row, account_name,
-                                             NULL, NULL);
-}
-
-/*!
- *\return      gint Row where image was set
- */
-gint progress_dialog_list_set_image(ProgressDialog *progress,
-                                   gint            row,
-                                   GdkPixbuf      *image)
-{
-       return progress_dialog_insert_account(progress, row, NULL,
-                                             NULL, image);
-}
-

 /*!
  *\return      gint Row where status was set
  */
 /*!
  *\return      gint Row where status was set
  */

diff --git a/src/gtk/progressdialog.h b/src/gtk/progressdialog.h
index dd58893bb199f048add6c5d72109a769cfaffa2f..b4632c233276401dbc48c8cdd1bac6ecc58cc095 100644 (file)
--- a/src/gtk/progressdialog.h
+++ b/src/gtk/progressdialog.h
@@ -49,12 +49,6 @@ void progress_dialog_destroy         (ProgressDialog *progress);
  * Use these functions to access the dialog list
  */
 
  * Use these functions to access the dialog list
  */
 

-gint progress_dialog_list_set_account  (ProgressDialog *progress,
-                                        gint            row,
-                                        const gchar    *account_name);
-gint progress_dialog_list_set_image    (ProgressDialog *progress,
-                                        gint            row,
-                                        GdkPixbuf      *image);

 gint progress_dialog_list_set_status   (ProgressDialog *progress,
                                         gint            row,
                                         const gchar    *status);
 gint progress_dialog_list_set_status   (ProgressDialog *progress,
                                         gint            row,
                                         const gchar    *status);

diff --git a/src/importmutt.c b/src/importmutt.c
index 29a45b583782573ca5918bbea4e012c7deb46abe..e1d638b8cc586902faaff3ba222e4b5f3551ec4d 100644 (file)
--- a/src/importmutt.c
+++ b/src/importmutt.c
@@ -104,6 +104,8 @@ static gboolean imp_mutt_import_file( gchar *sName, gchar *sFile ) {
                addrbook_free_book( abf );
        }
 
                addrbook_free_book( abf );
        }
 

+       mutt_free(mdf);
+

        return retVal;
 }
 
        return retVal;
 }
 

diff --git a/src/importpine.c b/src/importpine.c
index 9bac252e5de4f99a97314356ec2d248f5c3733a3..446cdbaa8c13e5d8ebbfe251de348248a46c3dad 100644 (file)
--- a/src/importpine.c
+++ b/src/importpine.c
@@ -103,6 +103,7 @@ static gboolean imp_pine_import_file( gchar *sName, gchar *sFile ) {
        else {
                addrbook_free_book( abf );
        }
        else {
                addrbook_free_book( abf );
        }

+       pine_free(pdf);

 
        return retVal;
 }
 
        return retVal;
 }

diff --git a/src/main.c b/src/main.c
index e6426370d44b466a2554aadd0090e62072310175..59c5d0ec0da8fea84c9017d942efeeb5bd68103a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1036,7 +1036,6 @@ int main(int argc, char *argv[])
        prefs_display_header_read_config();
        /* prefs_filtering_read_config(); */
        addressbook_read_file();
        prefs_display_header_read_config();
        /* prefs_filtering_read_config(); */
        addressbook_read_file();

-       renderer_read_config();

 
        gtkut_widget_init();
        stock_pixbuf_gdk(NULL, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
 
        gtkut_widget_init();
        stock_pixbuf_gdk(NULL, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);


@@ -1442,6 +1441,7 @@ static void exit_claws(MainWindow *mainwin)
        prefs_message_done();
        prefs_other_done();
        prefs_receive_done();
        prefs_message_done();
        prefs_other_done();
        prefs_receive_done();

+       prefs_logging_done();

        prefs_send_done();
        tags_write_tags();
 #ifdef USE_ASPELL       
        prefs_send_done();
        tags_write_tags();
 #ifdef USE_ASPELL       

diff --git a/src/messageview.c b/src/messageview.c
index 9ee70c08ec53c7f2f40c7095e67d203204ac5ac6..5d78c36a5f03af7c85b2a19049bc091dbed1b4bf 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -485,7 +485,7 @@ void messageview_update_actions_menu(MessageView *msgview)
        action_update_msgview_menu(ifactory, "/Tools/Actions", msgview);
 }
 
        action_update_msgview_menu(ifactory, "/Tools/Actions", msgview);
 }
 

-void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) 
+static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) 

 {
        GtkWidget *handlebox;
        GtkWidget *vbox;
 {
        GtkWidget *handlebox;
        GtkWidget *vbox;


@@ -1207,14 +1207,6 @@ static void messageview_update(MessageView *msgview, MsgInfo *old_msginfo)
        } 
 }
 
        } 
 }
 

-void messageview_quote_color_set(void)
-{
-}
-
-void messageview_set_font(MessageView *messageview)
-{
-}
-

 TextView *messageview_get_current_textview(MessageView *messageview)
 {
        TextView *text = NULL;
 TextView *messageview_get_current_textview(MessageView *messageview)
 {
        TextView *text = NULL;

diff --git a/src/messageview.h b/src/messageview.h
index b02c37fdbf3668eae67d4d92fb0814b47ff935b3..1fe92c6b44467a0960b45bcbe9e5148414dca51b 100644 (file)
--- a/src/messageview.h
+++ b/src/messageview.h
@@ -86,9 +86,6 @@ gint messageview_show                         (MessageView    *messageview,
 void messageview_clear                         (MessageView    *messageview);
 void messageview_destroy                       (MessageView    *messageview);
 
 void messageview_clear                         (MessageView    *messageview);
 void messageview_destroy                       (MessageView    *messageview);
 

-void messageview_quote_color_set               (void);
-void messageview_set_font                      (MessageView    *messageview);
-

 TextView *messageview_get_current_textview     (MessageView    *messageview);
 MimeInfo *messageview_get_selected_mime_part   (MessageView    *messageview);
 
 TextView *messageview_get_current_textview     (MessageView    *messageview);
 MimeInfo *messageview_get_selected_mime_part   (MessageView    *messageview);
 


@@ -108,8 +105,6 @@ gboolean messageview_search_string_backward (MessageView    *messageview,
 gboolean messageview_is_visible                        (MessageView    *messageview);
 
 void messageview_update_actions_menu           (MessageView    *msgview);
 gboolean messageview_is_visible                        (MessageView    *messageview);
 
 void messageview_update_actions_menu           (MessageView    *msgview);

-void messageview_add_toolbar                   (MessageView    *msgview,
-                                                GtkWidget      *vbox);

 void messageview_reflect_prefs_pixmap_theme    (void);
 gchar *messageview_get_selection               (MessageView    *msgview);
 
 void messageview_reflect_prefs_pixmap_theme    (void);
 gchar *messageview_get_selection               (MessageView    *msgview);
 

diff --git a/src/mimeview.c b/src/mimeview.c
index fb23456904b70da4d2744c73210eb418f3549b8f..595d62f69cdc469517de55e092ef81cc2a926d57 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -790,7 +790,7 @@ void mimeview_clear(MimeView *mimeview)
 }
 
 static void check_signature_cb(GtkWidget *widget, gpointer user_data);
 }
 
 static void check_signature_cb(GtkWidget *widget, gpointer user_data);

-void mimeview_check_signature(MimeView *mimeview);
+static void mimeview_check_signature(MimeView *mimeview);

 static void display_full_info_cb(GtkWidget *widget, gpointer user_data);
 
 static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo, 
 static void display_full_info_cb(GtkWidget *widget, gpointer user_data);
 
 static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo, 


@@ -1075,7 +1075,7 @@ static void check_signature_cb(GtkWidget *widget, gpointer user_data)
        }
 }
 
        }
 }
 

-void mimeview_check_signature(MimeView *mimeview)
+static void mimeview_check_signature(MimeView *mimeview)

 {
        check_signature_cb(NULL, mimeview);     
 }
 {
        check_signature_cb(NULL, mimeview);     
 }

diff --git a/src/mimeview.h b/src/mimeview.h
index dae076b74e9b328d11760631a84e830cde5988aa..6dfa84d36cd31aa47b8217a068a4f6e9f5d4e70d 100644 (file)
--- a/src/mimeview.h
+++ b/src/mimeview.h
@@ -151,7 +151,6 @@ void mimeview_clear         (MimeView       *mimeview);
 
 MimeInfo *mimeview_get_selected_part   (MimeView       *mimeview);
 
 
 MimeInfo *mimeview_get_selected_part   (MimeView       *mimeview);
 

-void mimeview_check_signature          (MimeView       *mimeview);

 void mimeview_pass_key_press_event     (MimeView       *mimeview,
                                         GdkEventKey    *event);
 
 void mimeview_pass_key_press_event     (MimeView       *mimeview,
                                         GdkEventKey    *event);
 

diff --git a/src/pop.c b/src/pop.c
index 37ece014e16c0fc42773ea77ab3827cc320a18ef..36319085e25c7bc0bc8714f025bd24c6a0cfabe5 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -90,6 +90,7 @@ static gint pop3_session_recv_msg             (Session        *session,
 static gint pop3_session_recv_data_finished    (Session        *session,
                                                 guchar         *data,
                                                 guint           len);
 static gint pop3_session_recv_data_finished    (Session        *session,
                                                 guchar         *data,
                                                 guint           len);

+static void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session);

 
 static gint pop3_greeting_recv(Pop3Session *session, const gchar *msg)
 {
 
 static gint pop3_greeting_recv(Pop3Session *session, const gchar *msg)
 {


@@ -567,7 +568,7 @@ static void pop3_session_destroy(Session *session)
        g_free(pop3_session->error_msg);
 }
 
        g_free(pop3_session->error_msg);
 }
 

-void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session)
+static void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session)

 {
        GHashTable *table;
        GHashTable *partial_recv_table;
 {
        GHashTable *table;
        GHashTable *partial_recv_table;

diff --git a/src/pop.h b/src/pop.h
index bb93021624d8c47b24146b202cd3f297bd93fb05..7d9ba2d395b8a2038343c7c9fd95ccc6705a3707 100644 (file)
--- a/src/pop.h
+++ b/src/pop.h
@@ -155,7 +155,6 @@ struct _Pop3Session
 #define IDLEN          POPBUFSIZE
 
 Session *pop3_session_new      (PrefsAccount   *account);
 #define IDLEN          POPBUFSIZE
 
 Session *pop3_session_new      (PrefsAccount   *account);

-void pop3_get_uidl_table       (PrefsAccount   *account, Pop3Session *session);

 gint pop3_write_uidl_list      (Pop3Session    *session);
 
 #endif /* __POP_H__ */
 gint pop3_write_uidl_list      (Pop3Session    *session);
 
 #endif /* __POP_H__ */

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 2e89616bf3f5ead026f6f521bf5ebaedbbeb1864..277807df46677c28ac4e2b54a2d5e4e2af366a3e 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -1074,11 +1074,6 @@ static PrefParam param[] = {
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 

-PrefsCommon *prefs_common_get(void)
-{
-       return &prefs_common;
-}
-

 /*
  * Read history list from the specified history file
  */
 /*
  * Read history list from the specified history file
  */

diff --git a/src/prefs_common.h b/src/prefs_common.h
index c66eb7b8ee28bb8bc078650e107dac5c73eb1da0..e396b00047e391e2dc505d7acb8993db1aea88a3 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -480,7 +480,6 @@ extern PrefsCommon prefs_common;
 void prefs_common_read_config  (void);
 void prefs_common_write_config (void);
 void prefs_common_open         (void);
 void prefs_common_read_config  (void);
 void prefs_common_write_config (void);
 void prefs_common_open         (void);

-PrefsCommon *prefs_common_get  (void);

 void pref_get_unescaped_pref(gchar *out, const gchar *in);
 void pref_get_escaped_pref(gchar *out, const gchar *in);
 void pref_set_textview_from_pref(GtkTextView *textview, const gchar *txt);
 void pref_get_unescaped_pref(gchar *out, const gchar *in);
 void pref_get_escaped_pref(gchar *out, const gchar *in);
 void pref_set_textview_from_pref(GtkTextView *textview, const gchar *txt);

diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index 5a70eff018343d2a14104d92f630e9331d64a107..056f13a4c423fd790f1535d240ca443acc4e1793 100644 (file)
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -357,7 +357,7 @@ void prefs_custom_header_read_config(PrefsAccount *ac)
        fclose(fp);
 }
 
        fclose(fp);
 }
 

-void prefs_custom_header_write_config(PrefsAccount *ac)
+static void prefs_custom_header_write_config(PrefsAccount *ac)

 {
        gchar *rcpath;
        PrefFile *pfile;
 {
        gchar *rcpath;
        PrefFile *pfile;

diff --git a/src/prefs_customheader.h b/src/prefs_customheader.h
index 8fa514194761bcf216004807e1853ac3e224706b..325c3da966442c7a84fa318acd7f0d9a107b200d 100644 (file)
--- a/src/prefs_customheader.h
+++ b/src/prefs_customheader.h
@@ -23,7 +23,6 @@
 #include "prefs_account.h"
 
 void prefs_custom_header_read_config   (PrefsAccount *ac);
 #include "prefs_account.h"
 
 void prefs_custom_header_read_config   (PrefsAccount *ac);

-void prefs_custom_header_write_config  (PrefsAccount *ac);

 void prefs_custom_header_open          (PrefsAccount *ac);
 
 #endif /* __PREFS_CUSTOMHEADER_H__ */
 void prefs_custom_header_open          (PrefsAccount *ac);
 
 #endif /* __PREFS_CUSTOMHEADER_H__ */

diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index 803f0b81b02b5a980eba6b132f8475ef089df2da..b6d7bd51c307c8d7b2934b3217278385ced7ee46 100644 (file)
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -461,7 +461,7 @@ void prefs_display_header_read_config(void)
        fclose(fp);
 }
 
        fclose(fp);
 }
 

-void prefs_display_header_write_config(void)
+static void prefs_display_header_write_config(void)

 {
        gchar *rcpath;
        PrefFile *pfile;
 {
        gchar *rcpath;
        PrefFile *pfile;

diff --git a/src/prefs_display_header.h b/src/prefs_display_header.h
index 5b0b7a55916a775fb891bd3d90490488e21968be..4a049bc8e1573bde27bc856de84f91eb379f8c3e 100644 (file)
--- a/src/prefs_display_header.h
+++ b/src/prefs_display_header.h
@@ -21,7 +21,6 @@
 #define __PREFS_DISPLAY_HEADER_H__
 
 void prefs_display_header_read_config  (void);
 #define __PREFS_DISPLAY_HEADER_H__
 
 void prefs_display_header_read_config  (void);

-void prefs_display_header_write_config (void);

 void prefs_display_header_open         (void);
 
 #endif /* __PREFS_DISPLAY_HEADER_H__ */
 void prefs_display_header_open         (void);
 
 #endif /* __PREFS_DISPLAY_HEADER_H__ */

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 79574def3b9c2df1cf58d1222b30089bb667af49..0bd6513319247b13b1939836cebc72f6f4485a66 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -93,6 +93,8 @@ static gboolean prefs_filtering_actions_selected              (GtkTreeSelection *selector,
                                                                 gboolean currently_selected,
                                                                 gpointer data);
 
                                                                 gboolean currently_selected,
                                                                 gpointer data);
 

+static void prefs_filtering_action_exec_info(void);
+

 /*!
  *\brief       UI data for matcher dialog
  */
 /*!
  *\brief       UI data for matcher dialog
  */


@@ -1257,7 +1259,7 @@ static DescriptionWindow exec_desc_win = {
 /*!
  *\brief       Show Execute action's info
  */
 /*!
  *\brief       Show Execute action's info
  */

-void prefs_filtering_action_exec_info(void)
+static void prefs_filtering_action_exec_info(void)

 {
        description_window_create(&exec_desc_win);
 }
 {
        description_window_create(&exec_desc_win);
 }

diff --git a/src/prefs_filtering_action.h b/src/prefs_filtering_action.h
index 63137ea67bd117bb0003a5e602fe18ac4b7297dc..3961b18b60081c3a4062b5555d08fa2edaa085b3 100644 (file)
--- a/src/prefs_filtering_action.h
+++ b/src/prefs_filtering_action.h
@@ -26,6 +26,5 @@ typedef void PrefsFilteringActionSignal       (GSList *action_list);
 
 void prefs_filtering_action_open               (GSList *action_list,
                                 PrefsFilteringActionSignal *cb);
 
 void prefs_filtering_action_open               (GSList *action_list,
                                 PrefsFilteringActionSignal *cb);

-void prefs_filtering_action_exec_info  (void);

 
 #endif /* __PREFS_FILTER_H__ */
 
 #endif /* __PREFS_FILTER_H__ */

diff --git a/src/prefs_folder_column.c b/src/prefs_folder_column.c
index 6ea40d0dea443b3fce25a6956a154386a1389e32..0390567bbc15e7ee43e4e1f7850bad470a95f6e7 100644 (file)
--- a/src/prefs_folder_column.c
+++ b/src/prefs_folder_column.c
@@ -42,6 +42,8 @@
 #include "gtkutils.h"
 #include "utils.h"
 
 #include "gtkutils.h"
 #include "utils.h"
 

+static void prefs_folder_column_set_config(FolderColumnState *state);
+

 enum {
        SUMCOL_NAME,
        SUMCOL_TYPE,
 enum {
        SUMCOL_NAME,
        SUMCOL_TYPE,


@@ -385,7 +387,7 @@ FolderColumnState *prefs_folder_column_get_config(void)
        return state;
 }
 
        return state;
 }
 

-void prefs_folder_column_set_config(FolderColumnState *state)
+static void prefs_folder_column_set_config(FolderColumnState *state)

 {
        FolderColumnType type;
        gint pos;
 {
        FolderColumnType type;
        gint pos;

diff --git a/src/prefs_folder_column.h b/src/prefs_folder_column.h
index 043a453de8ec48c44cd7f25d7fae5a7fb1adee10..8d1a42d0332b337dd8a3dd9a90af7e8b0bdf5d83 100644 (file)
--- a/src/prefs_folder_column.h
+++ b/src/prefs_folder_column.h
@@ -25,6 +25,5 @@
 void prefs_folder_column_open(void);
 
 FolderColumnState *prefs_folder_column_get_config(void);
 void prefs_folder_column_open(void);
 
 FolderColumnState *prefs_folder_column_get_config(void);

-void prefs_folder_column_set_config(FolderColumnState *state);

 
 #endif /* __PREFS_FOLDER_COLUMN_H__ */
 
 #endif /* __PREFS_FOLDER_COLUMN_H__ */

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 400676d50eb2f2571eca1b90336fed3ccdad427d..286b29c7ab7e66d4fdc7de689a025632c5d3c1e3 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -60,6 +60,9 @@
                string = (value); \
        }
 
                string = (value); \
        }
 

+static void prefs_folder_item_register_page    (PrefsPage      *page);
+static void prefs_folder_item_unregister_page  (PrefsPage      *page);
+

 typedef struct _FolderItemGeneralPage FolderItemGeneralPage;
 typedef struct _FolderItemComposePage FolderItemComposePage;
 typedef struct _FolderItemTemplatesPage FolderItemTemplatesPage;
 typedef struct _FolderItemGeneralPage FolderItemGeneralPage;
 typedef struct _FolderItemComposePage FolderItemComposePage;
 typedef struct _FolderItemTemplatesPage FolderItemTemplatesPage;


@@ -1571,12 +1574,12 @@ void prefs_folder_item_open(FolderItem *item)
        g_free (title);
 }
 
        g_free (title);
 }
 

-void prefs_folder_item_register_page(PrefsPage *page)
+static void prefs_folder_item_register_page(PrefsPage *page)

 {
        prefs_pages = g_slist_append(prefs_pages, page);
 }
 
 {
        prefs_pages = g_slist_append(prefs_pages, page);
 }
 

-void prefs_folder_item_unregister_page(PrefsPage *page)
+static void prefs_folder_item_unregister_page(PrefsPage *page)

 {
        prefs_pages = g_slist_remove(prefs_pages, page);
 }
 {
        prefs_pages = g_slist_remove(prefs_pages, page);
 }

diff --git a/src/prefs_folder_item.h b/src/prefs_folder_item.h
index 216885bad45a615b89c348826fbaa9f3681d38ff..c1a8b9ec617b5de34be30671ba9e4f50878ccd33 100644 (file)
--- a/src/prefs_folder_item.h
+++ b/src/prefs_folder_item.h
@@ -31,7 +31,5 @@
 void prefs_folder_item_create(FolderView *folderview, FolderItem *item); 
 
 void prefs_folder_item_open            (FolderItem     *item);
 void prefs_folder_item_create(FolderView *folderview, FolderItem *item); 
 
 void prefs_folder_item_open            (FolderItem     *item);

-void prefs_folder_item_register_page   (PrefsPage      *page);
-void prefs_folder_item_unregister_page (PrefsPage      *page);

 
 #endif /* PREFS_FOLDER_ITEM_H */
 
 #endif /* PREFS_FOLDER_ITEM_H */

diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index bcca86ed800146230fb814aab352276dd5c31db8..3f55d9cc9bb0055a2ee23aaac1f733dd30f73994 100644 (file)
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -65,6 +65,9 @@ static GHashTable *whole_cache = NULL;
 static gboolean prefs_read_config_from_cache(PrefParam *param, const gchar *label,
                               const gchar *rcfile);
 
 static gboolean prefs_read_config_from_cache(PrefParam *param, const gchar *label,
                               const gchar *rcfile);
 

+static void prefs_config_parse_one_line(PrefParam      *param,
+                                        const gchar    *buf);
+

 void prefs_read_config(PrefParam *param, const gchar *label,
                       const gchar *rcfile, const gchar *encoding)
 {
 void prefs_read_config(PrefParam *param, const gchar *label,
                       const gchar *rcfile, const gchar *encoding)
 {


@@ -148,7 +151,7 @@ void prefs_read_config(PrefParam *param, const gchar *label,
        fclose(fp);
 }
 
        fclose(fp);
 }
 

-void prefs_config_parse_one_line(PrefParam *param, const gchar *buf)
+static void prefs_config_parse_one_line(PrefParam *param, const gchar *buf)

 {
        gint i;
        gint name_len;
 {
        gint i;
        gint name_len;


@@ -533,63 +536,6 @@ void prefs_free(PrefParam *param)
        }
 }
 
        }
 }
 

-void prefs_dialog_create(PrefsDialog *dialog)
-{
-       GtkWidget *window;
-       GtkWidget *vbox;
-       GtkWidget *notebook;
-
-       GtkWidget *confirm_area;
-       GtkWidget *ok_btn;
-       GtkWidget *cancel_btn;
-       GtkWidget *apply_btn;
-
-       g_return_if_fail(dialog != NULL);
-
-       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_gtk");
-       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-       gtk_window_set_position (GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal (GTK_WINDOW (window), TRUE);
-       gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
-
-       vbox = gtk_vbox_new (FALSE, 6);
-       gtk_widget_show(vbox);
-       gtk_container_add (GTK_CONTAINER (window), vbox);
-
-       notebook = gtk_notebook_new ();
-       gtk_widget_show(notebook);
-       gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
-       gtk_container_set_border_width (GTK_CONTAINER (notebook), 2);
-       /* GTK_WIDGET_UNSET_FLAGS (notebook, GTK_CAN_FOCUS); */
-       gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE);
-       
-       gtk_notebook_popup_enable (GTK_NOTEBOOK (notebook));
-
-       gtkut_stock_button_set_create(&confirm_area,
-                                     &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
-                                     &apply_btn, GTK_STOCK_APPLY);
-       gtk_widget_show(confirm_area);
-       gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
-       gtk_widget_grab_default(ok_btn);
-
-       dialog->window     = window;
-       dialog->notebook   = notebook;
-       dialog->ok_btn     = ok_btn;
-       dialog->cancel_btn = cancel_btn;
-       dialog->apply_btn  = apply_btn;
-}
-
-void prefs_dialog_destroy(PrefsDialog *dialog)
-{
-       gtk_widget_destroy(dialog->window);
-       dialog->window     = NULL;
-       dialog->notebook   = NULL;
-       dialog->ok_btn     = NULL;
-       dialog->cancel_btn = NULL;
-       dialog->apply_btn  = NULL;
-}
-

 void prefs_button_toggled(GtkToggleButton *toggle_btn, GtkWidget *widget)
 {
        gboolean is_active;
 void prefs_button_toggled(GtkToggleButton *toggle_btn, GtkWidget *widget)
 {
        gboolean is_active;

diff --git a/src/prefs_gtk.h b/src/prefs_gtk.h
index 8841a0ea55e1e778c932a782ec98ba4271c3fd37..351f7a8abd767542d8e31795cb11fb9dc5d90447 100644 (file)
--- a/src/prefs_gtk.h
+++ b/src/prefs_gtk.h
@@ -145,8 +145,6 @@ void prefs_read_config              (PrefParam      *param,
                                 const gchar    *label,
                                 const gchar    *rcfile,
                                 const gchar    *encoding);
                                 const gchar    *label,
                                 const gchar    *rcfile,
                                 const gchar    *encoding);

-void prefs_config_parse_one_line(PrefParam     *param,
-                                const gchar    *buf);

 void prefs_write_config                (PrefParam      *param,
                                 const gchar    *label,
                                 const gchar    *rcfile);
 void prefs_write_config                (PrefParam      *param,
                                 const gchar    *label,
                                 const gchar    *rcfile);


@@ -160,9 +158,6 @@ gint prefs_write_close_revert       (PrefFile       *pfile);
 void prefs_set_default         (PrefParam      *param);
 void prefs_free                        (PrefParam      *param);
 
 void prefs_set_default         (PrefParam      *param);
 void prefs_free                        (PrefParam      *param);
 

-void prefs_dialog_create       (PrefsDialog    *dialog);
-void prefs_dialog_destroy      (PrefsDialog    *dialog);
-

 void prefs_button_toggled      (GtkToggleButton        *toggle_btn,
                                 GtkWidget              *widget);
 void prefs_button_toggled_reverse      (GtkToggleButton        *toggle_btn,
 void prefs_button_toggled      (GtkToggleButton        *toggle_btn,
                                 GtkWidget              *widget);
 void prefs_button_toggled_reverse      (GtkToggleButton        *toggle_btn,

diff --git a/src/prefs_logging.h b/src/prefs_logging.h
index 796496f48946bc7367b3abd1d557717e6c2df825..7dbfaa075b5c95ee49a84abcc8a482a92c5d3c76 100644 (file)
--- a/src/prefs_logging.h
+++ b/src/prefs_logging.h
@@ -22,6 +22,6 @@
 #define PREFS_LOGGING_H
 
 void prefs_logging_init        (void);
 #define PREFS_LOGGING_H
 
 void prefs_logging_init        (void);

-void prefs_loggin_done (void);
+void prefs_logging_done        (void);

 
 #endif /* PREFS_LOGGING_H */ 
 
 #endif /* PREFS_LOGGING_H */ 

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 506c64bb9c2704fd6e6deb46563c9c7b02c63e1a..bdf2e6eb0c30c4b1ecc13d1269b3c0990a694e6d 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -50,6 +50,9 @@
 #include "matcher_parser.h"
 #include "colorlabel.h"
 
 #include "matcher_parser.h"
 #include "colorlabel.h"
 

+static void prefs_matcher_addressbook_select(void);
+static void prefs_matcher_test_info(void);
+

 enum {
        PREFS_MATCHER_COND,
        PREFS_MATCHER_COND_VALID,
 enum {
        PREFS_MATCHER_COND,
        PREFS_MATCHER_COND_VALID,


@@ -1972,12 +1975,12 @@ static DescriptionWindow test_desc_win = {
 /*!
  *\brief       Show Test action's info
  */
 /*!
  *\brief       Show Test action's info
  */

-void prefs_matcher_test_info(void)
+static void prefs_matcher_test_info(void)

 {
        description_window_create(&test_desc_win);
 }
 
 {
        description_window_create(&test_desc_win);
 }
 

-void prefs_matcher_addressbook_select(void)
+static void prefs_matcher_addressbook_select(void)

 {
        gchar *folderpath = NULL;
        gboolean ret = FALSE;
 {
        gchar *folderpath = NULL;
        gboolean ret = FALSE;

diff --git a/src/prefs_matcher.h b/src/prefs_matcher.h
index 09894a2f1acc0bfe2824b1807e595975fed89f41..076f811941f47378bf993698bd071a995bbcc5b8 100644 (file)
--- a/src/prefs_matcher.h
+++ b/src/prefs_matcher.h
@@ -26,7 +26,5 @@ typedef void PrefsMatcherSignal       (MatcherList *matchers);
 
 void prefs_matcher_open                (MatcherList *matchers,
                                 PrefsMatcherSignal *cb);
 
 void prefs_matcher_open                (MatcherList *matchers,
                                 PrefsMatcherSignal *cb);

-void prefs_matcher_test_info   (void);
-void prefs_matcher_addressbook_select  (void);

 
 #endif /* __PREFS_FILTER_H__ */
 
 #endif /* __PREFS_FILTER_H__ */

diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
index a5e1874318b61eac30d77a9e52806947f99af554..f47fcd28f8fb13ebfa072a86d7259710e592fc8e 100644 (file)
--- a/src/prefs_summary_column.c
+++ b/src/prefs_summary_column.c
@@ -42,6 +42,8 @@
 #include "gtkutils.h"
 #include "utils.h"
 
 #include "gtkutils.h"
 #include "utils.h"
 

+static void prefs_summary_column_set_config(SummaryColumnState *state);
+

 enum {
        SUMCOL_NAME,
        SUMCOL_TYPE,
 enum {
        SUMCOL_NAME,
        SUMCOL_TYPE,


@@ -401,7 +403,7 @@ SummaryColumnState *prefs_summary_column_get_config(void)
        return state;
 }
 
        return state;
 }
 

-void prefs_summary_column_set_config(SummaryColumnState *state)
+static void prefs_summary_column_set_config(SummaryColumnState *state)

 {
        SummaryColumnType type;
        gint pos;
 {
        SummaryColumnType type;
        gint pos;

diff --git a/src/prefs_summary_column.h b/src/prefs_summary_column.h
index b65bedf167f22d9802efba0dcb75f62f0485d7e5..4523c20a622cab072c23eec1e6ee0a847718fff7 100644 (file)
--- a/src/prefs_summary_column.h
+++ b/src/prefs_summary_column.h
@@ -25,6 +25,5 @@
 void prefs_summary_column_open(void);
 
 SummaryColumnState *prefs_summary_column_get_config(void);
 void prefs_summary_column_open(void);
 
 SummaryColumnState *prefs_summary_column_get_config(void);

-void prefs_summary_column_set_config(SummaryColumnState *state);

 
 #endif /* __PREFS_SUMMARY_COLUMN_H__ */
 
 #endif /* __PREFS_SUMMARY_COLUMN_H__ */

diff --git a/src/prefs_summary_open.c b/src/prefs_summary_open.c
index 3048a2d41a2cb198cb0cdb9ed0f46201eed98cea..ef289488e19be922f66ab23d7e44e40d0b720cf6 100644 (file)
--- a/src/prefs_summary_open.c
+++ b/src/prefs_summary_open.c
@@ -113,11 +113,6 @@ static gchar *action_name[7] =
         N_("Do nothing")
 };
 
         N_("Do nothing")
 };
 

-const gchar *prefs_summary_open_get_label(int act)
-{
-       return gettext(action_name[act]);
-}
-

 void prefs_summary_open_open(void)
 {
        int i = 0;
 void prefs_summary_open_open(void)
 {
        int i = 0;

diff --git a/src/procheader.c b/src/procheader.c
index 672700bab6560b7b115d566d0595892e43516324..2d9c209e20b50ae4f4fd1aa2f6b57ed2e673da55 100644 (file)
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -438,7 +438,7 @@ static HeaderEntry hentry_short[] = {{"Date:",              NULL, FALSE},
                                    {"SC-Message-Size:",NULL, FALSE},
                                    {NULL,              NULL, FALSE}};
 
                                    {"SC-Message-Size:",NULL, FALSE},
                                    {NULL,              NULL, FALSE}};
 

-HeaderEntry* procheader_get_headernames(gboolean full)
+static HeaderEntry* procheader_get_headernames(gboolean full)

 {
        return full ? hentry_full : hentry_short;
 }
 {
        return full ? hentry_full : hentry_short;
 }

diff --git a/src/procheader.h b/src/procheader.h
index 8c0a3e0704abb85ab3ffc8193a14c1543ddde226..6d53ecb05847cfbbd85e1f3ced89578cea5ece86 100644 (file)
--- a/src/procheader.h
+++ b/src/procheader.h
@@ -57,8 +57,6 @@ GPtrArray *procheader_get_header_array_asis   (FILE           *fp);
 void procheader_header_array_destroy           (GPtrArray      *harray);
 void procheader_header_free                    (Header         *header);
 
 void procheader_header_array_destroy           (GPtrArray      *harray);
 void procheader_header_free                    (Header         *header);
 

-HeaderEntry* procheader_get_headernames        (gboolean       full);
-

 void procheader_get_header_fields      (FILE           *fp,
                                         HeaderEntry     hentry[]);
 MsgInfo *procheader_parse_file         (const gchar    *file,
 void procheader_get_header_fields      (FILE           *fp,
                                         HeaderEntry     hentry[]);
 MsgInfo *procheader_parse_file         (const gchar    *file,

diff --git a/src/procmime.c b/src/procmime.c
index deab098aa5be8b6fa5eb2471ceeae867d39c95e2..50f550cc9634ec022e48e5bf050def3589b4723b 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -650,117 +650,14 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
        return 0;
 }
 
        return 0;
 }
 

-struct ContentRenderer {
-       char * content_type;
-       char * renderer;
-};
-
-static GList * renderer_list = NULL;
-
-static struct ContentRenderer *
-content_renderer_new(char * content_type, char * renderer)
-{
-       struct ContentRenderer * cr;
-
-       cr = g_new(struct ContentRenderer, 1);
-       if (cr == NULL)
-               return NULL;
-
-       cr->content_type = g_strdup(content_type);
-       cr->renderer = g_strdup(renderer);
-
-       return cr;
-}
-
-static void content_renderer_free(struct ContentRenderer * cr)
-{
-       g_free(cr->content_type);
-       g_free(cr->renderer);
-       g_free(cr);
-}
-
-void renderer_read_config(void)
-{
-       gchar buf[BUFFSIZE];
-       FILE * f;
-       gchar * rcpath;
-
-       g_list_foreach(renderer_list, (GFunc) content_renderer_free, NULL);
-       renderer_list = NULL;
-
-       rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, RENDERER_RC, NULL);
-       f = g_fopen(rcpath, "rb");
-       g_free(rcpath);
-       
-       if (f == NULL)
-               return;
-
-       while (fgets(buf, BUFFSIZE, f)) {
-               char * p;
-               struct ContentRenderer * cr;
-
-               strretchomp(buf);
-               p = strchr(buf, ' ');
-               if (p == NULL)
-                       continue;
-               * p = 0;
-
-               cr = content_renderer_new(buf, p + 1);
-               if (cr == NULL)
-                       continue;
-
-               renderer_list = g_list_append(renderer_list, cr);
-       }
-
-       fclose(f);
-}
-
-void renderer_write_config(void)
-{
-       gchar * rcpath;
-       PrefFile *pfile;
-       GList * cur;
-       int err = 0;
-       rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, RENDERER_RC, NULL);
-       
-       if ((pfile = prefs_write_open(rcpath)) == NULL) {
-               g_warning("failed to write configuration to file\n");
-               g_free(rcpath);
-               return;
-       }
-
-       g_free(rcpath);
-
-       for (cur = renderer_list ; cur != NULL ; cur = cur->next) {
-               struct ContentRenderer * renderer;
-               renderer = cur->data;
-               if (fprintf(pfile->fp, "%s %s\n", renderer->content_type,
-                       renderer->renderer) < 0) {
-                       err = TRUE;
-                       break;
-               }
-       }
-
-       if (!err) {
-               if (prefs_file_close(pfile) < 0) {
-                       g_warning("failed to write configuration to file\n");
-                       return;
-               }
-       } else {
-               prefs_file_close_revert(pfile);
-       }
-}
-
-FILE *procmime_get_text_content(MimeInfo *mimeinfo)
+static FILE *procmime_get_text_content(MimeInfo *mimeinfo)

 {
        FILE *tmpfp, *outfp;
        const gchar *src_codeset;
        gboolean conv_fail = FALSE;
        gchar buf[BUFFSIZE];
        gchar *str;
 {
        FILE *tmpfp, *outfp;
        const gchar *src_codeset;
        gboolean conv_fail = FALSE;
        gchar buf[BUFFSIZE];
        gchar *str;

-       struct ContentRenderer * renderer;
-       GList * cur;
-       gchar *tmpfile, *content_type;
+       gchar *tmpfile;

        gboolean err = FALSE;
 
        g_return_val_if_fail(mimeinfo != NULL, NULL);
        gboolean err = FALSE;
 
        g_return_val_if_fail(mimeinfo != NULL, NULL);


@@ -794,45 +691,7 @@ FILE *procmime_get_text_content(MimeInfo *mimeinfo)
                      ? forced_charset : 
                      procmime_mimeinfo_get_parameter(mimeinfo, "charset");
 
                      ? forced_charset : 
                      procmime_mimeinfo_get_parameter(mimeinfo, "charset");
 

-       renderer = NULL;
-
-       content_type = procmime_get_content_type_str(mimeinfo->type,
-                                                    mimeinfo->subtype);
-       for (cur = renderer_list ; cur != NULL ; cur = cur->next) {
-               struct ContentRenderer * cr;
-
-               cr = cur->data;
-               if (g_ascii_strcasecmp(cr->content_type, content_type) == 0) {
-                       renderer = cr;
-                       break;
-               }
-       }
-       g_free(content_type);
-
-       if (renderer != NULL) {
-               FILE * p;
-               int oldout;
-               
-               oldout = dup(1);
-               
-               dup2(fileno(outfp), 1);
-
-               p = popen(renderer->renderer, "w");
-               if (p != NULL) {
-                       size_t count;
-                       
-                       while ((count =
-                               fread(buf, sizeof(char), sizeof(buf),
-                                     tmpfp)) > 0) {
-                               if (fwrite(buf, sizeof(char), count, p) < count)
-                                       err = TRUE;
-                       }
-                       pclose(p);
-               }
-               
-               dup2(oldout, 1);
-/* CodeConverter seems to have no effect here */
-       } else if (mimeinfo->type == MIMETYPE_TEXT && !g_ascii_strcasecmp(mimeinfo->subtype, "html")) {
+       if (mimeinfo->type == MIMETYPE_TEXT && !g_ascii_strcasecmp(mimeinfo->subtype, "html")) {

                SC_HTMLParser *parser;
                CodeConverter *conv;
 
                SC_HTMLParser *parser;
                CodeConverter *conv;
 


@@ -990,7 +849,7 @@ gboolean procmime_msginfo_is_encrypted(MsgInfo *msginfo)
        return result;
 }
 
        return result;
 }
 

-gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filename,
+static gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filename,

                                   const gchar *str, StrFindFunc find_func)
 {
        FILE *outfp;
                                   const gchar *str, StrFindFunc find_func)
 {
        FILE *outfp;


@@ -2210,7 +2069,7 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
        } \
 }
 
        } \
 }
 

-int procmime_write_mime_header(MimeInfo *mimeinfo, FILE *fp)
+static int procmime_write_mime_header(MimeInfo *mimeinfo, FILE *fp)

 {
        struct TypeTable *type_table;
        ParametersData *pdata = g_new0(ParametersData, 1);
 {
        struct TypeTable *type_table;
        ParametersData *pdata = g_new0(ParametersData, 1);

diff --git a/src/procmime.h b/src/procmime.h
index e045b736fd81307009b5598f2aebda0c31ac81d7..ec0ec0fb95a17bfa1242558a149449de81654840 100644 (file)
--- a/src/procmime.h
+++ b/src/procmime.h
@@ -199,15 +199,10 @@ gboolean procmime_decode_content  (MimeInfo       *mimeinfo);
 gboolean procmime_encode_content       (MimeInfo       *mimeinfo, EncodingType encoding);
 gint procmime_get_part                 (const gchar    *outfile,
                                         MimeInfo       *mimeinfo);
 gboolean procmime_encode_content       (MimeInfo       *mimeinfo, EncodingType encoding);
 gint procmime_get_part                 (const gchar    *outfile,
                                         MimeInfo       *mimeinfo);

-FILE *procmime_get_text_content                (MimeInfo       *mimeinfo);

 FILE *procmime_get_first_text_content  (MsgInfo        *msginfo);
 FILE *procmime_get_first_encrypted_text_content
                                        (MsgInfo        *msginfo);
 
 FILE *procmime_get_first_text_content  (MsgInfo        *msginfo);
 FILE *procmime_get_first_encrypted_text_content
                                        (MsgInfo        *msginfo);
 

-gboolean procmime_find_string_part     (MimeInfo       *mimeinfo,
-                                        const gchar    *filename,
-                                        const gchar    *str,
-                                        StrFindFunc     find_func);

 gboolean procmime_find_string          (MsgInfo        *msginfo,
                                         const gchar    *str,
                                         StrFindFunc     find_func);
 gboolean procmime_find_string          (MsgInfo        *msginfo,
                                         const gchar    *str,
                                         StrFindFunc     find_func);


@@ -234,7 +229,6 @@ void procmime_force_encoding                        (EncodingType    encoding);
 gboolean procmime_msginfo_is_encrypted         (MsgInfo        *msginfo);
 
 void renderer_read_config(void);
 gboolean procmime_msginfo_is_encrypted         (MsgInfo        *msginfo);
 
 void renderer_read_config(void);

-void renderer_write_config(void);

 
 gint procmime_write_mimeinfo(MimeInfo *mimeinfo, FILE *fp);
 
 
 gint procmime_write_mimeinfo(MimeInfo *mimeinfo, FILE *fp);
 

diff --git a/src/recv.c b/src/recv.c
index fecfefea9378fd0d06079ff02339ade2f3c1b5b0..ea75b21dd2db4791eb432812f67e56aca9ffaf20 100644 (file)
--- a/src/recv.c
+++ b/src/recv.c
@@ -41,6 +41,8 @@
 
 static RecvUIFunc      recv_ui_func;
 static gpointer                recv_ui_func_data;
 
 static RecvUIFunc      recv_ui_func;
 static gpointer                recv_ui_func_data;

+static gint recv_write                 (SockInfo       *sock,
+                                        FILE           *fp);

 
 gint recv_write_to_file(SockInfo *sock, const gchar *filename)
 {
 
 gint recv_write_to_file(SockInfo *sock, const gchar *filename)
 {


@@ -73,7 +75,7 @@ gint recv_write_to_file(SockInfo *sock, const gchar *filename)
        return 0;
 }
 
        return 0;
 }
 

-gint recv_write(SockInfo *sock, FILE *fp)
+static gint recv_write(SockInfo *sock, FILE *fp)

 {
        gchar buf[BUFFSIZE];
        gint len;
 {
        gchar buf[BUFFSIZE];
        gint len;

diff --git a/src/recv.h b/src/recv.h
index 6429fcdc377409b5bd5fde1bfea44c6024e3e767..2c2c8a4829948c6063f6f45afdf9c2ff8266b2c8 100644 (file)
--- a/src/recv.h
+++ b/src/recv.h
@@ -31,8 +31,6 @@ typedef gboolean (*RecvUIFunc)        (SockInfo       *sock,
 
 gint recv_write_to_file                (SockInfo       *sock,
                                 const gchar    *filename);
 
 gint recv_write_to_file                (SockInfo       *sock,
                                 const gchar    *filename);

-gint recv_write                        (SockInfo       *sock,
-                                FILE           *fp);

 
 void recv_set_ui_func          (RecvUIFunc      func,
                                 gpointer        data);
 
 void recv_set_ui_func          (RecvUIFunc      func,
                                 gpointer        data);

diff --git a/src/sourcewindow.c b/src/sourcewindow.c
index 03b6b285ca4b7a7c9b05fc9d08802c88f05f2004..ecf0041f07cba6c2c5c62f9ca7d7909a3771fcfb 100644 (file)
--- a/src/sourcewindow.c
+++ b/src/sourcewindow.c
@@ -44,6 +44,9 @@ static gint source_window_delete_cb   (GtkWidget      *widget,
 static gboolean key_pressed            (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         SourceWindow   *sourcewin);
 static gboolean key_pressed            (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         SourceWindow   *sourcewin);

+static void source_window_append       (SourceWindow   *sourcewin,
+                                        const gchar    *str);
+static void source_window_destroy      (SourceWindow   *sourcewin);

 
 static void source_window_init()
 {
 
 static void source_window_init()
 {


@@ -118,7 +121,7 @@ void source_window_show(SourceWindow *sourcewin)
        gtk_widget_show_all(sourcewin->window);
 }
 
        gtk_widget_show_all(sourcewin->window);
 }
 

-void source_window_destroy(SourceWindow *sourcewin)
+static void source_window_destroy(SourceWindow *sourcewin)

 {
        if (sourcewin->updating) {
                debug_print("deferring destroy\n");
 {
        if (sourcewin->updating) {
                debug_print("deferring destroy\n");


@@ -169,7 +172,7 @@ void source_window_show_msg(SourceWindow *sourcewin, MsgInfo *msginfo)
        fclose(fp);
 }
 
        fclose(fp);
 }
 

-void source_window_append(SourceWindow *sourcewin, const gchar *str)
+static void source_window_append(SourceWindow *sourcewin, const gchar *str)

 {
        GtkTextView *text = GTK_TEXT_VIEW(sourcewin->text);
        GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
 {
        GtkTextView *text = GTK_TEXT_VIEW(sourcewin->text);
        GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);

diff --git a/src/sourcewindow.h b/src/sourcewindow.h
index 16e31d8e79a02fc2e81d0a303a855d3ee4da1c30..3fbe3440aae833969c6d2b60bb72a3c7f3aaf75a 100644 (file)
--- a/src/sourcewindow.h
+++ b/src/sourcewindow.h
@@ -39,10 +39,7 @@ struct _SourceWindow
 
 SourceWindow *source_window_create     (void);
 void source_window_show                        (SourceWindow   *sourcewin);
 
 SourceWindow *source_window_create     (void);
 void source_window_show                        (SourceWindow   *sourcewin);

-void source_window_destroy             (SourceWindow   *sourcewin);

 void source_window_show_msg            (SourceWindow   *sourcewin,
                                         MsgInfo        *msginfo);
 void source_window_show_msg            (SourceWindow   *sourcewin,
                                         MsgInfo        *msginfo);

-void source_window_append              (SourceWindow   *sourcewin,
-                                        const gchar    *str);

 
 #endif /* __SOURCEWINDOW_H__ */
 
 #endif /* __SOURCEWINDOW_H__ */

diff --git a/src/summaryview.c b/src/summaryview.c
index aa31890e325cfdeea495581a1704700e3df0a819..06ad94f573711ed55c8f3a37214b991de827649f 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -444,6 +444,10 @@ static void summary_find_answers   (SummaryView    *summaryview,
 static gboolean summary_update_msg     (gpointer source, gpointer data);
 static gboolean summary_update_folder_item_hook(gpointer source, gpointer data);
 static gboolean summary_update_folder_hook(gpointer source, gpointer data);
 static gboolean summary_update_msg     (gpointer source, gpointer data);
 static gboolean summary_update_folder_item_hook(gpointer source, gpointer data);
 static gboolean summary_update_folder_hook(gpointer source, gpointer data);

+static void summary_set_colorlabel_color (GtkCTree             *ctree,
+                                  GtkCTreeNode         *node,
+                                  guint                 labelcolor);
+static void summary_thread_build(SummaryView *summaryview);

 
 GtkTargetEntry summary_drag_types[2] =
 {
 
 GtkTargetEntry summary_drag_types[2] =
 {


@@ -4796,7 +4800,7 @@ static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
 
 /* thread functions */
 
 
 /* thread functions */
 

-void summary_thread_build(SummaryView *summaryview)
+static void summary_thread_build(SummaryView *summaryview)

 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCTreeNode *node;
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCTreeNode *node;

diff --git a/src/summaryview.h b/src/summaryview.h
index e34aeead4067269f6e46f25c23709a9560000fd8..26b9283e434f96c23274d2215a5732adbb40b05e 100644 (file)
--- a/src/summaryview.h
+++ b/src/summaryview.h
@@ -215,8 +215,6 @@ void summary_select_node      (SummaryView          *summaryview,
                                   gboolean              display_msg,
                                   gboolean              do_refresh);
 
                                   gboolean              display_msg,
                                   gboolean              do_refresh);
 

-void summary_thread_build        (SummaryView          *summaryview);
-

 void summary_expand_threads      (SummaryView          *summaryview);
 void summary_collapse_threads    (SummaryView          *summaryview);
 void summary_toggle_ignore_thread (SummaryView         *summaryview);
 void summary_expand_threads      (SummaryView          *summaryview);
 void summary_collapse_threads    (SummaryView          *summaryview);
 void summary_toggle_ignore_thread (SummaryView         *summaryview);


@@ -298,9 +296,6 @@ void summary_set_colorlabel   (SummaryView          *summaryview,
 void summary_set_tag             (SummaryView          *summaryview,
                                   gint                  tag_id,
                                   GtkWidget            *widget);
 void summary_set_tag             (SummaryView          *summaryview,
                                   gint                  tag_id,
                                   GtkWidget            *widget);

-void summary_set_colorlabel_color (GtkCTree            *ctree,
-                                  GtkCTreeNode         *node,
-                                  guint                 labelcolor);

 
 void summary_set_column_order    (SummaryView          *summaryview);
 
 
 void summary_set_column_order    (SummaryView          *summaryview);
 

diff --git a/src/textview.c b/src/textview.c
index 3cad0d6fc606ea0af6d869248d192dd4b02137ea..aec14f0f9477954642794587648aa0ff4c0693ae 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -551,22 +551,6 @@ void textview_reflect_prefs(TextView *textview)
                                         prefs_common.textview_cursor_visible);
 }
 
                                         prefs_common.textview_cursor_visible);
 }
 

-void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
-                          const gchar *file)
-{
-       textview->loading = TRUE;
-       textview->stop_loading = FALSE;
-
-       textview_clear(textview);
-
-       textview_add_parts(textview, mimeinfo);
-
-       textview_set_position(textview, 0);
-
-       textview->loading = FALSE;
-       textview->stop_loading = FALSE;
-}
-

 void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
 {
        START_TIMING("");
 void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
 {
        START_TIMING("");

diff --git a/src/textview.h b/src/textview.h
index c8413df77a29c15913201b98c8072c18e874f4c6..c4534135b93938eae60a046a2e59752ba06b55ab 100644 (file)
--- a/src/textview.h
+++ b/src/textview.h
@@ -88,9 +88,6 @@ TextView *textview_create             (void);
 void textview_init                     (TextView       *textview);
 void textview_reflect_prefs            (TextView       *textview);
 
 void textview_init                     (TextView       *textview);
 void textview_reflect_prefs            (TextView       *textview);
 

-void textview_show_message     (TextView       *textview,
-                                MimeInfo       *mimeinfo,
-                                const gchar    *file);

 void textview_show_part                (TextView       *textview,
                                 MimeInfo       *mimeinfo,
                                 FILE           *fp);
 void textview_show_part                (TextView       *textview,
                                 MimeInfo       *mimeinfo,
                                 FILE           *fp);

diff --git a/src/toolbar.c b/src/toolbar.c
index 521b6861ee510d577f1244d552172020ee1139ee..ed9e3c7333a7134cca85695c569c0d59f2c1d997 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -67,6 +67,7 @@
 #define TOOLBAR_ICON_TEXT   "text"     
 #define TOOLBAR_ICON_ACTION "action"    
 
 #define TOOLBAR_ICON_TEXT   "text"     
 #define TOOLBAR_ICON_ACTION "action"    
 

+static void toolbar_init(Toolbar * toolbar);

 static gboolean      toolbar_is_duplicate              (gint           action,
                                                 ToolbarType    source);
 static void   toolbar_parse_item               (XMLFile        *file,
 static gboolean      toolbar_is_duplicate              (gint           action,
                                                 ToolbarType    source);
 static void   toolbar_parse_item               (XMLFile        *file,


@@ -824,7 +825,7 @@ void toolbar_set_list_item(ToolbarItem *t_item, ToolbarType source)
                               toolbar_item);
 }
 
                               toolbar_item);
 }
 

-void toolbar_action_execute(GtkWidget    *widget,
+static void toolbar_action_execute(GtkWidget    *widget,

                            GSList       *action_list, 
                            gpointer     data,
                            gint         source) 
                            GSList       *action_list, 
                            gpointer     data,
                            gint         source) 


@@ -2375,7 +2376,8 @@ void toolbar_comp_set_sensitive(gpointer data, gboolean sensitive)
 /**
  * Initialize toolbar structure
  **/
 /**
  * Initialize toolbar structure
  **/

-void toolbar_init(Toolbar * toolbar) {
+static void toolbar_init(Toolbar * toolbar)
+{

 
        toolbar->toolbar                = NULL;
        toolbar->folders_btn            = NULL;
 
        toolbar->toolbar                = NULL;
        toolbar->folders_btn            = NULL;

diff --git a/src/toolbar.h b/src/toolbar.h
index f05c134c3be1cd623ca4b23eb7e7a03e762af4dc..ea37aeaebb6d9c9025364794e9132d2d1669d9fe 100644 (file)
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -202,11 +202,6 @@ struct _ToolbarSylpheedActions {
 };
 
 
 };
 
 

-void   toolbar_action_execute          (GtkWidget      *widget,
-                                        GSList         *action_list, 
-                                        gpointer        data,
-                                        gint            source);
-

 GList  *toolbar_get_action_items       (ToolbarType     source);
 
 void   toolbar_save_config_file        (ToolbarType     source);
 GList  *toolbar_get_action_items       (ToolbarType     source);
 
 void   toolbar_save_config_file        (ToolbarType     source);


@@ -258,7 +253,6 @@ void        toolbar_set_style               (GtkWidget      *toolbar_wid,
                                         GtkWidget      *handlebox_wid,
                                         guint           action);
 void   toolbar_destroy                 (Toolbar        *toolbar);
                                         GtkWidget      *handlebox_wid,
                                         guint           action);
 void   toolbar_destroy                 (Toolbar        *toolbar);

-void   toolbar_init                    (Toolbar        *toolbar);

 void toolbar_set_learn_button          (Toolbar        *toolbar, 
                                         LearnButtonType  learn_btn_type);
 const gchar *toolbar_get_short_text    (int action);
 void toolbar_set_learn_button          (Toolbar        *toolbar, 
                                         LearnButtonType  learn_btn_type);
 const gchar *toolbar_get_short_text    (int action);