commit f96c05da22900e8b9b12c875dcefbafe3d544071 parent a779100e89f76b46207774de124576ca9f5530df Author: Oliver Lowe <o@olowe.co> Date: Fri, 5 Sep 2025 10:21:18 +1000 Delete leftover autoconf... config Diffstat:
86 files changed, 14 insertions(+), 447 deletions(-)
diff --git a/claws-mail.pc.in b/claws-mail.pc.in @@ -1,14 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -pkglibdir=${libdir}/@PACKAGE@ -pkgincludedir=${includedir}/@PACKAGE@ -plugindir=${pkglibdir}/plugins - -Name: Claws Mail -Description: Claws Mail -Version: @MAJOR_VERSION@.@MINOR_VERSION@.@MICRO_VERSION@.@EXTRA_VERSION@ - -Cflags: -I${pkgincludedir}/common -I${pkgincludedir}/gtk @GPGME_CFLAGS@ -I${pkgincludedir} diff --git a/src/action.c b/src/action.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> @@ -30,9 +25,6 @@ #ifdef GDK_WINDOWING_X11 # include <gdk/gdkx.h> #endif /* GDK_WINDOWING_X11 */ -#ifdef GDK_WINDOWING_QUARTZ -# include <gdk/gdkquartz.h> -#endif /* GDK_WINDOWING_QUARTZ */ #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/addrbook.c b/src/addrbook.c @@ -18,11 +18,6 @@ /* General functions for accessing address book files */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <glib.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/addrduplicates.c b/src/addrduplicates.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> diff --git a/src/addressadd.c b/src/addressadd.c @@ -20,11 +20,6 @@ * Add address to address book dialog. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/addressbook.c b/src/addressbook.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/addressbook_foldersel.c b/src/addressbook_foldersel.c @@ -20,11 +20,6 @@ * Add address to address book dialog. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/addrgather.c b/src/addrgather.c @@ -20,11 +20,6 @@ * Dialog for gathering EMail addresses from mail folder. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/addrharvest.c b/src/addrharvest.c @@ -20,11 +20,6 @@ * Functions for an E-Mail address harvester. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <sys/stat.h> #include <glib.h> #include <string.h> diff --git a/src/addrindex.c b/src/addrindex.c @@ -16,15 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* - * General functions for accessing address index file. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/addrmerge.c b/src/addrmerge.c @@ -15,12 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> diff --git a/src/alertpanel.c b/src/alertpanel.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <stddef.h> #include <glib.h> @@ -197,7 +192,7 @@ void alertpanel_error_log(const gchar *format, ...) strretchomp(buf); mainwin = mainwindow_get_mainwindow(); - + if (mainwin && mainwin->logwin) { mainwindow_clear_error(mainwin); val = alertpanel_full(_("Error"), buf, NULL, _("_Close"), NULL, @@ -218,7 +213,7 @@ static void alertpanel_show(void) manage_window_set_transient(GTK_WINDOW(window)); gtk_widget_show_all(window); value = G_ALERTWAIT; - + display = gdk_display_get_default(); seat = gdk_display_get_default_seat(display); device = gdk_seat_get_pointer(seat); @@ -278,7 +273,7 @@ static void alertpanel_create(const gchar *title, gtk_window_set_title(GTK_WINDOW(window), title); gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_modal(GTK_WINDOW(window), TRUE); - + gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(alertpanel_deleted), @@ -295,7 +290,7 @@ static void alertpanel_create(const gchar *title, gtk_container_set_border_width(GTK_CONTAINER(hbox), 12); gtk_container_add (GTK_CONTAINER(content_area), hbox); - + /* title icon */ switch (alert_type) { case ALERT_QUESTION: @@ -321,10 +316,10 @@ static void alertpanel_create(const gchar *title, gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); - + gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); - + label = gtk_label_new(title_full); gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); @@ -356,7 +351,7 @@ static void alertpanel_create(const gchar *title, gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD_CHAR); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); gtk_widget_show(label); - + /* Claws: custom widget */ if (custom_widget) { gtk_box_pack_start(GTK_BOX(vbox), custom_widget, FALSE, diff --git a/src/avatars.c b/src/avatars.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <glib.h> #include <glib/gi18n.h> #include <gtk/gtk.h> diff --git a/src/common/codeconv.h b/src/common/codeconv.h @@ -14,16 +14,12 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * + * */ #ifndef __CODECONV_H__ #define __CODECONV_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <glib.h> #include <iconv.h> diff --git a/src/common/defs.h b/src/common/defs.h @@ -19,10 +19,6 @@ #ifndef __DEFS_H__ #define __DEFS_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #define INBOX_DIR "inbox" #define OUTBOX_DIR "sent" #define QUEUE_DIR "queue" diff --git a/src/common/file-utils.h b/src/common/file-utils.h @@ -19,10 +19,6 @@ #ifndef __CLAWS_IO_H__ #define __CLAWS_IO_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <stdio.h> #include <glib.h> diff --git a/src/common/log.h b/src/common/log.h @@ -14,16 +14,12 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * + * */ #ifndef LOG_H #define LOG_H -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <glib.h> #define LOG_APPEND_TEXT_HOOKLIST "log_append_text" @@ -57,7 +53,7 @@ struct _LogText { LogInstance instance; gchar *text; - LogType type; + LogType type; }; /* logging */ diff --git a/src/common/session.h b/src/common/session.h @@ -20,10 +20,6 @@ #ifndef __SESSION_H__ #define __SESSION_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <glib.h> #include <time.h> diff --git a/src/common/smtp.h b/src/common/smtp.h @@ -20,10 +20,6 @@ #ifndef __SMTP_H__ #define __SMTP_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <glib.h> #include "session.h" diff --git a/src/common/socket.h b/src/common/socket.h @@ -19,10 +19,6 @@ #ifndef __SOCKET_H__ #define __SOCKET_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <glib.h> #include <netdb.h> diff --git a/src/common/ssl.h b/src/common/ssl.h @@ -20,10 +20,6 @@ #ifndef __SSL_H__ #define __SSL_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - typedef enum { SSL_NONE, SSL_TUNNEL, diff --git a/src/common/ssl_certificate.h b/src/common/ssl_certificate.h @@ -21,10 +21,6 @@ #ifndef __SSL_CERTIFICATE_H__ #define __SSL_CERTIFICATE_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <gnutls/gnutls.h> #include <gnutls/x509.h> diff --git a/src/common/utils.h b/src/common/utils.h @@ -23,10 +23,6 @@ #ifndef __UTILS_H__ #define __UTILS_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <glib.h> #include <glib-object.h> #include <stdio.h> diff --git a/src/compose.c b/src/compose.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #ifndef PANGO_ENABLE_ENGINE diff --git a/src/customheader.c b/src/customheader.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <glib.h> #include <string.h> #include <stdlib.h> diff --git a/src/displayheader.c b/src/displayheader.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <glib.h> #include "displayheader.h" diff --git a/src/editaddress.c b/src/editaddress.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/editbook.c b/src/editbook.c @@ -20,11 +20,6 @@ * Edit new address book entry. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/editgroup.c b/src/editgroup.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/entity.c b/src/entity.c @@ -15,10 +15,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#include "claws-features.h" -#endif #include "utils.h" diff --git a/src/etpan/etpan-ssl.h b/src/etpan/etpan-ssl.h @@ -21,10 +21,6 @@ #ifndef __ETPAN_SSL_H__ #define __ETPAN_SSL_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <libetpan/libetpan.h> gboolean etpan_certificate_check(mailstream *imap_stream, const char *host, gint port, gboolean accept_if_valid); diff --git a/src/export.c b/src/export.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/folder.c b/src/folder.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <glib.h> #include <glib/gi18n.h> diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h @@ -19,10 +19,6 @@ #ifndef __GTKUTILS_H__ #define __GTKUTILS_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <glib.h> #include <gdk/gdk.h> #include <gtk/gtk.h> diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/html.c b/src/html.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <glib.h> #include <stdio.h> #include <string.h> diff --git a/src/imap.c b/src/imap.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/imap_gtk.c b/src/imap_gtk.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/imap_gtk.h b/src/imap_gtk.h @@ -14,17 +14,12 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * + * */ #ifndef IMAP_GTK_H #define IMAP_GTK_H -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - - #include <glib.h> #include "folder.h" diff --git a/src/import.c b/src/import.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/inc.h b/src/inc.h @@ -20,10 +20,6 @@ #ifndef __INC_H__ #define __INC_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <glib.h> #include "mainwindow.h" diff --git a/src/manual.c b/src/manual.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/mbox.c b/src/mbox.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <stdio.h> #include "defs.h" #include <glib.h> diff --git a/src/message_search.c b/src/message_search.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/messageview.h b/src/messageview.h @@ -19,10 +19,6 @@ #ifndef __MESSAGEVIEW_H__ #define __MESSAGEVIEW_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <glib.h> #include <gtk/gtk.h> diff --git a/src/mh.c b/src/mh.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/mh_gtk.c b/src/mh_gtk.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/mimeview.c b/src/mimeview.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/msgcache.c b/src/msgcache.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <stdio.h> diff --git a/src/msgcache.h b/src/msgcache.h @@ -20,10 +20,6 @@ #ifndef __MSGCACHE_H__ #define __MSGCACHE_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <sys/types.h> typedef struct _MsgCache MsgCache; diff --git a/src/noticeview.c b/src/noticeview.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/oauth2.c b/src/oauth2.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> #ifdef ENABLE_NLS diff --git a/src/password.c b/src/password.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#include "claws-features.h" -#endif - # include <gnutls/gnutls.h> # include <gnutls/crypto.h> diff --git a/src/passwordstore.c b/src/passwordstore.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#include "claws-features.h" -#endif - # include <gnutls/gnutls.h> # include <gnutls/crypto.h> diff --git a/src/pop.c b/src/pop.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <glib.h> #include <glib/gi18n.h> #include <stdio.h> diff --git a/src/prefs_account.c b/src/prefs_account.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <sys/socket.h> diff --git a/src/prefs_account.h b/src/prefs_account.h @@ -20,9 +20,6 @@ #ifndef PREFS_ACCOUNT_H #define PREFS_ACCOUNT_H -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif #include "ssl.h" typedef struct _PrefsAccount PrefsAccount; diff --git a/src/prefs_actions.c b/src/prefs_actions.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/prefs_common.c b/src/prefs_common.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/prefs_common.h b/src/prefs_common.h @@ -19,10 +19,6 @@ #ifndef __PREFS_COMMON_H__ #define __PREFS_COMMON_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <glib.h> #include "mainwindow.h" diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <stdio.h> diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/prefs_ext_prog.c b/src/prefs_ext_prog.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <stdio.h> diff --git a/src/prefs_folder_column.c b/src/prefs_folder_column.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> @@ -516,7 +511,6 @@ static void prefs_folder_column_remove(void) GtkListStore *stock_store, *shown_store; GtkTreeIter shown_sel, stock_sel, stock_add; gboolean stock_sel_valid; - gchar *name; FolderColumnType type; stock_store = GTK_LIST_STORE(gtk_tree_view_get_model diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c @@ -20,11 +20,6 @@ * folderlist.xml!!! the old folderitemrc file will only serve for a few * versions (for compatibility) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c @@ -17,17 +17,11 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - -#include <stdio.h> - #include <glib.h> #include <glib/gi18n.h> #include <gtk/gtk.h> #include <stdlib.h> +#include <stdio.h> #include <string.h> #include <unistd.h> #include <errno.h> diff --git a/src/prefs_message.c b/src/prefs_message.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <stdio.h> diff --git a/src/prefs_other.c b/src/prefs_other.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <stdio.h> diff --git a/src/prefs_receive.c b/src/prefs_receive.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <stdio.h> diff --git a/src/prefs_send.c b/src/prefs_send.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <stdio.h> diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/prefs_summary_open.c b/src/prefs_summary_open.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/prefs_themes.c b/src/prefs_themes.c @@ -16,10 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "defs.h" #include <stdio.h> diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c @@ -16,15 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* - * General functions for accessing address book files. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/prefs_wrapping.c b/src/prefs_wrapping.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <stdio.h> diff --git a/src/procheader.c b/src/procheader.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <glib.h> #include <glib/gi18n.h> #include <stdio.h> diff --git a/src/procmime.c b/src/procmime.c @@ -16,13 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - -#include <stdio.h> - #include "defs.h" #include <glib.h> @@ -30,6 +23,7 @@ #include <string.h> #include <locale.h> #include <ctype.h> +#include <stdio.h> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> diff --git a/src/procmime.h b/src/procmime.h @@ -14,16 +14,12 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * + * */ #ifndef __PROCMIME_H__ #define __PROCMIME_H__ -#ifdef HAVE_CONFIG_H -#include "claws-features.h" -#endif - #include <gio/gio.h> #include <gtk/gtk.h> diff --git a/src/send_message.c b/src/send_message.c @@ -17,11 +17,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/setup.c b/src/setup.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <stddef.h> #include <glib.h> #include <glib/gi18n.h> diff --git a/src/statusbar.c b/src/statusbar.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <glib.h> #include <glib/gi18n.h> #include <gtk/gtk.h> diff --git a/src/textview.c b/src/textview.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/toolbar.c b/src/toolbar.c @@ -16,11 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include "defs.h" #include <glib.h> diff --git a/src/undo.c b/src/undo.c @@ -19,11 +19,6 @@ /* code ported from gedit */ /* This is for my patient girlfirend Regina */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#include "claws-features.h" -#endif - #include <glib.h> #include <string.h> /* for strlen */