inspector: Use unique names for g_object_set_data calls

Otherwise the calls of the different inspector pages might end up
clashing.

diff --git a/gtk/inspector/object-tree.c b/gtk/inspector/object-tree.c
index 4e66b6023600aeb664fd4c2ab2b0c744d6457c12..30fc714fc8f8ebb03c6e764bc9edfeb0e449051c 100644 (file)
--- 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 9b851d86ec0d445a7f977d5411c5b29cb7777b0a..70cc6521abc6ffa7e2fb32d3d470bb0f254d3637 100644 (file)
--- 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 92409e62d744c1c3ed6bca15ff9e541016ed3d22..bc724cdaecd287f1ceb0b82b303b57a95d1dfc23 100644 (file)
--- 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 48b812d41d1fba46c48d935bd604937bcf9cb6ca..1e93dc4980d03931e1f14b4b7fbb8b210416bb5c 100644 (file)
--- 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);