From 64849426ae2001409229a3fcb785334734c424e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Sat, 5 May 2018 09:02:14 +0200 Subject: [PATCH] inspector: Use unique names for g_object_set_data calls Otherwise the calls of the different inspector pages might end up clashing. --- gtk/inspector/object-tree.c | 4 ++-- gtk/inspector/prop-list.c | 4 ++-- gtk/inspector/resource-list.c | 4 ++-- gtk/inspector/statistics.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gtk/inspector/object-tree.c b/gtk/inspector/object-tree.c index 4e66b60236..30fc714fc8 100644 --- a/gtk/inspector/object-tree.c +++ b/gtk/inspector/object-tree.c @@ -798,11 +798,11 @@ on_hierarchy_changed (GtkWidget *widget, GtkWidget *toplevel; if (previous_toplevel) - g_object_set_data (G_OBJECT (previous_toplevel), "controller", NULL); + g_object_set_data (G_OBJECT (previous_toplevel), "object-controller", NULL); toplevel = gtk_widget_get_toplevel (widget); controller = gtk_event_controller_key_new (); - g_object_set_data_full (G_OBJECT (toplevel), "controller", controller, g_object_unref); + g_object_set_data_full (G_OBJECT (toplevel), "object-controller", controller, g_object_unref); g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), widget); gtk_widget_add_controller (toplevel, controller); diff --git a/gtk/inspector/prop-list.c b/gtk/inspector/prop-list.c index 9b851d86ec..70cc6521ab 100644 --- a/gtk/inspector/prop-list.c +++ b/gtk/inspector/prop-list.c @@ -111,11 +111,11 @@ hierarchy_changed (GtkWidget *widget, GtkWidget *toplevel; if (previous_toplevel) - g_object_set_data (G_OBJECT (previous_toplevel), "controller", NULL); + g_object_set_data (G_OBJECT (previous_toplevel), "prop-controller", NULL); toplevel = gtk_widget_get_toplevel (widget); controller = gtk_event_controller_key_new (); - g_object_set_data_full (G_OBJECT (toplevel), "controller", controller, g_object_unref); + g_object_set_data_full (G_OBJECT (toplevel), "prop-controller", controller, g_object_unref); g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), widget); gtk_widget_add_controller (toplevel, controller); } diff --git a/gtk/inspector/resource-list.c b/gtk/inspector/resource-list.c index 92409e62d7..bc724cdaec 100644 --- a/gtk/inspector/resource-list.c +++ b/gtk/inspector/resource-list.c @@ -478,11 +478,11 @@ on_hierarchy_changed (GtkWidget *widget, GtkWidget *toplevel; if (previous_toplevel) - g_object_set_data (G_OBJECT (previous_toplevel), "controller", NULL); + g_object_set_data (G_OBJECT (previous_toplevel), "resource-controller", NULL); toplevel = gtk_widget_get_toplevel (widget); controller = gtk_event_controller_key_new (); - g_object_set_data_full (G_OBJECT (toplevel), "controller", controller, g_object_unref); + g_object_set_data_full (G_OBJECT (toplevel), "resource-controller", controller, g_object_unref); g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), widget); gtk_widget_add_controller (toplevel, controller); diff --git a/gtk/inspector/statistics.c b/gtk/inspector/statistics.c index 48b812d41d..1e93dc4980 100644 --- a/gtk/inspector/statistics.c +++ b/gtk/inspector/statistics.c @@ -329,11 +329,11 @@ hierarchy_changed (GtkWidget *widget, GtkWidget *toplevel; if (previous_toplevel) - g_object_set_data (G_OBJECT (previous_toplevel), "controller", NULL); + g_object_set_data (G_OBJECT (previous_toplevel), "statistics-controller", NULL); toplevel = gtk_widget_get_toplevel (widget); controller = gtk_event_controller_key_new (); - g_object_set_data_full (G_OBJECT (toplevel), "controller", controller, g_object_unref); + g_object_set_data_full (G_OBJECT (toplevel), "statistics-controller", controller, g_object_unref); g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), widget); gtk_widget_add_controller (toplevel, controller);