0.9.7claws15

* src/addressbook.c
* src/addrindex.h
* src/addritem.c
* src/expldifdlg.h
* src/exportldif.c
* src/filtering.c
* src/folder.c
* src/folderview.c
* src/jpilot.c
* src/localfolder.c
* src/matcher.h
* src/matcher_parser_lex.l
* src/matcher_parser_parse.y
* src/news.c
* src/prefs_filtering_action.c
* src/prefs_folder_item.c
* src/prefs_fonts.c
* src/procmsg.c
* src/sgpgme.c
        clean up warnings

* src/procmime.c
        revert 0.9.7claws14 change

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2b1106b6b2bd7c325dd34c1992b62d7299d3d92c..687f36bfd8c141101f88243d61a9fe2b326e4e3f 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,29 @@
+2003-12-03 [christoph] 0.9.7claws15
+
+       * src/addressbook.c
+       * src/addrindex.h
+       * src/addritem.c
+       * src/expldifdlg.h
+       * src/exportldif.c
+       * src/filtering.c
+       * src/folder.c
+       * src/folderview.c
+       * src/jpilot.c
+       * src/localfolder.c
+       * src/matcher.h
+       * src/matcher_parser_lex.l
+       * src/matcher_parser_parse.y
+       * src/news.c
+       * src/prefs_filtering_action.c
+       * src/prefs_folder_item.c
+       * src/prefs_fonts.c
+       * src/procmsg.c
+       * src/sgpgme.c
+               clean up warnings
+
+       * src/procmime.c
+               revert 0.9.7claws14 change
+
 2003-12-03 [alfons]    0.9.7claws14
 
        * src/procmime.c
@@ -7,7 +33,7 @@
 
        * src/alertpanel.h
        * src/setup.c
-       * src/plugins/image_viewe/plugin.c
+       * src/plugins/image_viewer/plugin.c
                compile again, we need stddef.h for size_t
 
 2003-12-03 [paul]      0.9.7claws12

diff --git a/configure.ac b/configure.ac
index 3d801a637f9e290df353bdde92a49d5a5e1e7b6d..0afc955741c7db7617fe09171685674bbe9d159b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/addressbook.c b/src/addressbook.c
index e345f141dee111f992a19730eb3973008271dbed..f4269d7c11a7c77e8e081ad6518f6e0c328b659f 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -3686,47 +3686,6 @@ static void addressbook_lup_clicked( GtkButton *button, gpointer data ) {
        g_free( searchTerm );
 }
 
-/**
- * Browse address entry for highlighted entry.
- */
-static void addressbook_browse_entry_cb( void ) {
-       GtkCTree *clist = GTK_CTREE(addrbook.clist);
-       AddressObject *obj;
-       AddressDataSource *ds;
-       AddressInterface *iface;
-       ItemPerson *person;
-       ItemEMail *email;
-
-       if( addrbook.listSelected == NULL ) return;
-       obj = gtk_ctree_node_get_row_data( clist, addrbook.listSelected );
-       g_return_if_fail(obj != NULL);
-
-       ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
-       if( ds == NULL ) return;
-       iface = ds->interface;
-       if( ! iface->haveLibrary ) return;
-
-       person = NULL;
-       if( obj->type == ADDR_ITEM_EMAIL ) {
-               email = ( ItemEMail * ) obj;
-               if( email == NULL ) return;
-               person = ( ItemPerson * ) ADDRITEM_PARENT(email);
-       }
-       else if( obj->type == ADDR_ITEM_PERSON ) {
-               person = ( ItemPerson * ) obj;
-       }
-       else {
-               /* None of these */
-               return;
-       }
-
-       if( iface->type == ADDR_IF_LDAP ) {
-#ifdef USE_LDAP
-               browseldap_entry( ds, person->externalID );
-#endif
-       }
-}
-
 /* **********************************************************************
 * Build lookup tables.
 * ***********************************************************************

diff --git a/src/addrindex.h b/src/addrindex.h
index ef928d040f3ca03a218bd6c8846eec6795660d9e..94789c5956a63734a344a495554404124c5ad37e 100644 (file)
--- a/src/addrindex.h
+++ b/src/addrindex.h
@@ -176,6 +176,9 @@ void addrindex_remove_results               ( AddressDataSource *ds,
 gboolean addrindex_load_completion(
                gint (*callBackFunc)
                        ( const gchar *, const gchar *, const gchar * ) );
+gint addrindex_setup_explicit_search(
+       AddressDataSource *ds, const gchar *searchTerm, ItemFolder *folder,
+       void *callBackEnd, void *callBackEntry );
 
 #endif /* __ADDRINDEX_H__ */
 

