Commit Diff

Commit:
f96c05da22900e8b9b12c875dcefbafe3d544071
From:
Oliver Lowe <o@olowe.co>
Date:
Message:
Delete leftover autoconf... config
Actions:
Patch | Tree
commit - a779100e89f76b46207774de124576ca9f5530df
commit + f96c05da22900e8b9b12c875dcefbafe3d544071
blob - 8f0e4d00f6566c18b7fdc7331f04a4e5ef0d2e9b (mode 644)
blob + /dev/null
--- claws-mail.pc.in
+++ /dev/null
@@ -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}
blob - 175376d40dc051650c9ebeeb481f2c6e92ba9431
blob + d10aef5c51fece8ff2a1310313146772962cb527
--- src/action.c
+++ 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>
blob - ba0b8ceff93efb4e170c7256677894fffa0246b7
blob + ccbcba63d7cc6260879020ea010560c1c574b9ab
--- src/addrbook.c
+++ 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>
blob - d0891fdf3eff0183773be1c4e4749157acd9d7c3
blob + bf273d16327f3a7870c55dc043eb2f0c419922d2
--- src/addrduplicates.c
+++ 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>
blob - 4ab092d45074160ef63d49cda0960223d4af7491
blob + a15d145773743476be964b1e51d4769e09f3c00e
--- src/addressadd.c
+++ 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>
blob - cd59bb852e33d5d1467073822158c5a238934851
blob + 37433177e3c791c36fa7bb9c4865a25fa369d2c5
--- src/addressbook.c
+++ 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>
blob - 879726e1ec9cb82c9c88f518eec3268d3bce6940
blob + 10f5c8bd6e239ed9a8072a517a9b533dfeab4df7
--- src/addressbook_foldersel.c
+++ 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>
blob - 375008232cbfa3a579c800e1bf45f90843a02c43
blob + d4bead76da0358a339ea609131ef1735885656d6
--- src/addrgather.c
+++ 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>
blob - 962ef80eebc9a301570248d671ca55fbc4e23d8d
blob + 88d27961e579006be38800e90b10fd88175f171c
--- src/addrharvest.c
+++ 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>
blob - d9d7a8c3282c89e0787c582c524063331dcb3e3f
blob + d8a6047e6068a06e30f7de04444c00d4e4fa0eea
--- src/addrindex.c
+++ 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>
blob - b16b843e72a176b07b2cd0cacdf8213979f39c1a
blob + f28511823e8aa91231e1a1aa71af322d7e28ee20
--- src/addrmerge.c
+++ 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>
blob - bee3feeb3acd914164bf4b3a4788c146c7fff635
blob + 4b596f836473f94b9ea7cc2f1da8c3a4fc770416
--- src/alertpanel.c
+++ 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,
blob - 3ef6191cc2ab93e97147c2fbce270a95488afd81
blob + 201fe7f8a5e1dc08ae486163983f69cd28e3a891
--- src/avatars.c
+++ 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>
blob - 8b080929df0b87706b8eeeac16c2e6307beb4062
blob + 3f87d0a73b5b0a3baa0ad3e60238325d4b1a171f
--- src/common/codeconv.h
+++ 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>
 
blob - 8cb893eaf9445dc05be81c929724fcf1d404d6fb
blob + d928900c1b4e50afbbf05609ab65b89eef723dd5
--- src/common/defs.h
+++ 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"
blob - 295e7976638bcbeb5ef3f0b06da4f9463f2f4769
blob + a1a180d3ecd0de5c14dd386047970f9142a7fbf4
--- src/common/file-utils.h
+++ 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>
 
blob - e8866de26a55c225db7bfb4dc8a635f6326e09bd
blob + 0349c66a0e1fca7a106925e8c7d148673501f52a
--- src/common/log.h
+++ 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 */
blob - 2d8ccb012c2dfb2ab48f43d9ecff1616083eaa41
blob + da82bd239131a3dfe4afc1d05463c07a0a9578bf
--- src/common/session.h
+++ 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>
blob - 6641ee5d762786c9b53eeea2a4a5551299040bda
blob + cb4c89607d6af9714797f0d690137dcc217c6463
--- src/common/smtp.h
+++ 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"
blob - 6cb3bf2e55e24fad696f842573cb338bfa3fb971
blob + fad6b2b907288bf25ff4111764c80b6a6f78c1b5
--- src/common/socket.h
+++ 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>
 
