Skip to content

Commit 9411323

Browse files
committed
Relocate bring-windows-to-current-workspace from org.cinnamon to
org.cinnamon.muffin. This was creating a circular dependency between cinnamon and muffin.
1 parent 433dc2c commit 9411323

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

data/org.cinnamon.muffin.gschema.xml.in

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,14 @@
197197
</description>
198198
</key>
199199

200+
<key name="bring-windows-to-current-workspace" type="b">
201+
<default>false</default>
202+
<summary>Brings windows requiring attention to the current workspace</summary>
203+
<description>
204+
When enabled, if a window requires attention, it is brought to the current workspace.
205+
</description>
206+
</key>
207+
200208
<child name="keybindings" schema="org.cinnamon.muffin.keybindings"/>
201209

202210
</schema>

src/core/prefs.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
#define SCHEMA_INPUT_SOURCES "org.cinnamon.desktop.input-sources"
7676
#define SCHEMA_MOUSE "org.cinnamon.desktop.peripherals.mouse"
7777
#define SCHEMA_A11Y_APPLICATIONS "org.cinnamon.desktop.a11y.applications"
78-
#define SCHEMA_CINNAMON "org.cinnamon"
7978

8079
#define SETTINGS(s) g_hash_table_lookup (settings_schemas, (s))
8180

@@ -474,7 +473,7 @@ static MetaBoolPreference preferences_bool[] =
474473
},
475474
{
476475
{ "bring-windows-to-current-workspace",
477-
SCHEMA_CINNAMON,
476+
SCHEMA_MUFFIN,
478477
META_PREF_BRING_WINDOWS_TO_CURRENT_WORKSPACE,
479478
},
480479
&bring_user_activated_windows_to_current_workspace,
@@ -1123,11 +1122,6 @@ meta_prefs_init (void)
11231122
G_CALLBACK (settings_changed), NULL);
11241123
g_hash_table_insert (settings_schemas, g_strdup (SCHEMA_A11Y_APPLICATIONS), settings);
11251124

1126-
settings = g_settings_new (SCHEMA_CINNAMON);
1127-
g_signal_connect (settings, "changed::" KEY_BRING_ACTIVATED_WINDOWS_TO_CURRENT_WORKSPACE,
1128-
G_CALLBACK (settings_changed), NULL);
1129-
g_hash_table_insert (settings_schemas, g_strdup (SCHEMA_CINNAMON), settings);
1130-
11311125
/* Individual keys we watch outside of our schemas */
11321126
settings = g_settings_new (SCHEMA_INTERFACE);
11331127
g_signal_connect (settings, "changed::" KEY_GNOME_ACCESSIBILITY,

0 commit comments

Comments
 (0)