diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mainwindow.h | 9 | ||||
| -rw-r--r-- | src/passphrase.c | 2 | ||||
| -rw-r--r-- | src/prefs_account.c | 3 | ||||
| -rw-r--r-- | src/prefs_common.c | 7 | ||||
| -rw-r--r-- | src/prefs_common.h | 5 | ||||
| -rw-r--r-- | src/summaryview.h | 25 |
7 files changed, 6 insertions, 46 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f2b78da6..9be8d52b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,6 +4,7 @@ bin_PROGRAMS = sylpheed sylpheed_SOURCES = \ defs.h \ + enums.h \ version.h \ main.c main.h \ mainwindow.c mainwindow.h \ diff --git a/src/mainwindow.h b/src/mainwindow.h index 01f9c552..3184ca8b 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -27,6 +27,7 @@ typedef struct _MainWindow MainWindow; +#include "enums.h" #include "folderview.h" #include "summaryview.h" #include "headerview.h" @@ -42,14 +43,6 @@ typedef enum SEPARATE_BOTH = (SEPARATE_FOLDER | SEPARATE_MESSAGE) } SeparateType; -typedef enum -{ - TOOLBAR_NONE = 0, - TOOLBAR_ICON = 1, - TOOLBAR_TEXT = 2, - TOOLBAR_BOTH = 3 -} ToolbarStyle; - struct _MainWindow { SeparateType type; diff --git a/src/passphrase.c b/src/passphrase.c index c567046f..d4f50489 100644 --- a/src/passphrase.c +++ b/src/passphrase.c @@ -41,6 +41,7 @@ #include <gtk/gtkbutton.h> #include <gtk/gtkfilesel.h> #include <gtk/gtksignal.h> +#include <gtk/gtkstock.h> #include <string.h> #include <sys/types.h> #include <sys/mman.h> @@ -49,6 +50,7 @@ #include "prefs_common.h" #include "manage_window.h" #include "utils.h" +#include "gtkutils.h" static gboolean grab_all = FALSE; diff --git a/src/prefs_account.c b/src/prefs_account.c index 9f80a811..b6d15fba 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -26,11 +26,8 @@ #include <glib.h> #include <glib/gi18n.h> #include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> #include <string.h> #include <stdlib.h> -#include <ctype.h> #include "prefs.h" #include "prefs_account.h" diff --git a/src/prefs_common.c b/src/prefs_common.c index 85589377..3557cdb3 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -26,11 +26,6 @@ #include <glib.h> #include <glib/gi18n.h> #include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> #include <errno.h> #include "main.h" @@ -39,8 +34,6 @@ #include "filter.h" #include "codeconv.h" #include "utils.h" -#include "folder.h" -#include "socket.h" PrefsCommon prefs_common; diff --git a/src/prefs_common.h b/src/prefs_common.h index 9a42ac3f..afc5f1d0 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -28,11 +28,8 @@ typedef struct _PrefsCommon PrefsCommon; +#include "enums.h" #include "prefs.h" -#include "mainwindow.h" -#include "summaryview.h" -//#include "codeconv.h" -//#include "textview.h" typedef enum { RECV_DIALOG_ALWAYS, diff --git a/src/summaryview.h b/src/summaryview.h index d644be56..20737671 100644 --- a/src/summaryview.h +++ b/src/summaryview.h @@ -31,6 +31,7 @@ typedef struct _SummaryView SummaryView; typedef struct _SummaryColumnState SummaryColumnState; +#include "enums.h" #include "mainwindow.h" #include "folderview.h" #include "headerview.h" @@ -41,30 +42,6 @@ typedef struct _SummaryColumnState SummaryColumnState; typedef enum { - S_COL_MARK, - S_COL_UNREAD, - S_COL_MIME, - S_COL_SUBJECT, - S_COL_FROM, - S_COL_DATE, - S_COL_SIZE, - S_COL_NUMBER, - - S_COL_MSG_INFO, - - S_COL_LABEL, - S_COL_TO, - - S_COL_FOREGROUND, - S_COL_BOLD, - - N_SUMMARY_COLS -} SummaryColumnType; - -#define N_SUMMARY_VISIBLE_COLS S_COL_MSG_INFO - -typedef enum -{ SUMMARY_NONE, SUMMARY_SELECTED_NONE, SUMMARY_SELECTED_SINGLE, |