Dominique Leuenberger
761b0821e6
wayland does not rely on the xf86 drivers.
- Update to version 47.2:
+ Power:
- Fix possible invalid reads if backlight fails to initialize.
- Handle broken upower more elegantly.
- Test warning fixes.
+ Updated translations.
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=428
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
Index: gnome-settings-daemon-45.0/plugins/media-keys/gsd-media-keys-manager.c
|
|
===================================================================
|
|
--- gnome-settings-daemon-45.0.orig/plugins/media-keys/gsd-media-keys-manager.c
|
|
+++ gnome-settings-daemon-45.0/plugins/media-keys/gsd-media-keys-manager.c
|
|
@@ -350,7 +350,7 @@ get_key_string (MediaKey *key)
|
|
else if (key->custom_path != NULL)
|
|
return g_strdup_printf ("custom:%s", key->custom_path);
|
|
else
|
|
- g_assert_not_reached ();
|
|
+ return NULL;
|
|
}
|
|
|
|
static GStrv
|
|
@@ -392,7 +392,7 @@ get_bindings (GsdMediaKeysManager *manag
|
|
key->custom_path);
|
|
binding = g_settings_get_string (settings, "binding");
|
|
} else
|
|
- g_assert_not_reached ();
|
|
+ return NULL;
|
|
|
|
array = g_ptr_array_new ();
|
|
g_ptr_array_add (array, binding);
|
|
Index: gnome-settings-daemon-45.0/plugins/rfkill/rfkill-glib.c
|
|
===================================================================
|
|
--- gnome-settings-daemon-45.0.orig/plugins/rfkill/rfkill-glib.c
|
|
+++ gnome-settings-daemon-45.0/plugins/rfkill/rfkill-glib.c
|
|
@@ -268,7 +268,7 @@ op_to_string (unsigned int op)
|
|
case RFKILL_OP_CHANGE_ALL:
|
|
return "CHANGE_ALL";
|
|
default:
|
|
- g_assert_not_reached ();
|
|
+ return "NULL";
|
|
}
|
|
}
|
|
|
|
Index: gnome-settings-daemon-45.0/plugins/xsettings/xsettings-manager.c
|
|
===================================================================
|
|
--- gnome-settings-daemon-45.0.orig/plugins/xsettings/xsettings-manager.c
|
|
+++ gnome-settings-daemon-45.0/plugins/xsettings/xsettings-manager.c
|
|
@@ -271,7 +271,7 @@ xsettings_get_typecode (GVariant *value)
|
|
case G_VARIANT_CLASS_TUPLE:
|
|
return XSETTINGS_TYPE_COLOR;
|
|
default:
|
|
- g_assert_not_reached ();
|
|
+ return 0;
|
|
}
|
|
}
|
|
|