blob - 2dbb02dc06d0aeef34d27f9dd75f7e898038c477
blob + e305d12679e593ae7ecd2256f2a30e2911a6d1f8
--- src/common/ssl.h
+++ 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,
blob - 6f33cd5ef02c75afdf9982368ff11274a31fb5f2
blob + c0b36131876326466234ff939075882c2ac95eec
--- src/common/ssl_certificate.h
+++ 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>
 
blob - a3e8a3fbb13db917bdc9b508b95d9751863ec07c
blob + dc119cefc6df2142b35b0ddbe82e20bff5dfe7fe
--- src/common/utils.h
+++ 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>
blob - a6e4db599f826dd67ad9744c6e2dec9bb32b97c9
blob + 8bd128a689ce71dce982a2650be135a81c8f6bda
--- src/compose.c
+++ 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
blob - 3bd64ad26e83f3524f29acd6bbab333d202ec684
blob + 2e686015adbcacec80a12c9ec3fa542bdd27ed9e
--- src/customheader.c
+++ 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>
blob - c279a1ccbd6e9addf0d96d89e3b8bceaafe03b91
blob + bbb2a395e074bac3dcb09e0a3c5e1b3e6cef61b8
--- src/displayheader.c
+++ 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"
blob - 4e64b9e6e5f67681b4f0f252bf92d3da8d97a0d9
blob + 36c8e1f16a1d49b8d87394a563b675205ca43797
--- src/editaddress.c
+++ 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>
blob - 65466df5c09a8867479f0be341592dcf93c1f720
blob + 80c0b9bf65feac4630ab9301eea8d88a48757bd4
--- src/editbook.c
+++ 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>
blob - d2507748a3e4fed794050f10854e0dba7626c942
blob + 1548de9155cd3f31f51e168e6f9cb30c8c2022db
--- src/editgroup.c
+++ 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>
blob - 1c9098945c2a65d0aeb09fbf76a8caf363d3a761
blob + e892e6d197022fc8c0ac4b0784b30f81f6888217
--- src/entity.c
+++ 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"
 
blob - 4a285f7376bfd2c338cbcdebafd18c26054af9c3
blob + 851e90c5e3c9b43ff1b08d348acdd0810c738acd
--- src/etpan/etpan-ssl.h
+++ 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);
blob - ba3c595730593bef6151f6189332dccc3a600da6
blob + 2d29ee5f78448955e7e95fc357c4117142309068
--- src/export.c
+++ 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>
blob - 5a03fae815e48f756e80ae455a55663d16fec102
blob + e1a219153a2ccf325458ccdba6f7394dbb5c4f88
--- src/folder.c
+++ 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>
blob - 3d6a77763cd6c1369c216d8f196bd0524ba832c5
blob + f11bc2e5f5c07583f5edf49b0596c3f262f2ab12
--- src/folder_item_prefs.c
+++ 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>
 
blob - 707cc88382da7354ed2bd9e1a7fc58f84805e13d
blob + 65f3b4c72745b3d6acc2bd178e5ef9fa1cb1ba4c
--- src/gtk/gtkutils.h
+++ 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>
blob - 9e15d09e0a0737006b24bd17795285cd7bc422b3
blob + e1288253cdb2b5fc089b728ce09f306333438850
--- src/gtk/icon_legend.c
+++ 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>
blob - bd05b99ff385e7ba14295fa0b52b12a4a70f6b3d
blob + efb311b23b60e9f0782234eb0a86846d9ffb4ca3
--- src/html.c
+++ 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>
blob - 0dfecab1c2342a29928dd0d3a68f5ca8a5e75462
blob + 0812abdd4091ba2a2ce5738d63f52f72a019edda
--- src/imap.c
+++ 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>
blob - 4f8596120794fcec50f4fcaa36feec9141544434
blob + 5b714e07687d521334c8cafd91a66e4a843db4c8
--- src/imap_gtk.c
+++ 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>
blob - acc1b1ae558ee086ca04857000f3b37275469f4a
blob + ade0452d1a45d724ee7cdeb6160634e5ac8a2a66
--- src/imap_gtk.h
+++ 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"
 
