+2003-07-20 [christoph] 0.9.3claws33
+
+ * src/compose.h
+ * src/folder.c
+ * src/folderview.h
+ * src/headerview.h
+ * src/prefs_filtering.h
+ * src/prefs_folder_item.[ch]
+ * src/procmime.h
+ * src/procmsg.h
+ * src/summaryview.h
+ clean up header mess
+ (always use 1. typedefs, 2. #includes, 3. structures)
+
+ * src/common/version.h.in
+ add casts for constants
+
+ * src/plugins/demo/demo.c
+ fix typo
+
+ * src/plugins/spamassassin/spamassassin.c
+ remove unused variable
+
2003-07-20 [alfons] 0.9.3claws32
* src/mimeview.c
MICRO_VERSION=3
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws${EXTRA_VERSION}
dnl set $target
#ifndef __VERSION_H__
#define __VERSION_H__
-#define MAKE_NUMERIC_VERSION(a, b, c, d) ((a << 24) | (b << 16) | (c << 8) | d)
+#include <glib.h>
+
+#define MAKE_NUMERIC_VERSION(a, b, c, d) ((((guint32)a) << 24) | (((guint32)b) << 16) | \
+ (((guint32)c) << 8) | ((guint32)d) )
#define PACKAGE "@PACKAGE@"
#define VERSION "@VERSION@"
#ifndef __COMPOSE_H__
#define __COMPOSE_H__
+typedef struct _Compose Compose;
+typedef struct _AttachInfo AttachInfo;
+
#include <glib.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkitemfactory.h>
-typedef struct _Compose Compose;
-typedef struct _AttachInfo AttachInfo;
-
#include "procmsg.h"
#include "procmime.h"
#include "addressbook.h"
} else {
flags->perm_flags = 0;
}
- flags->tmp_flags = MSG_CACHED;
+ flags->tmp_flags = 0;
if (FOLDER_TYPE(dest->folder) == F_MH) {
if (dest->stype == F_QUEUE) {
MSG_SET_TMP_FLAGS(*flags, MSG_QUEUED);
#ifndef __FOLDERVIEW_H__
#define __FOLDERVIEW_H__
+typedef struct _FolderView FolderView;
+
#include <glib.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkctree.h>
#include "folder.h"
-
-typedef struct _FolderView FolderView;
-
#include "mainwindow.h"
#include "summaryview.h"
void folderview_set_target_folder_color (gint color_op);
void folderview_reflect_prefs_pixmap_theme (FolderView *folderview);
+
#endif /* __FOLDERVIEW_H__ */
#include <glib.h>
#include <gtk/gtkwidget.h>
-#include "procmsg.h"
-
typedef struct _HeaderView HeaderView;
+#include "procmsg.h"
+
struct _HeaderView
{
GtkWidget *hbox;
gint plugin_init(gchar **error)
{
if ((sylpheed_get_version() > VERSION_NUMERIC)) {
- *error = g_strdup("Your sylpheed version is never then the version the plugin was build with");
+ *error = g_strdup("Your sylpheed version is newer then the version the plugin was build with");
return -1;
}
gboolean is_spam = FALSE;
FILE *fp = NULL;
struct message m;
- gchar *oldlocale = NULL;
struct sockaddr addr;
int ret;
#ifndef __PREFS_FILTERING_H__
#define __PREFS_FILTERING_H__
+#include <glib.h>
+
/*
void prefs_scoring_read_config (void);
void prefs_scoring_write_config (void);
#define SAFE_STRING(str) \
(str) ? (str) : ""
-void prefs_folder_item_create(void *folderview, FolderItem *item)
+void prefs_folder_item_create(FolderView *folderview, FolderItem *item)
{
struct PrefsFolderItemDialog *dialog;
guint rowcount;
*/
#ifndef PREFS_FOLDER_ITEM_H
-
#define PREFS_FOLDER_ITEM_H
-#include "folder.h"
#include <glib.h>
#include <sys/types.h>
+typedef struct _PrefsFolderItem PrefsFolderItem;
+
+#include "folder.h"
+#include "folderview.h"
+
struct _PrefsFolderItem {
gchar * directory;
guint color;
};
-typedef struct _PrefsFolderItem PrefsFolderItem;
-
-/* CLAWS: due a messed up circular header references using
- * void *. but this is *REALLY* a folderview */
-void prefs_folder_item_create (void *folderview, FolderItem *item);
+void prefs_folder_item_create(FolderView *folderview, FolderItem *item);
void prefs_folder_item_read_config(FolderItem * item);
void prefs_folder_item_save_config(FolderItem * item);
gint prefs_folder_item_get_sort_mode(FolderItem * item);
void prefs_folder_item_copy_prefs(FolderItem * src, FolderItem * dest);
-#endif
+#endif /* PREFS_FOLDER_ITEM_H */
typedef struct _MimeType MimeType;
typedef struct _MimeInfo MimeInfo;
-#include "procmsg.h"
-
typedef enum
{
ENC_7BIT,
MIME_UNKNOWN
} ContentType;
+#include "procmsg.h"
+
struct _MimeType
{
gchar *type;
MSG_IGNORE_THREAD = 1 << 10, /* ignore threads */
MSG_LOCKED = 1 << 11, /* msg is locked */
MSG_RETRCPT_PENDING = 1 << 12, /* return receipt pending */
-
- /* RESERVED */
- MSG_RESERVED_CLAWS = 1 << 30, /* for sylpheed-claws */
- MSG_RESERVED_MAIN = 1 << 31 /* for sylpheed-main */
} MsgPermFlags;
#define MSG_CLABEL_FLAG_MASK (MSG_CLABEL_7)
MSG_SIGNED = 1 << 21,
MSG_MIME = 1 << 29,
-
- MSG_CACHED = 1 << 31
} MsgTmpFlags;
#define MSG_CACHED_FLAG_MASK (MSG_MIME | MSG_ENCRYPTED | MSG_SIGNED)
#include "folder.h"
#include "procmime.h"
+#include "prefs_filtering.h"
struct _MsgFlags
{
MsgTmpFlags tmp_flags;
};
-#include "prefs_filtering.h"
struct _MsgInfo
{
void procmsg_msginfo_set_to_folder (MsgInfo *msginfo,
FolderItem *to_folder);
gboolean procmsg_msginfo_filter (MsgInfo *msginfo);
+
#endif /* __PROCMSG_H__ */
typedef struct _SummaryView SummaryView;
typedef struct _SummaryColumnState SummaryColumnState;
-#include "mainwindow.h"
-#include "folderview.h"
-#include "headerview.h"
-#include "messageview.h"
-#include "compose.h"
-#include "folder.h"
-#include "gtksctree.h"
-#include "prefs_filtering.h"
-
typedef enum
{
S_COL_MARK,
S_SEARCH_EXTENDED
} SummarySearchType;
+#include "mainwindow.h"
+#include "folderview.h"
+#include "headerview.h"
+#include "messageview.h"
+#include "compose.h"
+#include "folder.h"
+#include "gtksctree.h"
+#include "prefs_filtering.h"
+
extern GtkTargetEntry summary_drag_types[1];
struct _SummaryColumnState