From b2f1b997ed60a40ffb9c0964ed0716c375b30072 Mon Sep 17 00:00:00 2001
From: Bert <ber.t@gmx.com>
Date: Thu, 7 Apr 2011 10:17:27 +0200
Subject: Disable support for external commands by default

---
 config.h | 40 +++++++++++++++++++---------------------
 main.c   |  6 +++---
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/config.h b/config.h
index bf48538..7a4d43b 100644
--- a/config.h
+++ b/config.h
@@ -1,30 +1,28 @@
-/* default window dimensions:                            *
- * (also controllable via -g option)                     */
-#define WIN_WIDTH   800
-#define WIN_HEIGHT  600
+/* default window dimensions (overwritten via -g option): */
+#define WIN_WIDTH    800
+#define WIN_HEIGHT   600
 
-/* default color for window background:                  *
- *   (see X(7) "COLOR NAMES" section for valid values)   */
-#define BG_COLOR    "#999999"
-/* default color for thumbnail selection:                */
-#define SEL_COLOR   "#0040FF"
+/* default color for window background:                   *
+ *   (see X(7) "COLOR NAMES" section for valid values)    */
+#define BG_COLOR     "#999999"
+/* default color for thumbnail selection:                 */
+#define SEL_COLOR    "#0040FF"
 
-/* how should images be scaled when they are loaded?:    *
- * (also controllable via -d/-s/-Z/-z options)           *
- *   SCALE_DOWN: 100%, but fit large images into window, *
- *   SCALE_FIT:  fit all images into window,             *
- *   SCALE_ZOOM: use current zoom level, 100% at startup */
-#define SCALE_MODE  SCALE_DOWN
+/* how should images be scaled when they are loaded?:     *
+ * (also controllable via -d/-s/-Z/-z options)            *
+ *   SCALE_DOWN: 100%, but fit large images into window,  *
+ *   SCALE_FIT:  fit all images into window,              *
+ *   SCALE_ZOOM: use current zoom level, 100% at startup  */
+#define SCALE_MODE   SCALE_DOWN
 
-/* levels (percent) to use when zooming via '-' and '+': */
+/* levels (percent) to use when zooming via '-' and '+':  */
 static const float zoom_levels[] = {
 	 12.5,  25.0,  50.0,  75.0,
 	100.0, 150.0, 200.0, 400.0, 800.0
 };
 
-/* default dimension of thumbnails (width == height):    */
-#define THUMB_SIZE  60
+/* default dimension of thumbnails (width == height):     */
+#define THUMB_SIZE   60
 
-/* remove this line to disable external commands:        *
- * (otherwise have a look at commands.h to define them)  */
-#define EXT_COMMANDS
+/* support for external commands (defined in commands.h): */
+#define EXT_COMMANDS 0
diff --git a/main.c b/main.c
index 7d9a8a5..45f3666 100644
--- a/main.c
+++ b/main.c
@@ -37,7 +37,7 @@
 #include "util.h"
 #include "window.h"
 
-#ifdef EXT_COMMANDS
+#if EXT_COMMANDS
 #include "commands.h"
 #endif
 
@@ -284,7 +284,7 @@ void read_dir_rec(const char *dirname) {
 	free(dirnames);
 }
 
-#ifdef EXT_COMMANDS
+#if EXT_COMMANDS
 int run_command(const char *cline, Bool reload) {
 	int fncnt, fnlen;
 	char *cn, *cmdline;
@@ -382,7 +382,7 @@ void on_keypress(XKeyEvent *kev) {
 	XLookupString(kev, &key, 1, &ksym, NULL);
 	changed = 0;
 
-#ifdef EXT_COMMANDS
+#if EXT_COMMANDS
 	/* external commands from commands.h */
 	if (CLEANMASK(kev->state) & ControlMask) {
 		for (i = 0; i < LEN(commands); ++i) {
-- 
cgit v1.2.3