RDNN behavior schema (#2034)

elementary · Aug 19, 2024 · 320f1fa · 320f1fa
1 parent 7058399
commit 320f1fa
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 9 deletions.
diff --git a/data/gala.gschema.xml b/data/gala.gschema.xml
@@ -30,7 +30,7 @@
     </key>
   </schema>
 
-  <schema path="/org/pantheon/desktop/gala/behavior/" id="org.pantheon.desktop.gala.behavior">
+  <schema path="/io/elementary/desktop/wm/behavior/" id="io.elementary.desktop.wm.behavior">
     <key enum="GalaActionType" name="hotcorner-topleft">
       <default>"none"</default>
       <summary>Action for the top left corner</summary>
@@ -86,9 +86,6 @@
 			<summary>Automatically move fullscreened windows to a new workspace</summary>
 			<description></description>
 		</key>
-  </schema>
-
-  <schema path="/io/elementary/desktop/wm/behavior/" id="io.elementary.desktop.wm.behavior">
     <key type="b" name="enable-hotcorners-in-fullscreen">
       <default>false</default>
       <summary>Whether hotcorners should be enabled when fullscreen window is opened</summary>

diff --git a/meson.build b/meson.build
@@ -36,7 +36,6 @@ conf.set_quoted('PKGDATADIR', pkgdata_dir)
 conf.set_quoted('PLUGINDIR', plugins_dir)
 conf.set_quoted('RESOURCEPATH', '/org/pantheon/desktop/gala')
 conf.set_quoted('VERSION', gala_version)
-conf.set_quoted('SCHEMA', 'org.pantheon.desktop.gala')
 config_h = configure_file(
     output: 'config.h',
     configuration: conf

diff --git a/src/InternalUtils.vala b/src/InternalUtils.vala
@@ -37,7 +37,7 @@ namespace Gala {
                     rects = {rect};
                     break;
                 case InputArea.DEFAULT:
-                    var settings = new GLib.Settings (Config.SCHEMA + ".behavior");
+                    var settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");
 
                     // if ActionType is NONE make it 0 sized
                     ushort tl_size = (settings.get_enum ("hotcorner-topleft") != ActionType.NONE ? 1 : 0);

diff --git a/src/Widgets/MultitaskingView.vala b/src/Widgets/MultitaskingView.vala
@@ -58,7 +58,7 @@ namespace Gala {
         }
 
         construct {
-            gala_behavior_settings = new GLib.Settings ("org.pantheon.desktop.gala.behavior");
+            gala_behavior_settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");
             style_manager = Drawing.StyleManager.get_instance ();
 
             visible = false;

diff --git a/src/WindowManager.vala b/src/WindowManager.vala
@@ -134,7 +134,7 @@ namespace Gala {
 
             animations_settings = new GLib.Settings ("io.elementary.desktop.wm.animations");
             animations_settings.bind ("enable-animations", this, "enable-animations", GLib.SettingsBindFlags.GET);
-            behavior_settings = new GLib.Settings (Config.SCHEMA + ".behavior");
+            behavior_settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");
             new_behavior_settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");
             enable_animations = animations_settings.get_boolean ("enable-animations");
 

diff --git a/vapi/config.vapi b/vapi/config.vapi
@@ -24,6 +24,5 @@ namespace Config
 	public const string PKGDATADIR;
 	public const string VERSION;
 	public const string PLUGINDIR;
-	public const string SCHEMA;
 	public const string RESOURCEPATH;
 }