Merge branch 'wip/baedert/for-master' into 'master'

label: Remove redundant store

Closes #4196

See merge request GNOME/gtk!3891

9 files changed, 21 insertions, 8 deletions

diff --git a/demos/widget-factory/beach.jpg b/demos/widget-factory/beach.jpg
index 6966b4e0b6..fae1c3552e 100644
--- a/demos/widget-factory/beach.jpg
+++ b/demos/widget-factory/beach.jpg
diff --git a/demos/widget-factory/nyc.jpg b/demos/widget-factory/nyc.jpg
index 7b6dda4412..ed76804e2a 100644
--- a/demos/widget-factory/nyc.jpg
+++ b/demos/widget-factory/nyc.jpg
diff --git a/demos/widget-factory/sunset.jpg b/demos/widget-factory/sunset.jpg
index cc25599bae..712681c074 100644
--- a/demos/widget-factory/sunset.jpg
+++ b/demos/widget-factory/sunset.jpg
diff --git a/gdk/loaders/gdktiff.c b/gdk/loaders/gdktiff.c
index 62d2194f0c..53b1a1a095 100644
--- a/gdk/loaders/gdktiff.c
+++ b/gdk/loaders/gdktiff.c
@@ -372,7 +372,7 @@ load_fallback (TIFF    *tif,
 
   data = g_malloc (width * height * 4);
 
-  if (!TIFFReadRGBAImageOriented (tif, width, height, (uint32 *)data, ORIENTATION_TOPLEFT, 1))
+  if (!TIFFReadRGBAImageOriented (tif, width, height, (guint32 *)data, ORIENTATION_TOPLEFT, 1))
     {
       g_set_error_literal (error,
                            GDK_TEXTURE_ERROR, GDK_TEXTURE_ERROR_CORRUPT_IMAGE,
diff --git a/gtk/gtkconstraintsolver.c b/gtk/gtkconstraintsolver.c
index 14117e08ba..4148cfc43a 100644
--- a/gtk/gtkconstraintsolver.c
+++ b/gtk/gtkconstraintsolver.c
@@ -754,7 +754,6 @@ gtk_constraint_solver_optimize (GtkConstraintSolver *self,
       double t_c;
       double objective_coefficient = 0.0;
       double min_ratio;
-      double r;
 
       gtk_constraint_expression_iter_init (&eiter, z_row);
       while (gtk_constraint_expression_iter_prev (&eiter, &t_v, &t_c))
@@ -771,7 +770,6 @@ gtk_constraint_solver_optimize (GtkConstraintSolver *self,
         break;
 
       min_ratio = DBL_MAX;
-      r = 0;
 
       column_vars = gtk_constraint_solver_get_column_set (self, entry);
       gtk_constraint_variable_set_iter_init (&viter, column_vars);
@@ -786,7 +784,7 @@ gtk_constraint_solver_optimize (GtkConstraintSolver *self,
                 {
                   double constant = gtk_constraint_expression_get_constant (expr);
 
-                  r = -1.0 * constant / coeff;
+                  double r = -1.0 * constant / coeff;
                   if (r < min_ratio)
                     {
                       min_ratio = r;
diff --git a/gtk/gtkcssimageurl.c b/gtk/gtkcssimageurl.c
index 15d56ac21e..8c9253744b 100644
--- a/gtk/gtkcssimageurl.c
+++ b/gtk/gtkcssimageurl.c
@@ -59,7 +59,7 @@ gtk_css_image_url_load_image (GtkCssImageUrl  *url,
 
   if (texture == NULL)
     {
-      if (error)
+      if (error && local_error)
         {
           char *uri;
 
@@ -70,7 +70,7 @@ gtk_css_image_url_load_image (GtkCssImageUrl  *url,
                        "Error loading image '%s': %s", uri, local_error->message);
           g_free (uri);
        }
-      
+
       url->loaded_image = gtk_css_image_invalid_new ();
     }
   else
diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c
index dfb584cece..a77bca8300 100644
--- a/gtk/gtkstackswitcher.c
+++ b/gtk/gtkstackswitcher.c
@@ -273,6 +273,8 @@ add_child (guint             position,
 
   button = g_object_new (GTK_TYPE_TOGGLE_BUTTON,
                          "accessible-role", GTK_ACCESSIBLE_ROLE_TAB,
+                         "hexpand", TRUE,
+                         "vexpand", TRUE,
                          NULL);
   gtk_widget_set_focus_on_click (button, FALSE);
 
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 44cf033d2a..d17d102441 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5892,7 +5892,7 @@ gtk_window_set_auto_startup_notification (gboolean setting)
 }
 
 /**
- * gtk_window_get_mnemonics_visible: (attributes org.gtk.MEthod.get_property=mnemonics-visible)
+ * gtk_window_get_mnemonics_visible: (attributes org.gtk.Method.get_property=mnemonics-visible)
  * @window: a `GtkWindow`
  *
  * Gets whether mnemonics are supposed to be visible.
@@ -5911,7 +5911,7 @@ gtk_window_get_mnemonics_visible (GtkWindow *window)
 }
 
 /**
- * gtk_window_set_mnemonics_visible:
+ * gtk_window_set_mnemonics_visible: (attributes org.gtk.Method.set_property=mnemonics-visible)
  * @window: a `GtkWindow`
  * @setting: the new value
  *
diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c
index 02b108d882..6bc0df080a 100644
--- a/gtk/inspector/window.c
+++ b/gtk/inspector/window.c
@@ -84,6 +84,12 @@ static guint signals[LAST_SIGNAL];
 
 G_DEFINE_TYPE (GtkInspectorWindow, gtk_inspector_window, GTK_TYPE_WINDOW)
 
+
+/* Fast way of knowing that further checks are necessary because at least
+ * one inspector window has been constructed. */
+static gboolean any_inspector_window_constructed = FALSE;
+
+
 static gboolean
 set_selected_object (GtkInspectorWindow *iw,
                      GObject            *selected)
@@ -286,6 +292,7 @@ gtk_inspector_window_constructed (GObject *object)
   G_OBJECT_CLASS (gtk_inspector_window_parent_class)->constructed (object);
 
   g_object_set_data (G_OBJECT (iw->inspected_display), "-gtk-inspector", iw);
+  any_inspector_window_constructed = TRUE;
 
   gtk_inspector_object_tree_set_display (GTK_INSPECTOR_OBJECT_TREE (iw->object_tree), iw->inspected_display);
   gtk_inspector_css_editor_set_display (GTK_INSPECTOR_CSS_EDITOR (iw->css_editor), iw->inspected_display);
@@ -836,6 +843,9 @@ gtk_inspector_is_recording (GtkWidget *widget)
 {
   GtkInspectorWindow *iw;
 
+  if (!any_inspector_window_constructed)
+    return FALSE;
+
   iw = gtk_inspector_window_get_for_display (gtk_widget_get_display (widget));
   if (iw == NULL)
     return FALSE;
@@ -853,6 +863,9 @@ gtk_inspector_handle_event (GdkEvent *event)
   GtkInspectorWindow *iw;
   gboolean handled = FALSE;
 
+  if (!any_inspector_window_constructed)
+    return FALSE;
+
   iw = gtk_inspector_window_get_for_display (gdk_event_get_display (event));
   if (iw == NULL)
     return FALSE;