From 4a575061628db48c8043d3083b34ce5cf335c018 Mon Sep 17 00:00:00 2001
From: Felix Crux <crux@google.com>
Date: Thu, 3 Nov 2011 17:49:28 -0400
Subject: Chaning the name of the option to suppress .fehbg

---
 src/help.raw    | 2 +-
 src/options.c   | 8 ++++----
 src/options.h   | 2 +-
 src/wallpaper.c | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/help.raw b/src/help.raw
index d83f136..f626580 100644
--- a/src/help.raw
+++ b/src/help.raw
@@ -74,7 +74,7 @@ OPTIONS
                            fill the whole background, but the images' aspect
                            ratio may not be preserved
      --bg-tile FILE        Set FILE as tiled desktop background
-     --bg-no-bgfile        Do not write a ~/.fehbg file
+     --no-fehbg            Do not write a ~/.fehbg file
  -C, --fontpath PATH       Specify an extra directory to look in for fonts,
                            can be used multiple times to add multiple paths.
  -M, --menu-font FONT      Use FONT for the font in menus.
diff --git a/src/options.c b/src/options.c
index e59adf6..7984439 100644
--- a/src/options.c
+++ b/src/options.c
@@ -390,7 +390,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
 		{"thumb-redraw"  , 1, 0, 'J'},
 		{"info"          , 1, 0, 234},
 		{"force-aliasing", 0, 0, 235},
-		{"bg-no-bgfile"  , 0, 0, 236},
+		{"no-fehbg"      , 0, 0, 236},
 
 		{0, 0, 0, 0}
 	};
@@ -705,7 +705,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
 			opt.force_aliasing = 1;
 			break;
 		case 236:
-			opt.no_bgfile = 1;
+			opt.no_fehbg = 1;
 			break;
 		default:
 			break;
@@ -764,8 +764,8 @@ static void check_options(void)
 		eprintf("You cannot combine --loadable with --unloadable");
 	}
 
-	if (opt.no_bgfile && !opt.bgmode) {
-		weprintf("The --no-bg-file option is meaningless unless you\n"
+	if (opt.no_fehbg && !opt.bgmode) {
+		weprintf("The --no-fehbg option is meaningless unless you\n"
 				"are setting a background wallpaper image.\n"
 				"It is being ignored.");
 	}
diff --git a/src/options.h b/src/options.h
index 5192f9d..899bcf1 100644
--- a/src/options.h
+++ b/src/options.h
@@ -68,7 +68,7 @@ struct __fehoptions {
 	unsigned char hold_actions[10];
 	unsigned char text_bg;
 	unsigned char image_bg;
-	unsigned char no_bgfile;
+	unsigned char no_fehbg;
 
 	char *output_file;
 	char *output_dir;
diff --git a/src/wallpaper.c b/src/wallpaper.c
index 773b87e..8a4cafb 100644
--- a/src/wallpaper.c
+++ b/src/wallpaper.c
@@ -395,7 +395,7 @@ void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled,
 			fehbg = estrjoin(" ", "feh --bg-tile", filbuf, NULL);
 		}
 
-		if (fehbg && !opt.no_bgfile) {
+		if (fehbg && !opt.no_fehbg) {
 			home = getenv("HOME");
 			if (home) {
 				FILE *fp;
-- 
cgit v1.2.3