From d3fa5f8a70877ce877f099ff49f17ee6065c8d13 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sun, 24 Jan 2021 17:18:48 +0100
Subject: [PATCH] Let the configuration vendor be overridden

---
 src/browser/browser.c | 8 ++++----
 src/browser/browser.h | 2 ++
 src/properties.c      | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/browser/browser.c b/src/browser/browser.c
index dc99c44..e53e3f0 100644
--- a/src/browser/browser.c
+++ b/src/browser/browser.c
@@ -820,8 +820,8 @@ int browser_config_load(Browser * browser)
 
 	if(browser->config == NULL)
 		return 0; /* XXX ignore error */
-	if(config_load_preferences(browser->config, "DeforaOS/" VENDOR, PACKAGE,
-				BROWSER_CONFIG_FILE) != 0)
+	if(config_load_preferences(browser->config, BROWSER_CONFIG_VENDOR,
+				PACKAGE, BROWSER_CONFIG_FILE) != 0)
 		browser_error(NULL, error_get(NULL), 1);
 #if GTK_CHECK_VERSION(2, 6, 0)
 	/* XXX deserves a rework (enum) */
@@ -878,7 +878,7 @@ int browser_config_save(Browser * browser)
 			browser->prefs.show_hidden_files);
 	if(ret == 0)
 		ret |= config_save_preferences_user(browser->config,
-				"DeforaOS/" VENDOR, PACKAGE,
+				BROWSER_CONFIG_VENDOR, PACKAGE,
 				BROWSER_CONFIG_FILE);
 	return ret;
 }
@@ -2528,7 +2528,7 @@ static int _browser_config_set(Browser * browser, char const * section,
 	if((ret = config_set(browser->config, s, variable, value)) == 0)
 	{
 		if(config_save_preferences_user(browser->config,
-					"DeforaOS/" VENDOR, PACKAGE,
+					BROWSER_CONFIG_VENDOR, PACKAGE,
 					BROWSER_CONFIG_FILE) != 0)
 			browser_error(NULL, error_get(NULL), 1);
 	}
diff --git a/src/browser/browser.h b/src/browser/browser.h
index 2841426..5b5a880 100644
--- a/src/browser/browser.h
+++ b/src/browser/browser.h
@@ -33,11 +33,13 @@
 # include <System.h>
 # include <Desktop.h>
 # include "../../include/Browser.h"
+# include "../../config.h"
 
 
 /* Browser */
 /* defaults */
 # define BROWSER_CONFIG_FILE		"Browser.conf"
+# define BROWSER_CONFIG_VENDOR		"DeforaOS/" VENDOR
 # define BROWSER_ICON_WRAP_WIDTH	96
 # define BROWSER_LIST_WRAP_WIDTH	118
 # define BROWSER_THUMBNAIL_WRAP_WIDTH	112
diff --git a/src/properties.c b/src/properties.c
index 315b57b..4c8ddd1 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -237,7 +237,7 @@ static int _new_load(Properties * properties, char const * plugin)
 
 	if((properties->config = config_new()) != NULL
 			&& config_load_preferences(properties->config,
-				"DeforaOS/" VENDOR, PACKAGE,
+				BROWSER_CONFIG_VENDOR, PACKAGE,
 				BROWSER_CONFIG_FILE) == 0
 			&& (plugins = config_get(properties->config, NULL,
 					"properties")) == NULL)