libcinnamon-desktop: Fix some various build warnings, and an

incorrect free.

Author: mtwebster

libcinnamon-desktop/gnome-bg-crossfade.c

@@ -399,7 +399,7 @@ draw_background (GnomeBGCrossfade *fade)
                 send_root_property_change_notification (fade);
 
 		gdk_flush ();
-		gdk_error_trap_pop (); // ignore errors
+		gdk_error_trap_pop_ignored (); // ignore errors
 	} else {
 		gdk_window_invalidate_rect (fade->priv->window, NULL, FALSE);
 		gdk_window_process_updates (fade->priv->window, FALSE);

libcinnamon-desktop/gnome-desktop-thumbnail.c

@@ -494,7 +494,12 @@ gnome_desktop_thumbnail_factory_finalize (GObject *object)
 
   priv = factory->priv;
 
-  g_clear_pointer (&priv->thumbnailers, thumbnailer_unref);
+  if (priv->thumbnailers)
+    {
+      g_list_free_full (priv->thumbnailers, (GDestroyNotify)thumbnailer_unref);
+      priv->thumbnailers = NULL;
+    }
+
   g_clear_pointer (&priv->mime_types_map, g_hash_table_destroy);
 
   if (priv->monitors)

libcinnamon-desktop/gnome-rr-config.c

@@ -1469,7 +1469,7 @@ gnome_rr_config_apply_with_time (GnomeRRConfig *config,
 
 
 	gdk_flush ();
-	gdk_error_trap_pop (); // ignore errors
+	gdk_error_trap_pop_ignored (); // ignore errors
     }
 
     if (result == TRUE)

libcinnamon-desktop/gnome-rr-config.h

@@ -84,7 +84,7 @@ void     gnome_rr_output_info_get_vendor       (GnomeRROutputInfo *self, gchar*
 guint    gnome_rr_output_info_get_product      (GnomeRROutputInfo *self);
 guint    gnome_rr_output_info_get_serial       (GnomeRROutputInfo *self);
 double   gnome_rr_output_info_get_aspect_ratio (GnomeRROutputInfo *self);
-char    *gnome_rr_output_info_get_display_name (GnomeRROutputInfo *self);
+const char    *gnome_rr_output_info_get_display_name (GnomeRROutputInfo *self);
 
 gboolean gnome_rr_output_info_get_primary (GnomeRROutputInfo *self);
 void     gnome_rr_output_info_set_primary (GnomeRROutputInfo *self, gboolean primary);

libcinnamon-desktop/gnome-rr-output-info.c

@@ -264,7 +264,7 @@ double gnome_rr_output_info_get_aspect_ratio (GnomeRROutputInfo *self)
  *
  * Returns: (transfer none): the display name of this output
  */
-char *gnome_rr_output_info_get_display_name (GnomeRROutputInfo *self)
+const char *gnome_rr_output_info_get_display_name (GnomeRROutputInfo *self)
 {
     g_return_val_if_fail (GNOME_IS_RR_OUTPUT_INFO (self), NULL);
 

libcinnamon-desktop/gnome-rr.c

@@ -2162,7 +2162,6 @@ set_crtc_scale (GnomeRRCrtc *crtc,
 {
     gchar *filter;
     float real_scale;
-    int i;
     int looks_like_w, looks_like_h;
 
     real_scale = global_scale / scale;
@@ -2761,13 +2760,6 @@ gnome_rr_crtc_get_gamma (GnomeRRCrtc *crtc, int *size,
  * apps to work, and it's better to just be tiny */
 #define HIDPI_MIN_HEIGHT 1500
 
-static gboolean
-is_logical_size_large_enough (int width,
-                              int height)
-{
-  return height > HIDPI_MIN_SCALED_HEIGHT;
-}
-
 static gboolean
 is_scale_valid_for_size (float width,
                          float height,