Skip to content

Commit 35595d7

Browse files
authored
Merge branch 'main' into lenemter/gala-text
2 parents 9617266 + f3382c1 commit 35595d7

Some content is hidden

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

220 files changed

+9054
-10077
lines changed

data/gala.metainfo.xml.in

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,30 @@
2727
<update_contact>contact_at_elementary.io</update_contact>
2828

2929
<releases>
30-
<release version="8.2.4" date="2025-06-12" urgency="medium">
30+
<release version="8.2.5" date="2025-07-09" urgency="medium">
3131
<description>
3232
<p>Improvements:</p>
3333
<ul>
3434
<li>Updated translations</li>
3535
</ul>
3636
</description>
3737
<issues>
38+
<issue url="https://github.com/elementary/gala/issues/2458">Gala still segfaults while closing LibreOffice windows</issue>
39+
</issues>
40+
</release>
41+
42+
<release version="8.2.4" date="2025-06-30" urgency="medium">
43+
<description>
44+
<p>Improvements:</p>
45+
<ul>
46+
<li>Updated translations</li>
47+
</ul>
48+
</description>
49+
<issues>
50+
<issue url="https://github.com/elementary/gala/issues/1264">Applications menu opened but hidden in full screen mode</issue>
3851
<issue url="https://github.com/elementary/gala/issues/2438">Gala randomly segfaults while closing Libreoffice windows</issue>
52+
<issue url="https://github.com/elementary/gala/issues/2450">Apps not being brought to front</issue>
53+
<issue url="https://github.com/elementary/dock/issues/310">Some apps are not showing up in the dock</issue>
3954
</issues>
4055
</release>
4156

