1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
|
From: Boyuan Yang <byang@debian.org>
Date: Fri, 23 Aug 2024 13:37:41 -0400
Subject: Fix Werror=return-mismatch
Patch from https://gitlab.archlinux.org/archlinux/packaging/packages/notify-osd/-/issues/1
---
src/bubble-window.c | 4 ++--
src/display.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bubble-window.c b/src/bubble-window.c
index 0622d22..4833be0 100644
--- a/src/bubble-window.c
+++ b/src/bubble-window.c
@@ -78,8 +78,8 @@ bubble_window_get_accessible (GtkWidget *widget)
{
AtkObjectFactory *factory = NULL;
AtkRegistry *registry = NULL;
- GType derived_type = NULL;
- GType derived_atk_type = NULL;
+ GType derived_type = G_TYPE_NONE;
+ GType derived_atk_type = G_TYPE_NONE;
/*
* Figure out whether accessibility is enabled by looking at the
diff --git a/src/display.c b/src/display.c
index 8defd82..85aa3e6 100644
--- a/src/display.c
+++ b/src/display.c
@@ -288,7 +288,7 @@ stack_layout (Stack* self)
gint y = 0;
gint x = 0;
- g_return_if_fail (self != NULL);
+ g_return_val_if_fail (self != NULL, FALSE);
bubble = stack_select_next_to_display (self);
if (bubble == NULL)
|