From f503b3ee321d866656e2829626712dcdaed3e2ad Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Tue, 17 Nov 2020 12:00:19 -0300
Subject: [PATCH] Fixing schema paths.

---
 schemas/linux/application.gschema.xml.in |  2 +-
 schemas/linux/window.gschema.xml.in      |  2 +-
 src/objects/application/application.c    |  9 +++------
 src/objects/window/window.c              | 12 +++---------
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/schemas/linux/application.gschema.xml.in b/schemas/linux/application.gschema.xml.in
index 4d248e7..bcda562 100644
--- a/schemas/linux/application.gschema.xml.in
+++ b/schemas/linux/application.gschema.xml.in
@@ -30,7 +30,7 @@
 
 <schemalist>
 
-  <schema id="br.com.bb.@PACKAGE_NAME@">
+  <schema path="/br/com/bb/@PRODUCT_NAME@/" id="br.com.bb.@PRODUCT_NAME@">
 
     <key name="ui-style" type="u">
       <default>2</default>
diff --git a/schemas/linux/window.gschema.xml.in b/schemas/linux/window.gschema.xml.in
index 2fbd884..0a1c574 100644
--- a/schemas/linux/window.gschema.xml.in
+++ b/schemas/linux/window.gschema.xml.in
@@ -30,7 +30,7 @@
 
 <schemalist>
 
-  <schema id="br.com.bb.@PACKAGE_NAME@.window">
+  <schema path="/br/com/bb/@PRODUCT_NAME@/window/" id="br.com.bb.@PRODUCT_NAME@.window">
 
     <key name="width" type="i">
       <default>-1</default>
diff --git a/src/objects/application/application.c b/src/objects/application/application.c
index c9bf265..98f1536 100644
--- a/src/objects/application/application.c
+++ b/src/objects/application/application.c
@@ -492,9 +492,6 @@
 
 	GSettings *settings = NULL;
 
-	g_autofree gchar * path = g_strconcat("/apps/" PACKAGE_NAME "/", g_get_application_name(),"/",NULL);
-	debug("path=%s",path);
-
 #ifdef DEBUG
 	GError * error = NULL;
 	GSettingsSchemaSource * source =
@@ -510,18 +507,18 @@
 	GSettingsSchema * schema =
 		g_settings_schema_source_lookup(
 			source,
-			"br.com.bb." PACKAGE_NAME,
+			"br.com.bb." G_STRINGIFY(PRODUCT_NAME),
 			TRUE);
 
 	debug("schema %s=%p","br.com.bb." PACKAGE_NAME,schema);
 
-	settings = g_settings_new_full(schema, NULL, path);
+	settings = g_settings_new_full(schema, NULL, NULL);
 
 	g_settings_schema_source_unref(source);
 
 #else
 
-	settings = g_settings_new_with_path("br.com.bb." PACKAGE_NAME, path);
+	settings = g_settings_new("br.com.bb." G_STRINGIFY(PRODUCT_NAME));
 
 #endif // DEBUG
 
diff --git a/src/objects/window/window.c b/src/objects/window/window.c
index f836d3b..f4817c3 100644
--- a/src/objects/window/window.c
+++ b/src/objects/window/window.c
@@ -841,10 +841,6 @@
 
  GSettings *pw3270_application_window_settings_new() {
 
- 	// Get settings
-	g_autofree gchar * path = g_strconcat("/apps/" PACKAGE_NAME "/", g_get_application_name(), "/window/",NULL);
-	debug("path=%s",path);
-
 #ifdef DEBUG
 
 	GError * error = NULL;
@@ -861,18 +857,16 @@
 	GSettingsSchema * schema =
 		g_settings_schema_source_lookup(
 			source,
-			"br.com.bb." PACKAGE_NAME ".window",
+			"br.com.bb." G_STRINGIFY(PRODUCT_NAME) ".window",
 			TRUE);
 
-	debug("schema %s=%p path=%s","br.com.bb." PACKAGE_NAME ".window",schema,path);
-
-	GSettings * settings = g_settings_new_full(schema, NULL, path);
+	GSettings * settings = g_settings_new_full(schema, NULL, NULL);
 
 	g_settings_schema_source_unref(source);
 
 #else
 
-	GSettings * settings = g_settings_new_with_path("br.com.bb." PACKAGE_NAME ".window", path);
+	GSettings * settings = g_settings_new("br.com.bb." G_STRINGIFY(PRODUCT_NAME) ".window");
 
 #endif // DEBUG
 
--
libgit2 0.21.2