Skip to content

Commit b815e5c

Browse files
zeebokzeebok
authored
Merge branch 'main' into lenemter/per-user-session
2 parents f6e9521 + 2fe3ef3 commit b815e5c

440 files changed

Lines changed: 7940 additions & 6343 deletions

File tree

Some content is hidden

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

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ jobs:
2222
- version: unstable
2323
mutter_pkg: libmutter-14-dev
2424
- version: development-target
25-
mutter_pkg: libmutter-14-dev
25+
mutter_pkg: libmutter-18-dev
26+
lightdm_vala: lightdm-vala
2627
container:
2728
image: ghcr.io/elementary/docker:${{ matrix.version }}
2829

@@ -31,7 +32,7 @@ jobs:
3132
- name: Install Dependencies
3233
run: |
3334
apt update
34-
apt install -y desktop-file-utils libgdk-pixbuf2.0-dev libgnome-desktop-3-dev libgranite-dev libgtk-3-dev libhandy-1-dev liblightdm-gobject-1-dev ${{ matrix.mutter_pkg }} libx11-dev meson valac
35+
apt install -y desktop-file-utils libgdk-pixbuf-2.0-dev libgnome-desktop-3-dev libgranite-dev libgtk-3-dev libhandy-1-dev libjson-glib-dev liblightdm-gobject-1-dev ${{ matrix.mutter_pkg }} libsoup-3.0-dev libx11-dev ${{ matrix.lightdm_vala }} meson valac
3536
- name: Build
3637
env:
3738
DESTDIR: out
@@ -75,8 +76,8 @@ jobs:
7576
DESTDIR: out
7677
run: |
7778
meson build
78-
ninja -C build install
79-
79+
ninja -C build install
80+
8081
lint:
8182
runs-on: ubuntu-latest
8283

@@ -89,4 +90,3 @@ jobs:
8990
run: |
9091
io.elementary.vala-lint -d compositor
9192
io.elementary.vala-lint -d src
92-

‎compositor/BackgroundBlurEffect.vala‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ public class GreeterCompositor.BackgroundBlurEffect : Clutter.Effect {
3939
}
4040