lib/AppSystem.vala

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,64 @@ public class Gala.AppSystem : GLib.Object {
1414
private GLib.HashTable<unowned string, Gala.App> id_to_app;
1515
private GLib.HashTable<string, string> startup_wm_class_to_id;
1616
private Gala.AppCache app_cache;
17+
private string[] all_desktop_files = {};
18+
private GLib.FileMonitor[]? directory_monitors;
1719

1820
construct {
1921
id_to_app = new GLib.HashTable<unowned string, Gala.App> (str_hash, str_equal);
2022
startup_wm_class_to_id = new GLib.HashTable<string, string> (str_hash, str_equal);
2123
running_apps = new GLib.HashTable<Gala.App, unowned Gala.App> (null, null);
2224
app_cache = new AppCache ();
25+
26+
update_desktop_files ();
27+
}
28+
29+
private void update_desktop_files () {
30+
var data_dirs = Environment.get_system_data_dirs ();
31+
data_dirs += Environment.get_user_data_dir ();
32+
33+
var create_monitors = directory_monitors == null;
34+
if (create_monitors) {
35+
directory_monitors = {};
36+
}
37+
38+
foreach (unowned string data_dir in data_dirs) {
39+
var app_dir = Path.build_filename (data_dir, "applications");
40+
if (FileUtils.test (app_dir, FileTest.EXISTS)) {
41+
try {
42+
foreach (var name in enumerate_children (app_dir)) {
43+
if (!name.contains ("~") && name.has_suffix (".desktop")) {
44+
all_desktop_files += name;
45+
}
46+
}
47+
48+
if (!create_monitors) {
49+
continue;
50+
}
51+
52+
var monitor = File.new_for_path (app_dir).monitor (GLib.FileMonitorFlags.NONE, null);
53+
monitor.changed.connect ((file, other_file, event_type) => {
54+
if (event_type == GLib.FileMonitorEvent.CHANGES_DONE_HINT) {
55+
update_desktop_files ();
56+
}
57+
});
58+
directory_monitors += monitor;
59+
} catch (Error e) {
60+
debug ("Error inside %s: %s", app_dir, e.message);
61+
}
62+
}
63+
}
64+
}
65+
66+
private string[] enumerate_children (string dir) throws Error {
67+
string[] result = {};
68+
FileInfo? file_info;
69+
var enumerator = File.new_for_path (dir).enumerate_children (FileAttribute.STANDARD_NAME, 0);
70+
while ((file_info = enumerator.next_file ()) != null) {
71+
result += file_info.get_name ();
72+
}
73+
74+
return result;
2375
}
2476

2577
public unowned Gala.App? lookup_app (string id) {
@@ -105,6 +157,20 @@ public class Gala.AppSystem : GLib.Object {
105157
return lookup_heuristic_basename (desktop_file);
106158
}
107159

160+
public unowned Gala.App? guess_app_by_id (string _id) {
161+
var id = _id.ascii_down ();
162+
unowned Gala.App? result = null;
163+
164+
foreach (var name in all_desktop_files) {
165+
// Try to find desktop file based on the application name
166+
if (name.contains (id) && (result = lookup_app (name)) != null) {
167+
return result;
168+
}
169+
}
170+
171+
return null;
172+
}
173+
108174
public void notify_app_state_changed (Gala.App app) {
109175
if (app.state == Gala.AppState.RUNNING) {
110176
running_apps.insert (app, app);

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('gala',
22
'c', 'vala',
3-
version: '8.2.3',
3+
version: '8.2.5',
44
meson_version: '>= 0.59.0',
55
license: 'GPL3',
66
)

po/aa.po

Lines changed: 42 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: gala 3.2.0\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
10-
"POT-Creation-Date: 2025-06-09 20:49+0000\n"
10+
"POT-Creation-Date: 2025-06-30 17:54+0000\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
@@ -102,89 +102,89 @@ msgstr ""
102102
msgid "elementary, Inc."
103103
msgstr ""
104104

105-
#: data/gala.metainfo.xml.in:32 data/gala.metainfo.xml.in:58
106-
#: data/gala.metainfo.xml.in:70 data/gala.metainfo.xml.in:84
107-
#: data/gala.metainfo.xml.in:117 data/gala.metainfo.xml.in:148
108-
#: data/gala.metainfo.xml.in:161 data/gala.metainfo.xml.in:176
109-
#: data/gala.metainfo.xml.in:193 data/gala.metainfo.xml.in:209
110-
#: data/gala.metainfo.xml.in:250 data/gala.metainfo.xml.in:275
111-
#: data/gala.metainfo.xml.in:291
105+
#: data/gala.metainfo.xml.in:32 data/gala.metainfo.xml.in:47
106+
#: data/gala.metainfo.xml.in:73 data/gala.metainfo.xml.in:85
107+
#: data/gala.metainfo.xml.in:99 data/gala.metainfo.xml.in:132
108+
#: data/gala.metainfo.xml.in:163 data/gala.metainfo.xml.in:176
109+
#: data/gala.metainfo.xml.in:191 data/gala.metainfo.xml.in:208
110+
#: data/gala.metainfo.xml.in:224 data/gala.metainfo.xml.in:265
111+
#: data/gala.metainfo.xml.in:290 data/gala.metainfo.xml.in:306
112112
msgid "Improvements:"
113113
msgstr ""
114114

115-
#: data/gala.metainfo.xml.in:34 data/gala.metainfo.xml.in:60
116-
#: data/gala.metainfo.xml.in:72 data/gala.metainfo.xml.in:86
117-
#: data/gala.metainfo.xml.in:119 data/gala.metainfo.xml.in:150
118-
#: data/gala.metainfo.xml.in:163 data/gala.metainfo.xml.in:178
119-
#: data/gala.metainfo.xml.in:197 data/gala.metainfo.xml.in:213
120-
#: data/gala.metainfo.xml.in:256 data/gala.metainfo.xml.in:278
121-
#: data/gala.metainfo.xml.in:293
115+
#: data/gala.metainfo.xml.in:34 data/gala.metainfo.xml.in:49
116+
#: data/gala.metainfo.xml.in:75 data/gala.metainfo.xml.in:87
117+
#: data/gala.metainfo.xml.in:101 data/gala.metainfo.xml.in:134
118+
#: data/gala.metainfo.xml.in:165 data/gala.metainfo.xml.in:178
119+
#: data/gala.metainfo.xml.in:193 data/gala.metainfo.xml.in:212
120+
#: data/gala.metainfo.xml.in:228 data/gala.metainfo.xml.in:271
121+
#: data/gala.metainfo.xml.in:293 data/gala.metainfo.xml.in:308
122122
msgid "Updated translations"
123123
msgstr ""
124124

125-
#: data/gala.metainfo.xml.in:87
125+
#: data/gala.metainfo.xml.in:102
126126
msgid "Window state is now saved on sleep and shutdown"
127127
msgstr ""
128128

129-
#: data/gala.metainfo.xml.in:88
129+
#: data/gala.metainfo.xml.in:103
130130
msgid "Remove scaling effect from menus"
131131
msgstr ""
132132

133-
#: data/gala.metainfo.xml.in:89
133+
#: data/gala.metainfo.xml.in:104
134134
msgid "Swipe up to close windows in Multitasking View"
135135
msgstr ""
136136

137-
#: data/gala.metainfo.xml.in:120
137+
#: data/gala.metainfo.xml.in:135
138138
msgid "Fixed rare crash when a dock window was killed"
139139
msgstr ""
140140

141-
#: data/gala.metainfo.xml.in:121
141+
#: data/gala.metainfo.xml.in:136
142142
msgid "Added interactive screenshot shortcut"
143143
msgstr ""
144144

145-
#: data/gala.metainfo.xml.in:122
145+
#: data/gala.metainfo.xml.in:137
146146
msgid "Fixed crash when using tiling shortcuts"
147147
msgstr ""
148148

149-
#: data/gala.metainfo.xml.in:151
149+
#: data/gala.metainfo.xml.in:166
150150
msgid "Improved shadows performance"
151151
msgstr ""
152152

153-
#: data/gala.metainfo.xml.in:195
153+
#: data/gala.metainfo.xml.in:210
154154
msgid "Fix a potential crash when moving windows between workspaces"
155155
msgstr ""
156156

157-
#: data/gala.metainfo.xml.in:196
157+
#: data/gala.metainfo.xml.in:211
158158
msgid "Fix notification animation when entering multitasking view"
159159
msgstr ""
160160

161-
#: data/gala.metainfo.xml.in:211
161+
#: data/gala.metainfo.xml.in:226
162162
msgid "Improve keyboard navigation in Multitasking View"
163163
msgstr ""
164164

165-
#: data/gala.metainfo.xml.in:212
165+
#: data/gala.metainfo.xml.in:227
166166
msgid "Change panel color at the same time as wallpaper transition"
167167
msgstr ""
168168

169-
#: data/gala.metainfo.xml.in:252
169+
#: data/gala.metainfo.xml.in:267
170170
msgid ""
171171
"Changing the wallpaper or going to sleep respects the \"Reduce Motion\" "
172172
"option"
173173
msgstr ""
174174

175-
#: data/gala.metainfo.xml.in:253
175+
#: data/gala.metainfo.xml.in:268
176176
msgid "Use appropriate drag-and-drop pointers when moving windows"
177177
msgstr ""
178178

179-
#: data/gala.metainfo.xml.in:254
179+
#: data/gala.metainfo.xml.in:269
180180
msgid "Fix the issue when gestures in the multitasking view might stop working"
181181
msgstr ""
182182

183-
#: data/gala.metainfo.xml.in:255
183+
#: data/gala.metainfo.xml.in:270
184184
msgid "Improve dynamic workspaces behaviour with multiple monitors"
185185
msgstr ""
186186

187-
#: data/gala.metainfo.xml.in:277
187+
#: data/gala.metainfo.xml.in:292
188188
msgid "Improve handling of move-to-workspace shortcut"
189189
msgstr ""
190190

@@ -254,63 +254,57 @@ msgstr ""
254254
msgid "Deny"
255255
msgstr ""
256256

257-
#: src/DesktopIntegration.vala:197
257+
#: src/DesktopIntegration.vala:192
258258
msgid "Window has already focus"
259259
msgstr ""
260260

261261
#. / TRANSLATORS: %s represents a timestamp here
262-
#: src/ScreenshotManager.vala:105
262+
#: src/ScreenshotManager.vala:102
263263
#, c-format
264264
msgid "Screenshot from %s"
265265
msgstr ""
266266

267-
#. / TRANSLATORS: %s represents a name of image viewer
268-
#: src/ScreenshotManager.vala:171
269-
#, c-format
270-
msgid "Open in %s"
271-
msgstr ""
272-
273267
#. / TRANSLATORS: %s represents a name of file manager
274-
#: src/ScreenshotManager.vala:178
268+
#: src/ScreenshotManager.vala:167
275269
#, c-format
276270
msgid "Show in %s"
277271
msgstr ""
278272

279-
#: src/ScreenshotManager.vala:189 src/ScreenshotManager.vala:548
273+
#: src/ScreenshotManager.vala:174 src/ScreenshotManager.vala:553
280274
msgid "Screenshot taken"
281275
msgstr ""
282276

283-
#: src/ScreenshotManager.vala:190
277+
#: src/ScreenshotManager.vala:175
284278
msgid "Screenshot is saved to clipboard"
285279
msgstr ""
286280

287-
#: src/ScreenshotManager.vala:190
281+
#: src/ScreenshotManager.vala:175
288282
msgid "Screenshot saved to screenshots folder"
289283
msgstr ""
290284

291-
#: src/ScreenshotManager.vala:456
285+
#: src/ScreenshotManager.vala:461
292286
msgid "Screenshots"
293287
msgstr ""
294288

295289
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:81
296290
msgid "Window switcher"
297291
msgstr ""
298292

299-
#: src/WindowManager.vala:1766
293+
#: src/WindowManager.vala:1799
300294
#, c-format
301295
msgid "Changes will automatically revert after %i second."
302296
msgid_plural "Changes will automatically revert after %i seconds."
303297
msgstr[0] ""
304298
msgstr[1] ""
305299

306-
#: src/WindowManager.vala:1773
300+
#: src/WindowManager.vala:1806
307301
msgid "Keep new display settings?"
308302
msgstr ""
309303

310-
#: src/WindowManager.vala:1777
304+
#: src/WindowManager.vala:1810
311305
msgid "Keep Settings"
312306
msgstr ""
313307

314-
#: src/WindowManager.vala:1778
308+
#: src/WindowManager.vala:1811
315309
msgid "Use Previous Settings"
316310
msgstr ""

0 commit comments

Comments
 (0)