Merge branch 'matthiasc/for-main' into 'main'

inspector: Avoid a crash

See merge request GNOME/gtk!4617

2 files changed, 7 insertions, 3 deletions

diff --git a/gtk/inspector/prop-editor.c b/gtk/inspector/prop-editor.c
index db3d6f2c1b..05048f5472 100644
--- a/gtk/inspector/prop-editor.c
+++ b/gtk/inspector/prop-editor.c
@@ -405,7 +405,7 @@ attr_list_changed (GObject *object, GParamSpec *pspec, gpointer data)
 {
   GtkEntry *entry = GTK_ENTRY (data);
   GValue val = G_VALUE_INIT;
-  char *str;
+  char *str = NULL;
   const char *text;
   PangoAttrList *attrs;
 
@@ -413,7 +413,8 @@ attr_list_changed (GObject *object, GParamSpec *pspec, gpointer data)
   get_property_value (object, pspec, &val);
 
   attrs = g_value_get_boxed (&val);
-  str = pango_attr_list_to_string (attrs);
+  if (attrs)
+    str = pango_attr_list_to_string (attrs);
   if (str == NULL)
     str = g_strdup ("");
   text = gtk_editable_get_text (GTK_EDITABLE (entry));
diff --git a/gtk/inspector/recorder.c b/gtk/inspector/recorder.c
index 48ff6105b7..a237509a80 100644
--- a/gtk/inspector/recorder.c
+++ b/gtk/inspector/recorder.c
@@ -1807,7 +1807,7 @@ static char *
 get_event_summary (GdkEvent *event)
 {
   double x, y;
-  int type;
+  GdkEventType type;
   const char *name;
 
   gdk_event_get_position (event, &x, &y);
@@ -1829,6 +1829,7 @@ get_event_summary (GdkEvent *event)
     case GDK_TOUCH_CANCEL:
     case GDK_TOUCHPAD_SWIPE:
     case GDK_TOUCHPAD_PINCH:
+    case GDK_TOUCHPAD_HOLD:
     case GDK_BUTTON_PRESS:
     case GDK_BUTTON_RELEASE:
       return g_strdup_printf ("%s (%.2f %.2f)", name, x, y);
@@ -1854,6 +1855,7 @@ get_event_summary (GdkEvent *event)
     case GDK_PAD_RING:
     case GDK_PAD_STRIP:
     case GDK_PAD_GROUP_MODE:
+    case GDK_DELETE:
       return g_strdup_printf ("%s", name);
 
     case GDK_SCROLL:
@@ -1868,6 +1870,7 @@ get_event_summary (GdkEvent *event)
         }
       break;
 
+    case GDK_EVENT_LAST:
     default:
       g_assert_not_reached ();
     }