diff --git a/src/addritem.c b/src/addritem.c
index 8a9adbf1edc65194b3eececc53840416241a43e4..fbda06bf0cbf3036a7eea01d48c30dd6350fb8f6 100644 (file)
--- a/src/addritem.c
+++ b/src/addritem.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "utils.h"
 #include "addritem.h"
 #include "mgutils.h"
 

diff --git a/src/common/plugin.c b/src/common/plugin.c
index 0006d1a6ed26e4357398e49bd4a076a36949724a..69159c60b85e99a2828f37ee22c9becd3f2d1fb6 100644 (file)
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -201,7 +201,7 @@ void plugin_unload_all(const gchar *type)
        }
        g_slist_free(list);
 
-       cur = g_slist_find_custom(plugin_types, type, list_find_by_string);
+       cur = g_slist_find_custom(plugin_types, (gpointer) type, list_find_by_string);
        if (cur) {
                g_free(cur->data);
                g_slist_remove(plugin_types, cur);

diff --git a/src/common/ssl.c b/src/common/ssl.c
index d472f142b8ff6cde30fa6bf3d3f4cb1d61b5d559..23b672acf4e146cce9b22bba789ba4b83f59e932 100644 (file)
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -37,7 +37,6 @@ static SSL_CTX *ssl_ctx;
 void ssl_init(void)
 {
        SSL_METHOD *meth;
-       FILE *cert_test;
 
        /* Global system initialization*/
        SSL_library_init();

diff --git a/src/expldifdlg.h b/src/expldifdlg.h
index 5fb28d646bf333dca365241bbe43b241c6c4d2e0..806fb1b556fa2a0137fe46c2bdf315ccc13dd16a 100644 (file)
--- a/src/expldifdlg.h
+++ b/src/expldifdlg.h
@@ -21,13 +21,13 @@
  * Export addressbook to HTML file.
  */
 
-#ifndef __EXPORT_HTML_H__
-#define __EXPORT_HTML_H__
+#ifndef __EXPORT_LDIF_H__
+#define __EXPORT_LDIF_H__
 
 /* Function prototypes */
-void addressbook_exp_html( AddressCache *cache );
+void addressbook_exp_ldif( AddressCache *cache );
 
-#endif /* __EXPORT_HTML_H__ */
+#endif /* __EXPORT_LDIF_H__ */
 
 /*
 * End of Source.

diff --git a/src/exportldif.c b/src/exportldif.c
index 4ade0fe50a3915c22427cc557818275b881551c4..570ee7938ee5e211d39006efddd9d4afb917b31a 100644 (file)
--- a/src/exportldif.c
+++ b/src/exportldif.c
@@ -81,8 +81,6 @@ ExportLdifCtl *exportldif_create( void ) {
  * \return ctl Export control data.
  */
 void exportldif_free( ExportLdifCtl *ctl ) {
-       GList *node;
-
        g_return_if_fail( ctl != NULL );
 
        g_free( ctl->path );

diff --git a/src/filtering.c b/src/filtering.c
index 853af400576e5003b58eb16f5118ae8dc127218e..4ffdab31a7108db8164d582e0252ab8a10c98d7a 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -487,7 +487,6 @@ gchar * filteringprop_to_string(FilteringProp * prop)
        gchar *list_str;
        gchar *action_list_str;
        gchar *filtering_str;
-        GSList * tmp;
 
         action_list_str = filteringaction_list_to_string(prop->action_list);
 

diff --git a/src/folder.c b/src/folder.c
index 10c96658589d25468e57b295f7a6031a943b799e..f84c1b84cf25b12fe450caa6be23a1a991da04c9 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -2560,7 +2560,6 @@ gint xml_attr_cmp_name(gconstpointer _a, gconstpointer _b)
 {
        XMLAttr *a = (XMLAttr *) _a;
        XMLAttr *b = (XMLAttr *) _b;
-       gint ret;
 
        return g_str_equal(a->name, b->name) ? 0 : 1;
 }

diff --git a/src/folderview.c b/src/folderview.c
index d85ce7e14b392a0dd5dd3b88048ff277168a8f0d..05767933a6aee1b8b5e749531fcb339a84ee1d7d 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2517,18 +2517,6 @@ static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *no
        g_slist_free(done);
 }
 
-static void folderview_recollapse_all_nodes(FolderView *folderview)
-{
-       GSList *list = folderview->nodes_to_recollapse;
-       if (!list) return;
-       for (; list != NULL; list = g_slist_next(list))
-               if (list->data) 
-                       gtk_ctree_collapse(GTK_CTREE(folderview->ctree), 
-                                          GTK_CTREE_NODE(list->data));
-       g_slist_free(folderview->nodes_to_recollapse);  
-       folderview->nodes_to_recollapse = NULL;
-}
-
 static void folderview_move_to_cb(FolderView *folderview) 
 {
        FolderItem *from_folder = NULL, *to_folder = NULL;

diff --git a/src/jpilot.c b/src/jpilot.c
index 5d86f878b18ccf7683bb77ce8c0e1cc59b4ca9c9..42cc1172f434bca3b5db680d1a089c899bccb851 100644 (file)
--- a/src/jpilot.c
+++ b/src/jpilot.c
@@ -574,31 +574,6 @@ static void free_mem_rec_header(mem_rec_header **mem_rh) {
        *mem_rh = NULL;
 }
 
-/* Shamelessly copied from JPilot (libplugin.c) */
-static int jpilot_free_db_list( GList **br_list ) {
-       GList *temp_list, *first;
-       buf_rec *br;
-
-       /* Go to first entry in the list */
-       first=NULL;
-       for( temp_list = *br_list; temp_list; temp_list = temp_list->prev ) {
-               first = temp_list;
-       }
-       for (temp_list = first; temp_list; temp_list = temp_list->next) {
-               if (temp_list->data) {
-                       br=temp_list->data;
-                       if (br->buf) {
-                               free(br->buf);
-                               temp_list->data=NULL;
-                       }
-                       free(br);
-               }
-       }
-       g_list_free(*br_list);
-       *br_list=NULL;
-       return 0;
-}
-
 /* Shamelessly copied from JPilot (libplugin.c) */
 /* Read file size */
 static int jpilot_get_info_size( FILE *in, int *size ) {
@@ -1658,30 +1633,6 @@ GList *jpilot_get_all_persons( JPilotFile *pilotFile ) {
        return addrcache_get_all_persons( pilotFile->addressCache );
 }
 
-/**
- * Check label list for specified label name.
- * \param ai Address info to check.
- * \param lblCheck Label name to check.
- * \return Index of label in address structure. <code>-1</code> if NULL/empty
- *         label name, <code>-2</code> if label not found.
-*/
-static gint jpilot_check_label( struct AddressAppInfo *ai, gchar *lblCheck ) {
-       gint i;
-       gchar *lblName;
-
-       if( lblCheck == NULL ) return -1;
-       if( strlen( lblCheck ) < 1 ) return -1;
-       for( i = 0; i < JPILOT_NUM_LABELS; i++ ) {
-               lblName = ai->labels[i];
-               if( lblName ) {
-                       if( strlen( lblName ) ) {
-                               if( g_strcasecmp( lblName, lblCheck ) == 0 ) return i;
-                       }
-               }
-       }
-       return -2;
-}
-
 /**
  * Validate that all parameters specified.
  * \param pilotFile  JPilot control data.

diff --git a/src/localfolder.c b/src/localfolder.c
index bd2115354344271f24463da4e0ed5e572eab9c64..b348799ad0905e94b22c4cdee0ff92c27eb9cf11 100644 (file)
--- a/src/localfolder.c
+++ b/src/localfolder.c
@@ -60,7 +60,6 @@ XMLTag *folder_local_get_xml(Folder *_folder)
 {
        LocalFolder *folder = LOCAL_FOLDER(_folder);
        XMLTag *tag;
-       XMLAttr *attr;
 
        tag = folder_get_xml(_folder);
 

diff --git a/src/matcher.h b/src/matcher.h
index 9060fb9af0b621dcdcd3e1018ece1c22a05a5a5c..eb0fab99bdb99dcd050a27dfe413ba0cc4900455 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -172,6 +172,5 @@ gchar *matching_build_command               (const gchar    *cmd,
 
 void prefs_matcher_read_config         (void);
 void prefs_matcher_write_config                (void);
-void *matcher_parser_scan_string        (gchar          *str);
 
 #endif

diff --git a/src/matcher_parser_lex.l b/src/matcher_parser_lex.l
index 4437b35a4ec2b79411c26b214506affb2b839488..1fcdb70b76d07e1265bff34bfbb858005ef0152b 100644 (file)
--- a/src/matcher_parser_lex.l
+++ b/src/matcher_parser_lex.l
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <glib.h>
 
+#include "matcher.h"
 #include "matcher_parser_lex.h"
 #include "matcher_parser_parse.h"
 

diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y
index ef875784fe62ee99e68e98de7c5e377f812ab775..9e4c51e76714dcf0646b2f151469ab24f7b4b10a 100644 (file)
--- a/src/matcher_parser_parse.y
+++ b/src/matcher_parser_parse.y
@@ -1016,7 +1016,6 @@ MATCHER_EXECUTE MATCHER_STRING
 }
 | MATCHER_ADD_SCORE MATCHER_INTEGER
 {
-       gint action_type = MATCHACTION_ADD_SCORE;
         gint score = 0;
         
         score = strtol($2, NULL, 10);
@@ -1025,7 +1024,6 @@ MATCHER_EXECUTE MATCHER_STRING
 }
 | MATCHER_SET_SCORE MATCHER_INTEGER
 {
-       gint action_type = MATCHACTION_SET_SCORE;
         gint score = 0;
         
         score = strtol($2, NULL, 10);

diff --git a/src/news.c b/src/news.c
index b02ffd6e301a1c9e80778c133e56f27c2e0dd580..adecc70ab8bf73295df6c5a71cd5165f09cbca18 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -604,7 +604,7 @@ static MsgInfo *news_parse_xover(const gchar *xover_str)
 {
        MsgInfo *msginfo;
        gchar buf[NNTPBUFSIZE];
-       gchar *subject, *sender, *size, *line, *date, *msgid, *ref, *tmp, *xref;
+       gchar *subject, *sender, *size, *line, *date, *msgid, *ref, *tmp;
        gchar *p;
        gint num, size_int, line_int;
        gchar *xover_buf;

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 231ddde6773a512caba943e571f0eb4ab0448cdd..d24db9ff7d520536e9e4162761b9391e9b8e241e 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -46,6 +46,7 @@
 #include "alertpanel.h"
 #include "folder.h"
 #include "description_window.h"
+#include "addr_compl.h"
 
 #include "matcher_parser.h"
 #include "colorlabel.h"
@@ -605,7 +606,6 @@ static void prefs_filtering_action_set_dialog(GSList *action_list)
 static GSList *prefs_filtering_action_get_list(void)
 {
        gchar *action_str;
-       FilteringAction *action;
        gint row = 1;
        GSList *action_list;
 

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index de33df5e35eeb305c907e2ce9e56fa1f99527722..dabfd25e9683fb5bbb9574be2296b41ee7dae7df 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -228,8 +228,6 @@ void prefs_folder_item_general_save_func(PrefsPage *_page)
        gchar *buf;
        struct FolderItemGeneralPage *page = (struct FolderItemGeneralPage *) _page;
        FolderItemPrefs *prefs = page->item->prefs;
-       gboolean   old_simplify_val;
-       gchar     *old_simplify_str;
 
        g_return_if_fail(prefs != NULL);
 
@@ -288,8 +286,6 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * _page,
 #if USE_ASPELL
        GtkWidget *checkbtn_enable_default_dictionary;
        GtkWidget *optmenu_default_dictionary;
-       GtkWidget *optmenu_default_dictionary_menu;
-       GtkWidget *opemenu_default_dictionary_menuitem;
 #endif
        GList *cur_ac;
        GList *account_list;

diff --git a/src/prefs_fonts.c b/src/prefs_fonts.c
index d745c9bb16129e162601a0602e171a3bc1c70a89..5fcec3b0976d7c1f8485e751d226bec9d62fb715 100644 (file)
--- a/src/prefs_fonts.c
+++ b/src/prefs_fonts.c
@@ -40,6 +40,8 @@
 #include "gtk/gtkutils.h"
 #include "gtk/prefswindow.h"
 
+#include "manage_window.h"
+
 typedef struct _FontsPage
 {
        PrefsPage page;
@@ -139,8 +141,6 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        FontsPage *prefs_fonts = (FontsPage *) _page;
 
        GtkWidget *table;
-       GtkWidget *frame_font;
-       GtkWidget *table1;
        GtkWidget *label_textfont;
        GtkWidget *entry_textfont;
        GtkWidget *entry_smallfont;

diff --git a/src/procmime.c b/src/procmime.c
index 41fa8286fdee1c813a442d9e72628cdce7b96ec3..b9c1b57bec6f501cc2a09bd1e1529afdc842ce88 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1090,6 +1090,8 @@ static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mim
        g_return_if_fail(content_type != NULL);
        g_return_if_fail(mimeinfo != NULL);
        
+       mimeinfo->type = MIMETYPE_UNKNOWN;
+
        /* Split content type into parts and remove trailing
           and leading whitespaces from all strings */
        content_type_parts = g_strsplit(content_type, ";", 0);
@@ -1098,7 +1100,6 @@ static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mim
        }
 
        /* Get mimeinfo->type and mimeinfo->subtype */
-       mimeinfo->type = MIMETYPE_UNKNOWN;
        str = content_type_parts[0];
        if (str == NULL) {
                g_strfreev(content_type_parts);
@@ -1185,9 +1186,7 @@ void procmime_parse_mimepart(MimeInfo *parent,
        mimeinfo->offset = offset;
        mimeinfo->length = length;
 
-       /* RFC 2045, page 13 says that the mime subtype is MANDATORY; if
-        * it's not available than don't parse */
-       if (content_type != NULL && strchr(content_type, '/')) {
+       if (content_type != NULL) {
                procmime_parse_content_type(content_type, mimeinfo);
        } else {
                mimeinfo->type = MIMETYPE_TEXT;

diff --git a/src/procmsg.c b/src/procmsg.c
index 62c5bb8f62d86a05e8f0165f472239147f031c40..c941a993be63be097a1c21e701b73778981ef396 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -124,16 +124,6 @@ struct MarkSum {
        gint first;
 };
 
-static gboolean procmsg_ignore_node(GNode *node, gpointer data)
-{
-       MsgInfo *msginfo = (MsgInfo *)node->data;
-       
-       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
-       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
-
-       return FALSE;
-}
-
 /* CLAWS subject threading:
   
   in the first round it inserts subject lines in a 

diff --git a/src/sgpgme.c b/src/sgpgme.c
index 4f23097be7f8c4869c3613b815c7771f49e982a6..0b655643a0176a5e33269db0b8329fcba356b77c 100644 (file)
--- a/src/sgpgme.c
+++ b/src/sgpgme.c
@@ -184,7 +184,7 @@ gchar *sgpgme_sigstat_info_full(GpgmeCtx ctx, GpgmeSigStat status)
                if (sigstatus != GPGME_SIG_STAT_BAD) {
                        gint j = 1;
                        
-                       while (uid = gpgme_key_get_string_attr(key, GPGME_ATTR_USERID, NULL, j)) {
+                       while ((uid = gpgme_key_get_string_attr(key, GPGME_ATTR_USERID, NULL, j)) != 0) {
                                g_string_sprintfa(siginfo,
                                        _("                aka \"%s\"\n"),
                                        uid);