Skip to content

Commit 987996c

Browse files
authored
Merge branch 'main' into lenemter/update-animated-bg
2 parents b388929 + 481fa89 commit 987996c

File tree

242 files changed

+7043
-5081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+7043
-5081
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Install Dependencies
3232
run: |
3333
apt update
34-
apt install -y gettext gnome-settings-daemon-dev gsettings-desktop-schemas-dev libcanberra-dev libclutter-1.0-dev libgee-0.8-dev libglib2.0-dev libgnome-desktop-3-dev libgranite-dev libgtk-3-dev ${{ matrix.mutter_pkg }} libxml2-utils libsqlite3-dev meson valac valadoc
34+
apt install -y gettext gsettings-desktop-schemas-dev libatk-bridge2.0-dev libcanberra-dev libclutter-1.0-dev libgee-0.8-dev libglib2.0-dev libgnome-desktop-3-dev libgranite-dev libgtk-3-dev ${{ matrix.mutter_pkg }} libxml2-utils libsqlite3-dev meson valac valadoc
3535
- name: Build
3636
env:
3737
DESTDIR: out

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
GIT_USER_NAME: "elementaryBot"
1818
GIT_USER_EMAIL: "[email protected]"
1919
with:
20-
release_branch: 'horus'
20+
release_branch: 'noble'