blob - be7e61905f29b393dadaeae4392bd50a08b9b239
blob + d0ebe04cef5b4b3bceeeea6885648894f810f7bd
--- src/import.c
+++ 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>
blob - c7c879dec8d039e71d0ccb47979469b02911b315
blob + 3343b81ceae53e9a4be90f378ae6a40299c5f690
--- src/inc.h
+++ 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"
blob - 27207812435ea4ca1c34a8245405d5855c80852f
blob + 8a512bc997042e6bbc388f224ecad5b606dc4f10
--- src/manual.c
+++ 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>
blob - f4b892a1f533c3829be8d767e437d307a0dffa3c
blob + d4cd01ae5703cd2325d55dba6aa68c9aa3d780fa
--- src/mbox.c
+++ 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>
blob - 3e967404a3307610bbb3e3c10bab3fa34c482676
blob + 67e322cb0e51c37b47816a90e2281d560c019eac
--- src/message_search.c
+++ 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>
blob - 8497a870f195d931ce09c593604eae4fbd027dcd
blob + 4d5b226ff3349bdc13f52ac334475a0c41f04635
--- src/messageview.h
+++ 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>
 
blob - 19ae4d124ee75182ff042ee1acce73c2a2c853d5
blob + c6be54eaae6995c2627355ee6e8c88d948d733df
--- src/mh.c
+++ 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>
blob - 8e9c90e6505942d952979b1d7dd03425d436c11f
blob + 0eae0a81092673e679e9d0d3b0187bab93a15fa5
--- src/mh_gtk.c
+++ 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>
blob - b65cce8a5bf5df6969bb7f804b8651c6c503bcbd
blob + 60a5665333eb6607665c5b5665999d96accfa349
--- src/mimeview.c
+++ 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>
blob - 809c9769cdcf91d38fa847a3504c854e4b35987f
blob + 79982edc69e887df01ea7f2d70c29039b5edadc7
--- src/msgcache.c
+++ 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>
blob - b0a12738a401bb17018d480ee5458c9de0d2b3c7
blob + 15333ffa64948cbc6148ae8b138a534745d68b43
--- src/msgcache.h
+++ 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;
blob - 4d139bae3d8eaba8eb62f76bee4a5c6bda6d08b5
blob + b4ae079109c0f81d20fbb00b7f9af89a9eee652e
--- src/noticeview.c
+++ 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>
blob - 3fca9de6f80714c6be083e43d6f8ec47db245ff3
blob + 84e74ad5074abebf7d6591b1b2a1aa3d0a410f87
--- src/oauth2.c
+++ 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
blob - 1997328b8f1e513f468d9a24c34a7d32b4887c2c
blob + 78bc62ed75976803326410b34e7d88b966a3f405
--- src/password.c
+++ 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>
 
blob - ff3d035de0f7e02ee939a1fbef00ca755c578994
blob + 3f0d11f08fc00f157bd29f6fc1b38c2898d42463
--- src/passwordstore.c
+++ 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>
 
blob - 2e23e403d81d150fa08339049c5365fc15dc16be
blob + c73cdf5cd0cc1b329a99f9f306c8a87edb1b253c
--- src/pop.c
+++ 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>
blob - e82575f19b9355a780015381c228da6275eca4fb
blob + 4122b8544e2f20d4329c619fa692e7bbdfbe825f
--- src/prefs_account.c
+++ 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>
blob - f7ea24c2d56218fc9cbfd83222c502b17381314d
blob + 6f7ccb3f750187076cbd5370b3fec627f686373d
--- src/prefs_account.h
+++ 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;
 
