[gnome-desktop] Handle all cases when switching on an enum
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-desktop] Handle all cases when switching on an enum
- Date: Mon, 12 Feb 2018 17:05:59 +0000 (UTC)
commit d52b1a23d3c8decdbc2dafdf82ae83df1b9ea8d6
Author: Ernestas Kulik <ernestask gnome org>
Date: Mon Feb 12 18:39:29 2018 +0200
Handle all cases when switching on an enum
https://bugzilla.gnome.org/show_bug.cgi?id=793195
libgnome-desktop/gnome-bg.c | 6 ++++++
libgnome-desktop/gnome-desktop-thumbnail-script.c | 1 -
libgnome-desktop/gnome-desktop-thumbnail.c | 3 +++
libgnome-desktop/gnome-pnp-ids.c | 2 +-
libgnome-desktop/gnome-rr.c | 12 ++++++------
5 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
index 2b6ecd3..eb0dc00 100644
--- a/libgnome-desktop/gnome-bg.c
+++ b/libgnome-desktop/gnome-bg.c
@@ -822,6 +822,11 @@ get_scaled_pixbuf (GDesktopBackgroundStyle placement,
new = pixbuf_scale_to_fit (pixbuf, width, height);
break;
+ case G_DESKTOP_BACKGROUND_STYLE_NONE:
+ /* This shouldn’t be true, but if it is, assert and
+ * fall through, in case assertions are disabled.
+ */
+ g_assert_not_reached ();
case G_DESKTOP_BACKGROUND_STYLE_CENTERED:
case G_DESKTOP_BACKGROUND_STYLE_WALLPAPER:
default:
@@ -867,6 +872,7 @@ draw_image_area (GnomeBG *bg,
case G_DESKTOP_BACKGROUND_STYLE_SPANNED:
pixbuf_blend (scaled, dest, 0, 0, w, h, x, y, 1.0);
break;
+ case G_DESKTOP_BACKGROUND_STYLE_NONE:
default:
g_assert_not_reached ();
break;
diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c
b/libgnome-desktop/gnome-desktop-thumbnail-script.c
index 4fb13d6..14e2fed 100644
--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
@@ -566,7 +566,6 @@ expand_thumbnailing_cmd (const char *cmd,
g_auto(GStrv) cmd_elems = NULL;
guint i;
gboolean got_in, got_out;
- g_autofree char *sandboxed_path = NULL;
if (!g_shell_parse_argv (cmd, NULL, &cmd_elems, error))
return NULL;
diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
index b815d3e..b31bad5 100644
--- a/libgnome-desktop/gnome-desktop-thumbnail.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail.c
@@ -554,6 +554,9 @@ thumbnailers_directory_changed (GFileMonitor *monitor,
case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
+ case G_FILE_MONITOR_EVENT_RENAMED:
+ case G_FILE_MONITOR_EVENT_MOVED_IN:
+ case G_FILE_MONITOR_EVENT_MOVED_OUT:
default:
break;
}
diff --git a/libgnome-desktop/gnome-pnp-ids.c b/libgnome-desktop/gnome-pnp-ids.c
index 40e640e..3a64cfc 100644
--- a/libgnome-desktop/gnome-pnp-ids.c
+++ b/libgnome-desktop/gnome-pnp-ids.c
@@ -103,10 +103,10 @@ gnome_pnp_ids_init (GnomePnpIds *pnp_ids)
static void
gnome_pnp_ids_finalize (GObject *object)
{
+#ifdef HAVE_UDEV
GnomePnpIds *pnp_ids = GNOME_PNP_IDS (object);
GnomePnpIdsPrivate *priv = pnp_ids->priv;
-#ifdef HAVE_UDEV
g_clear_pointer (&priv->udev, udev_unref);
g_clear_pointer (&priv->hwdb, udev_hwdb_unref);
#endif
diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
index 353af0e..8c50f02 100644
--- a/libgnome-desktop/gnome-rr.c
+++ b/libgnome-desktop/gnome-rr.c
@@ -1113,16 +1113,13 @@ gnome_rr_screen_get_dpms_mode (GnomeRRScreen *screen,
g_return_val_if_fail (mode != NULL, FALSE);
power_save = meta_dbus_display_config_get_power_save_mode (screen->priv->proxy);
-
- if (power_save == META_POWER_SAVE_UNKNOWN) {
+ switch (power_save) {
+ case META_POWER_SAVE_UNKNOWN:
g_set_error_literal (error,
GNOME_RR_ERROR,
GNOME_RR_ERROR_NO_DPMS_EXTENSION,
"Display is not DPMS capable");
- return FALSE;
- }
-
- switch (power_save) {
+ return FALSE;
case META_POWER_SAVE_ON:
*mode = GNOME_RR_DPMS_ON;
break;
@@ -1158,6 +1155,9 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
switch (mode) {
+ case GNOME_RR_DPMS_UNKNOWN:
+ power_save = META_POWER_SAVE_UNKNOWN;
+ break;
case GNOME_RR_DPMS_ON:
power_save = META_POWER_SAVE_ON;
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]