daemon-gtk3/WindowMenu.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
public class Gala.Daemon.WindowMenu : Gtk.Menu {
7-
private static GLib.Settings gala_keybind_settings = new GLib.Settings ("org.pantheon.desktop.gala.keybindings");
7+
private static GLib.Settings gala_keybind_settings = new GLib.Settings ("io.elementary.desktop.wm.keybindings");
88
private static GLib.Settings keybind_settings = new GLib.Settings ("org.gnome.desktop.wm.keybindings");
99

1010
public signal void perform_action (Gala.ActionType type);

daemon/WindowMenu.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
public class Gala.Daemon.WindowMenu : Gtk.Popover {
7-
private static GLib.Settings gala_keybind_settings = new GLib.Settings ("org.pantheon.desktop.gala.keybindings");
7+
private static GLib.Settings gala_keybind_settings = new GLib.Settings ("io.elementary.desktop.wm.keybindings");
88
private static GLib.Settings keybind_settings = new GLib.Settings ("org.gnome.desktop.wm.keybindings");
99

1010
public signal void perform_action (Gala.ActionType type) {

data/gala.gschema.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</key>
3131
</schema>
3232

33-
<schema path="/org/pantheon/desktop/gala/behavior/" id="org.pantheon.desktop.gala.behavior">
33+
<schema path="/io/elementary/desktop/wm/behavior/" id="io.elementary.desktop.wm.behavior">
3434
<key enum="GalaActionType" name="hotcorner-topleft">
3535
<default>"none"</default>
3636
<summary>Action for the top left corner</summary>
@@ -86,17 +86,14 @@
8686
<summary>Automatically move fullscreened windows to a new workspace</summary>
8787
<description></description>
8888
</key>
89-
</schema>
90-
91-
<schema path="/io/elementary/desktop/wm/behavior/" id="io.elementary.desktop.wm.behavior">
9289
<key type="b" name="enable-hotcorners-in-fullscreen">
9390
<default>false</default>
9491
<summary>Whether hotcorners should be enabled when fullscreen window is opened</summary>
9592
<description></description>
9693
</key>
9794
</schema>
9895

99-
<schema path="/org/pantheon/desktop/gala/keybindings/" id="org.pantheon.desktop.gala.keybindings">
96+
<schema path="/io/elementary/desktop/wm/keybindings/" id="io.elementary.desktop.wm.keybindings">
10097
<key type="as" name="switch-to-workspace-first">
10198
<default><![CDATA[['<Super>Home']]]></default>
10299
<summary>Shortcut to move to first workspace</summary>
@@ -184,7 +181,7 @@
184181
</key>
185182
</schema>
186183

187-
<schema path="/org/pantheon/desktop/gala/animations/" id="org.pantheon.desktop.gala.animations">
184+
<schema path="/io/elementary/desktop/wm/animations/" id="io.elementary.desktop.wm.animations">
188185
<key type="b" name="enable-animations">
189186
<default>true</default>
190187
<summary>Enable Animations</summary>

data/gala.metainfo.xml.in

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,20 @@
2727
<update_contact>contact_at_elementary.io</update_contact>
2828

2929
<releases>
30-
<release version="8.0.0" date="2024-07-18" urgency="medium">
30+
<release version="8.0.1" date="2024-08-21" urgency="medium">
31+
<description>
32+
<p>Improvements:</p>
33+
<ul>
34+
<li>Updated translations</li>
35+
</ul>
36+
</description>
37+
<issues>
38+
<issue url="https://github.com/elementary/gala/issues/1052">Workspace doesn't switch automatically when invoke app from different workspace</issue>
39+
<issue url="https://github.com/elementary/gala/issues/1301">Make Window Switcher accessible</issue>
40+
</issues>
41+
</release>
42+
43+
<release version="8.0.0" date="2024-08-19" urgency="medium">
3144
<description>
3245
<p>Improvements:</p>
3346
<ul>
@@ -38,6 +51,7 @@
3851
</description>
3952
<issues>
4053
<issue url="https://github.com/elementary/gala/issues/6">Can't navigate open windows with keyboard when doing Super+A</issue>
54+
<issue url="https://github.com/elementary/gala/issues/271">RDNN GSettings</issue>
4155
<issue url="https://github.com/elementary/gala/issues/297">Add an API to remember window position</issue>
4256
<issue url="https://github.com/elementary/gala/issues/348">UX: It's too easy to trigger the action "Close All Windows in Workspace" when switching between workspaces with mouse</issue>
4357
<issue url="https://github.com/elementary/gala/issues/765">The notifications appear on the right side, they should be in Arabic on the left</issue>
@@ -59,6 +73,11 @@
5973
<issue url="https://github.com/elementary/gala/issues/1826">Missing gala-daemon systemd service</issue>
6074
<issue url="https://github.com/elementary/gala/issues/1834">WindowSwitcher doesn't use accent color anymore</issue>
6175
<issue url="https://github.com/elementary/gala/issues/1841">Changing wallpaper makes the background go grey</issue>
76+
<issue url="https://github.com/elementary/gala/issues/1961">Crash</issue>
77+
<issue url="https://github.com/elementary/gala/issues/1965">Launch Dock on X11</issue>
78+
<issue url="https://github.com/elementary/gala/issues/1978">Bounce window when focusing an already focused window</issue>
79+
<issue url="https://github.com/elementary/gala/issues/2011">Meta.Window.begin_grab_op is broken</issue>
80+
<issue url="https://github.com/elementary/gala/issues/2014">Taking screenshots is completely broken</issue>
6281
</issues>
6382
</release>
6483

@@ -119,12 +138,6 @@
119138
</release>
120139

121140
<release version="7.1.0" date="2023-06-26" urgency="medium">
122-
<description>
123-
<p>Improvements:</p>
124-
<ul>
125-
<li>Updated translations</li>
126-
</ul>
127-
</description>
128141
<issues>
129142
<issue url="https://github.com/elementary/gala/issues/1091">Accessibility grayscale and colourblind filters</issue>
130143
</issues>

data/io.elementary.desktop.wm.shell

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
launch-on-x=true
33
args=io.elementary.wingpanel
44

5-
[io.elementary.desktop.agent-polkit]
6-
launch-on-x=true
7-
args=/usr/libexec/policykit-1-pantheon/io.elementary.desktop.agent-polkit
8-
95
[io.elementary.dock]
10-
launch-on-x=false
6+
launch-on-x=true
117
args=io.elementary.dock

docs/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ basic_command = [
1313
'--package-version', '0.0.0',
1414
'--driver', vala.version(),
1515
mutter_packages_command,
16+
'--pkg', 'atk-bridge-2.0',
1617
'--pkg', 'gnome-desktop-3.0',
1718
'--pkg', 'gtk+-3.0',
1819
'--pkg', 'gee-0.8',

lib/Utils.vala

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -400,15 +400,5 @@ namespace Gala {
400400

401401
return texture;
402402
}
403-
404-
private static Gtk.CssProvider gala_css = null;
405-
public static unowned Gtk.CssProvider? get_gala_css () {
406-
if (gala_css == null) {
407-
gala_css = new Gtk.CssProvider ();
408-
gala_css.load_from_resource ("/io/elementary/desktop/gala/gala.css");
409-
}
410-
411-
return gala_css;
412-
}
413403
}
414404
}

meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('gala',
22
'c', 'vala',
3-
version: '7.1.3',
3+
version: '8.0.0',
44
meson_version: '>= 0.59.0',
55
license: 'GPL3',
66
)
@@ -36,7 +36,6 @@ conf.set_quoted('PKGDATADIR', pkgdata_dir)
3636
conf.set_quoted('PLUGINDIR', plugins_dir)
3737
conf.set_quoted('RESOURCEPATH', '/org/pantheon/desktop/gala')
3838
conf.set_quoted('VERSION', gala_version)
39-
conf.set_quoted('SCHEMA', 'org.pantheon.desktop.gala')
4039
config_h = configure_file(
4140
output: 'config.h',
4241
configuration: conf
@@ -80,6 +79,7 @@ add_project_arguments([
8079
glib_version_required = '2.74.0'
8180
gtk_version_required = '3.10.0'
8281

82+
atk_bridge_dep = dependency('atk-bridge-2.0')
8383
canberra_dep = dependency('libcanberra')
8484
glib_dep = dependency('glib-2.0', version: '>= @0@'.format(glib_version_required))
8585
gobject_dep = dependency('gobject-2.0', version: '>= @0@'.format(glib_version_required))
@@ -171,7 +171,7 @@ endif
171171
add_project_arguments(vala_flags, language: 'vala')
172172
add_project_link_arguments(['-Wl,-rpath,@0@'.format(mutter_typelib_dir)], language: 'c')
173173

174-
gala_base_dep = [canberra_dep, glib_dep, gobject_dep, gio_dep, gio_unix_dep, gmodule_dep, gee_dep, gtk_dep, mutter_dep, gnome_desktop_dep, m_dep, posix_dep, sqlite3_dep, config_dep]
174+
gala_base_dep = [atk_bridge_dep, canberra_dep, glib_dep, gobject_dep, gio_dep, gio_unix_dep, gmodule_dep, gee_dep, gtk_dep, mutter_dep, gnome_desktop_dep, m_dep, posix_dep, sqlite3_dep, config_dep]
175175

176176
if get_option('systemd')
177177
gala_base_dep += systemd_dep

0 commit comments

Comments
 (0)