blob - 8a85530fbd2af8cdc1c8369b273b83b1da62fc18
blob + bcfc5342ec9377e2884066f90319527c60316722
--- src/prefs_actions.c
+++ 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>
blob - 41fccfd82a8b2770201e8ddd705320ad8a60b79f
blob + c645b0e8647954d6e93271f9c9e0622a55248e2d
--- src/prefs_common.c
+++ 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>
blob - 8ed30733488204f7312fb545a7fab1e795ea6731
blob + 0ab3af539ad1f8cb76b7f4eea4c3072815f028db
--- src/prefs_common.h
+++ 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"
blob - 581c9d24dfbf5cf06ea3f44a181c2eca65f91f83
blob + 0bfe0ea807f256522d90d92a773afb356b73d9d3
--- src/prefs_compose_writing.c
+++ 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>
blob - 5dfdeb8d6a3ce7d4d09fed71d7856e7cf249ec08
blob + 79c531e6fa76cca13834d2971ce69b8fcb79cdb5
--- src/prefs_customheader.c
+++ 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>
blob - fbf2830a14d661760f6d24cbd6d84b46c58ad4ae
blob + f0de9a050c409458f38e26cf38ab995661df6717
--- src/prefs_display_header.c
+++ 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>
blob - 0a633e6f6fdd9cd96117416a2c49a74739cf71ef
blob + e344e756e78c10bcf2bc36fbaf43b61646d6e402
--- src/prefs_ext_prog.c
+++ 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>
blob - 123475b224a2af194cb91dd2bb3467d8871c6ffd
blob + e691b94b8a0db6d0039d6df1b3f620f8208fef13
--- src/prefs_folder_column.c
+++ 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
blob - ddffe246e6ad6f76a934cb6e5c9e8e5f6af27782
blob + c67dcea932a578dbb7a438699c5758bfb3799b9b
--- src/prefs_folder_item.c
+++ 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>
blob - 0fdd129334bd45248d0f76e8d385dc2cef97f55a
blob + f57361f2c8351839755d96af61c9e02a3ed4c660
--- src/prefs_gtk.c
+++ 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>
blob - 120ecbcc58b55fb6c830ee07378f2ce5d47e1aca
blob + 296e45a66dd0a0d6743bd3b09e31cbb7372c30e4
--- src/prefs_message.c
+++ 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>
blob - 7c2366c751e1ae01a8f4a0bcd45d10c1dac23cfd
blob + bd773a69cdc2b451556339a74c1ade02da2b23e8
--- src/prefs_other.c
+++ 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>
blob - f4181fc51b4de5e3e18219595f1fcb5d7bd45ece
blob + eff9d9b58fed50ae6502c32041d5a276d8f65dc0
--- src/prefs_receive.c
+++ 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>
blob - 50396344c9e554308c11cbe0ef73ce9a345c7f8e
blob + dc589b4c64064c3e1bdf8b9425f26ee2cd0deba5
--- src/prefs_send.c
+++ 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>
blob - 129d12042b65c2ad7c90c77914f600630c150654
blob + 3b409f8e0193fafa1e2fc034dd183e304d36b1f6
--- src/prefs_summary_column.c
+++ 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>
blob - 31d4f27fb702819e1ed50661ae46661ca447504e
blob + f6dd4c1af4de3a99ff497abd45126bcd8705c690
--- src/prefs_summary_open.c
+++ 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>
blob - 3bd3f18d16d9304a0f76fb9a1bf6c126ef59a7ff
blob + 1e3a27d6aee459d85209f903e03116266925cba6
--- src/prefs_themes.c
+++ 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>
blob - 71ea4a5367dd882b670c7ac81a32809146822636
blob + 40c2e37bc66df0a1102ae53e92a832a1f8f8f4e6
--- src/prefs_toolbar.c
+++ 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>
blob - 0d65f13953e9b950b36b348ef95f70af9426dec5
blob + c2a1af87f4e01ea466df824a2397993a4373cd05
--- src/prefs_wrapping.c
+++ 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>
blob - d8c458cb07fa2ae7cad49dda1f3ac2dc18211149
blob + b1cd3fa46c62fee887fda391528e7e539f61d301
--- src/procheader.c
+++ 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>
blob - 647a3419e2a95bab60837ca3212f4141200ab6b7
blob + 50ec5a71ec5352fe155adf9eb53e5121c51d12ac
--- src/procmime.c
+++ 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>
blob - c502373fc636957efdb626195ee2ab70b8dbcc37
blob + 97393833f2d852f83ae0624b93f17d13ed4cf9f8
--- src/procmime.h
+++ 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>
 
blob - 222b026d586c0c974a07cad70c8ea44b542a9864
blob + ea7b2468f9cf561e0cd864ad6c13dea7974cee4b
--- src/send_message.c
+++ 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>
blob - f45aae22ccddcfbbc3da0ae017141d7e74871fc0
blob + c4a1e95c0975217900c16372e2825e5e5c4319d6
--- src/setup.c
+++ 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>
blob - b0e5bf922315d1709c705453a3ce5036fb18c48f
blob + e2f0a39e63d3fc1945d7cc00c9b6dfd2599d4f65
--- src/statusbar.c
+++ 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>
blob - 4c0529dd0e92bb523524caa3fcc7151084c15ceb
blob + ab69d8e8f0b666099b68c8fa6a997302945ac81a
--- src/textview.c
+++ 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>
blob - 6e0fd90347da79ed480b2b947ec7e09e6659a0a3
blob + 5f6f15bfbebeb3ecbf2a71caaefacd07c1910460
--- src/toolbar.c
+++ 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>
blob - dd9cfdb49fc43069c524fdcc9b3a04155614d082
blob + 38a62c214c4f6600f56910e188bae28621ddbe1d
--- src/undo.c
+++ 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 */