Skip to content

Commit bc0d46d

Browse files
authored
Merge branch 'main' into leolost/fix-notification-segfault
2 parents 2b92505 + bb04c32 commit bc0d46d

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

data/gala.metainfo.xml.in

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

2929
<releases>
30-
<release version="8.0.4" date="2024-11-23" urgency="medium">
30+
<release version="8.0.4" date="2024-12-02" urgency="medium">
3131
<description>
3232
<p>Improvements:</p>
3333
<ul>

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.0.3',
3+
version: '8.0.4',
44
meson_version: '>= 0.59.0',
55
license: 'GPL3',
66
)

src/ShellClients/HideTracker.vala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ public class Gala.HideTracker : Object {
5151
if (hide_timeout_id != 0) {
5252
Source.remove (hide_timeout_id);
5353
}
54+
55+
if (update_timeout_id != 0) {
56+
Source.remove (update_timeout_id);
57+
}
5458
}
5559

5660
construct {
@@ -95,7 +99,7 @@ public class Gala.HideTracker : Object {
9599
display.get_stage ().add_action_full ("panel-swipe-gesture", CAPTURE, pan_action);
96100
}
97101

98-
//Can be removed with mutter > 45
102+
#if !HAS_MUTTER45
99103
private bool window_has_pointer () {
100104
var cursor_tracker = display.get_cursor_tracker ();
101105
Graphene.Point pointer_pos;
@@ -114,6 +118,7 @@ public class Gala.HideTracker : Object {
114118
};
115119
return graphene_window_rect.contains_point (pointer_pos);
116120
}
121+
#endif
117122

118123
private void track_focus_window (Meta.Window? window) {
119124
if (window == null) {

src/WindowManager.vala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,6 +1295,8 @@ namespace Gala {
12951295
case Meta.SizeChange.UNFULLSCREEN:
12961296
handle_fullscreen_window (window, which_change_local);
12971297
break;
1298+
default:
1299+
break;
12981300
}
12991301

13001302
size_change_completed (actor);

0 commit comments

Comments
 (0)