4141
construct {
42-
#if HAS_MUTTER47
43-
unowned var ctx = actor.context.get_backend ().get_cogl_context ();
44-
#else
4542
unowned var ctx = Clutter.get_default_backend ().get_cogl_context ();
46-
#endif
4743

4844
actor_pipeline = new Cogl.Pipeline (ctx);
4945
actor_pipeline.set_layer_null_texture (0);

‎compositor/KeyboardManager.vala‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,12 @@ public class GreeterCompositor.KeyboardManager : Object {
4848

4949
[CCode (instance_pos = -1)]
5050
public static bool handle_modifiers_accelerator_activated (Meta.Display display, bool backward) {
51+
#if !HAS_MUTTER50
5152
#if HAS_MUTTER46
5253
display.get_compositor ().backend.ungrab_keyboard (display.get_current_time ());
5354
#else
5455
display.ungrab_keyboard (display.get_current_time ());
56+
#endif
5557
#endif
5658

5759
var sources = settings.get_value ("sources");
@@ -79,7 +81,11 @@ public class GreeterCompositor.KeyboardManager : Object {
7981
private void set_keyboard_layout (GLib.Settings settings, string key) {
8082
unowned var backend = display.get_context ().get_backend ();
8183

84+
#if HAS_MUTTER50
85+
if (key == "sources" || key == "xkb-options" || key == "current") {
86+
#else
8287
if (key == "sources" || key == "xkb-options") {
88+
#endif
8389
string[] layouts = {}, variants = {};
8490

8591
var sources = settings.get_value ("sources");
@@ -111,7 +117,12 @@ public class GreeterCompositor.KeyboardManager : Object {
111117
cancellable = new GLib.Cancellable ();
112118
}
113119

120+
#if HAS_MUTTER50
121+
var description = new Meta.KeymapDescription.from_rules (settings.get_string ("xkb-model"), layout, variant, options, layouts, layouts);
122+
backend.set_keymap_async.begin (description, settings.get_uint ("current"), cancellable, (obj, res) => {
123+
#else
114124
backend.set_keymap_async.begin (layout, variant, options, settings.get_string ("xkb-model"), cancellable, (obj, res) => {
125+
#endif
115126
try {
116127
((Meta.Backend) obj).set_keymap_async.end (res);
117128
} catch (Error e) {
@@ -128,6 +139,7 @@ public class GreeterCompositor.KeyboardManager : Object {
128139
#else
129140
backend.set_keymap (layout, variant, options);
130141
#endif
142+
#if !HAS_MUTTER50
131143
} else if (key == "current") {
132144
#if HAS_MUTTER49
133145
if (cancellable != null) {
@@ -148,6 +160,7 @@ public class GreeterCompositor.KeyboardManager : Object {
148160
});
149161
#else
150162
backend.lock_layout_group (settings.get_uint ("current"));
163+
#endif
151164
#endif
152165
}
153166
}

‎compositor/meson.build‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,17 @@ if mutter49_dep.found()
6868
vala_flags = ['--define', 'HAS_MUTTER46', '--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48', '--define', 'HAS_MUTTER49']
6969
endif
7070

71+
mutter50_dep = dependency('libmutter-18', version: ['>= 50', '< 51'], required: false)
72+
if mutter50_dep.found()
73+
libmutter_dep = dependency('libmutter-18', version: '>= 50')
74+
mutter_dep = [
75+
libmutter_dep,
76+
dependency('mutter-mtk-18'), dependency('mutter-cogl-18'),
77+
dependency('mutter-clutter-18')
78+
]
79+
vala_flags = ['--define', 'HAS_MUTTER46', '--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48', '--define', 'HAS_MUTTER49', '--define', 'HAS_MUTTER50']
80+
endif
81+
7182
if mutter_dep.length() == 0
7283
error ('No supported mutter library found!')
7384
endif

‎po/aa.po‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
msgid ""
22
msgstr ""
33
"Report-Msgid-Bugs-To: \n"
4-
"POT-Creation-Date: 2025-10-02 15:56+0000\n"
4+
"POT-Creation-Date: 2026-03-29 15:12+0000\n"
55
"MIME-Version: 1.0\n"
66
"Content-Type: text/plain; charset=UTF-8\n"
77

8-
#: compositor/WindowManager.vala:337
8+
#: compositor/WindowManager.vala:362
99
#, c-format
1010
msgid "Changes will automatically revert after %i second."
1111
msgid_plural "Changes will automatically revert after %i seconds."
1212
msgstr[0] ""
1313
msgstr[1] ""
1414

15-
#: compositor/WindowManager.vala:344
15+
#: compositor/WindowManager.vala:369
1616
msgid "Keep new display settings?"
1717
msgstr ""
1818

19-
#: compositor/WindowManager.vala:348
19+
#: compositor/WindowManager.vala:373
2020
msgid "Keep Settings"
2121
msgstr ""
2222

23-
#: compositor/WindowManager.vala:349
23+
#: compositor/WindowManager.vala:374
2424
msgid "Use Previous Settings"
2525
msgstr ""
2626

@@ -40,19 +40,19 @@ msgstr ""
4040
msgid "Manual Login…"
4141
msgstr ""
4242

43-
#: src/MainWindow.vala:326
43+
#: src/MainWindow.vala:320
4444
msgid "Unable to Log In"
4545
msgstr ""
4646

47-
#: src/MainWindow.vala:327
47+
#: src/MainWindow.vala:321
4848
msgid "Starting the session has failed."
4949
msgstr ""
5050

51-
#: src/MainWindow.vala:389
51+
#: src/MainWindow.vala:383
5252
msgid "Unable to Launch Initial Setup"
5353
msgstr ""
5454

55-
#: src/MainWindow.vala:394
55+
#: src/MainWindow.vala:388
5656
msgid ""
5757
"Initial Setup creates your first user. Without it, you will not be able to "
5858
"log in and may need to reinstall the OS."
@@ -66,15 +66,15 @@ msgstr ""
6666
msgid "Username"
6767
msgstr ""
6868

69-
#: src/Cards/UserCard.vala:88 src/Widgets/PasswordEntry.vala:27
69+
#: src/Cards/UserCard.vala:63 src/Widgets/PasswordEntry.vala:27
7070
msgid "Log In"
7171
msgstr ""
7272

73-
#: src/Cards/UserCard.vala:105
73+
#: src/Cards/UserCard.vala:81
7474
msgid "Account disabled"
7575
msgstr ""
7676

77-
#: src/Cards/UserCard.vala:167 src/Cards/UserCard.vala:170
77+
#: src/Cards/UserCard.vala:137 src/Cards/UserCard.vala:140
7878
msgid "Session cannot be changed while user is logged in"
7979
msgstr ""
8080

‎po/ab.po‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
msgid ""
22
msgstr ""
33
"Report-Msgid-Bugs-To: \n"
4-
"POT-Creation-Date: 2025-10-02 15:56+0000\n"
4+
"POT-Creation-Date: 2026-03-29 15:12+0000\n"
55
"MIME-Version: 1.0\n"
66
"Content-Type: text/plain; charset=UTF-8\n"
77

8-
#: compositor/WindowManager.vala:337
8+
#: compositor/WindowManager.vala:362
99
#, c-format
1010
msgid "Changes will automatically revert after %i second."
1111
msgid_plural "Changes will automatically revert after %i seconds."
1212
msgstr[0] ""
1313
msgstr[1] ""
1414

15-
#: compositor/WindowManager.vala:344
15+
#: compositor/WindowManager.vala:369
1616
msgid "Keep new display settings?"
1717
msgstr ""
1818

19-
#: compositor/WindowManager.vala:348
19+
#: compositor/WindowManager.vala:373
2020
msgid "Keep Settings"
2121
msgstr ""
2222

23-
#: compositor/WindowManager.vala:349
23+
#: compositor/WindowManager.vala:374
2424
msgid "Use Previous Settings"
2525
msgstr ""
2626

@@ -40,19 +40,19 @@ msgstr ""
4040
msgid "Manual Login…"
4141
msgstr ""
4242

43-
#: src/MainWindow.vala:326
43+
#: src/MainWindow.vala:320
4444
msgid "Unable to Log In"
4545
msgstr ""
4646

47-
#: src/MainWindow.vala:327
47+
#: src/MainWindow.vala:321
4848
msgid "Starting the session has failed."
4949
msgstr ""
5050

51-
#: src/MainWindow.vala:389
51+
#: src/MainWindow.vala:383
5252
msgid "Unable to Launch Initial Setup"
5353
msgstr ""
5454

55-
#: src/MainWindow.vala:394
55+
#: src/MainWindow.vala:388
5656
msgid ""
5757
"Initial Setup creates your first user. Without it, you will not be able to "
5858
"log in and may need to reinstall the OS."
@@ -66,15 +66,15 @@ msgstr ""
6666
msgid "Username"
6767
msgstr ""
6868

69-
#: src/Cards/UserCard.vala:88 src/Widgets/PasswordEntry.vala:27
69+
#: src/Cards/UserCard.vala:63 src/Widgets/PasswordEntry.vala:27
7070
msgid "Log In"
7171
msgstr ""
7272

73-
#: src/Cards/UserCard.vala:105
73+
#: src/Cards/UserCard.vala:81
7474
msgid "Account disabled"
7575
msgstr ""
7676

77-
#: src/Cards/UserCard.vala:167 src/Cards/UserCard.vala:170
77+
#: src/Cards/UserCard.vala:137 src/Cards/UserCard.vala:140
7878
msgid "Session cannot be changed while user is logged in"
7979
msgstr ""
8080

‎po/ace.po‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: pantheon-greeter\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2025-10-02 15:56+0000\n"
10+
"POT-Creation-Date: 2026-03-29 15:12+0000\n"
1111
"PO-Revision-Date: 2013-06-12 04:40+0000\n"
1212
"Last-Translator: Eduard Gotwig <eduardgotwig@gmail.com>\n"
1313
"Language-Team: Acehnese <ace@li.org>\n"
@@ -18,22 +18,22 @@ msgstr ""
1818
"X-Launchpad-Export-Date: 2017-03-09 05:44+0000\n"
1919
"X-Generator: Launchpad (build 18330)\n"
2020

21-
#: compositor/WindowManager.vala:337
21+
#: compositor/WindowManager.vala:362
2222
#, c-format
2323
msgid "Changes will automatically revert after %i second."
2424
msgid_plural "Changes will automatically revert after %i seconds."
2525
msgstr[0] ""
2626
msgstr[1] ""
2727

28-
#: compositor/WindowManager.vala:344
28+
#: compositor/WindowManager.vala:369
2929
msgid "Keep new display settings?"
3030
msgstr ""
3131

32-
#: compositor/WindowManager.vala:348
32+
#: compositor/WindowManager.vala:373
3333
msgid "Keep Settings"
3434
msgstr ""
3535

36-
#: compositor/WindowManager.vala:349
36+
#: compositor/WindowManager.vala:374
3737
msgid "Use Previous Settings"
3838
msgstr ""
3939

@@ -53,19 +53,19 @@ msgstr ""
5353
msgid "Manual Login…"
5454
msgstr ""
5555

56-
#: src/MainWindow.vala:326
56+
#: src/MainWindow.vala:320
5757
msgid "Unable to Log In"
5858
msgstr ""
5959

60-
#: src/MainWindow.vala:327
60+
#: src/MainWindow.vala:321
6161
msgid "Starting the session has failed."
6262
msgstr ""
6363

64-
#: src/MainWindow.vala:389
64+
#: src/MainWindow.vala:383
6565
msgid "Unable to Launch Initial Setup"
6666
msgstr ""
6767

68-
#: src/MainWindow.vala:394
68+
#: src/MainWindow.vala:388
6969
msgid ""
7070
"Initial Setup creates your first user. Without it, you will not be able to "
7171
"log in and may need to reinstall the OS."
@@ -79,15 +79,15 @@ msgstr ""
7979
msgid "Username"
8080
msgstr ""
8181

82-
#: src/Cards/UserCard.vala:88 src/Widgets/PasswordEntry.vala:27
82+
#: src/Cards/UserCard.vala:63 src/Widgets/PasswordEntry.vala:27
8383
msgid "Log In"
8484
msgstr ""
8585

86-
#: src/Cards/UserCard.vala:105
86+
#: src/Cards/UserCard.vala:81
8787
msgid "Account disabled"
8888
msgstr ""
8989

90-
#: src/Cards/UserCard.vala:167 src/Cards/UserCard.vala:170
90+
#: src/Cards/UserCard.vala:137 src/Cards/UserCard.vala:140
9191
msgid "Session cannot be changed while user is logged in"
9292
msgstr ""
9393

0 commit comments

Comments
 (0)