diff options
author | Matthias Clasen <mclasen@redhat.com> | 2022-09-28 17:02:09 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2022-09-28 17:02:09 +0000 |
commit | 39bc13c8a7461a842512723244359bbc7a8b6a0f (patch) | |
tree | f21d35894b4c400236d38a731b58455bb1f7314e | |
parent | 349cda3d361f872970d81d9cec56d2cc45857d81 (diff) | |
parent | dd7cd6ffdd63d4b5e8aa096dea7f7aaf91612be3 (diff) | |
download | gtk+-39bc13c8a7461a842512723244359bbc7a8b6a0f.tar.gz |
Merge branch 'matthiasc/for-main' into 'main'
Add more names to sources
See merge request GNOME/gtk!5064
-rw-r--r-- | gdk/gdkcontentdeserializer.c | 11 | ||||
-rw-r--r-- | gdk/gdkcontentserializer.c | 11 | ||||
-rw-r--r-- | gdk/gdkframeclockidle.c | 1 | ||||
-rw-r--r-- | gdk/gdksurface.c | 9 | ||||
-rw-r--r-- | gtk/gtkfilechooserwidget.c | 1 | ||||
-rw-r--r-- | gtk/gtksortlistmodel.c | 1 | ||||
-rw-r--r-- | gtk/gtktrashmonitor.c | 1 | ||||
-rw-r--r-- | gtk/gtkvideo.c | 1 | ||||
-rw-r--r-- | gtk/gtkwidgetpaintable.c | 2 | ||||
-rw-r--r-- | gtk/gtkwindow.c | 5 |
10 files changed, 29 insertions, 14 deletions
diff --git a/gdk/gdkcontentdeserializer.c b/gdk/gdkcontentdeserializer.c index 7603cec306..7511aba467 100644 --- a/gdk/gdkcontentdeserializer.c +++ b/gdk/gdkcontentdeserializer.c @@ -25,6 +25,7 @@ #include "filetransferportalprivate.h" #include "gdktexture.h" #include "gdkrgbaprivate.h" +#include "gdkprivate.h" #include "loaders/gdkpngprivate.h" #include "loaders/gdktiffprivate.h" @@ -354,12 +355,14 @@ gdk_content_deserializer_return_success (GdkContentDeserializer *deserializer) { g_return_if_fail (GDK_IS_CONTENT_DESERIALIZER (deserializer)); g_return_if_fail (!deserializer->returned); + guint source_id; deserializer->returned = TRUE; - g_idle_add_full (deserializer->priority, - gdk_content_deserializer_emit_callback, - deserializer, - g_object_unref); + source_id = g_idle_add_full (deserializer->priority, + gdk_content_deserializer_emit_callback, + deserializer, + g_object_unref); + gdk_source_set_static_name_by_id (source_id, "[gtk] gdk_content_deserializer_emit_callback"); /* NB: the idle will destroy our reference */ } diff --git a/gdk/gdkcontentserializer.c b/gdk/gdkcontentserializer.c index 686f15af80..0e24b222e6 100644 --- a/gdk/gdkcontentserializer.c +++ b/gdk/gdkcontentserializer.c @@ -30,6 +30,7 @@ #include "loaders/gdktiffprivate.h" #include "loaders/gdkjpegprivate.h" #include "gdkmemorytextureprivate.h" +#include "gdkprivate.h" #include <gdk-pixbuf/gdk-pixbuf.h> #include <string.h> @@ -360,12 +361,14 @@ gdk_content_serializer_return_success (GdkContentSerializer *serializer) { g_return_if_fail (GDK_IS_CONTENT_SERIALIZER (serializer)); g_return_if_fail (!serializer->returned); + guint source_id; serializer->returned = TRUE; - g_idle_add_full (serializer->priority, - gdk_content_serializer_emit_callback, - serializer, - g_object_unref); + source_id = g_idle_add_full (serializer->priority, + gdk_content_serializer_emit_callback, + serializer, + g_object_unref); + gdk_source_set_static_name_by_id (source_id, "[gtk] gdk_content_serializer_emit_callback"); /* NB: the idle will destroy our reference */ } diff --git a/gdk/gdkframeclockidle.c b/gdk/gdkframeclockidle.c index 40ca763292..8df1918a00 100644 --- a/gdk/gdkframeclockidle.c +++ b/gdk/gdkframeclockidle.c @@ -123,6 +123,7 @@ get_sleep_serial (void) { sleep_source = g_source_new (&sleep_source_funcs, sizeof (GSource)); + g_source_set_static_name (sleep_source, "[gtk] sleep serial"); g_source_set_priority (sleep_source, G_PRIORITY_HIGH); g_source_attach (sleep_source, NULL); g_source_unref (sleep_source); diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index 7fc0d5e37f..d4251ed3ab 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -1623,8 +1623,8 @@ gdk_surface_thaw_updates (GdkSurface *surface) if (surface->request_motion && surface->request_motion_id == 0) { surface->request_motion_id = - g_idle_add_full (GDK_PRIORITY_REDRAW + 20, - request_motion_cb, surface, NULL); + g_idle_add_full (GDK_PRIORITY_REDRAW + 20, request_motion_cb, surface, NULL); + gdk_source_set_static_name_by_id (surface->request_motion_id, "[gtk] request_motion_cb"); } } } @@ -2779,9 +2779,8 @@ gdk_surface_queue_set_is_mapped (GdkSurface *surface, g_return_if_fail (!surface->set_is_mapped_source_id); surface->set_is_mapped_source_id = - g_idle_add_full (G_PRIORITY_HIGH - 10, - set_is_mapped_idle, - surface, NULL); + g_idle_add_full (G_PRIORITY_HIGH - 10, set_is_mapped_idle, surface, NULL); + gdk_source_set_static_name_by_id (surface->set_is_mapped_source_id, "[gtk] set_is_mapped_idle"); } } diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index 6cba423a55..492cb7f1fd 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -6668,6 +6668,7 @@ search_start_query (GtkFileChooserWidget *impl, set_busy_cursor (impl, TRUE); impl->show_progress_timeout = g_timeout_add (1500, show_spinner, impl); + gdk_source_set_static_name_by_id (impl->show_progress_timeout, "[gtk] show_spinner"); if (impl->search_engine == NULL) impl->search_engine = _gtk_search_engine_new (); diff --git a/gtk/gtksortlistmodel.c b/gtk/gtksortlistmodel.c index 3bd26fdb0e..c2feb9e250 100644 --- a/gtk/gtksortlistmodel.c +++ b/gtk/gtksortlistmodel.c @@ -328,6 +328,7 @@ gtk_sort_list_model_start_sorting (GtkSortListModel *self, return FALSE; self->sort_cb = g_idle_add (gtk_sort_list_model_sort_cb, self); + gdk_source_set_static_name_by_id (self->sort_cb, "[gtk] gtk_sort_list_model_sort_cb"); g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_PENDING]); return TRUE; } diff --git a/gtk/gtktrashmonitor.c b/gtk/gtktrashmonitor.c index 47cddcc362..3990d65852 100644 --- a/gtk/gtktrashmonitor.c +++ b/gtk/gtktrashmonitor.c @@ -187,6 +187,7 @@ recompute_trash_state (GtkTrashMonitor *monitor) monitor->timeout_id = g_timeout_add_seconds (UPDATE_RATE_SECONDS, recompute_trash_state_cb, monitor); + gdk_source_set_static_name_by_id (monitor->timeout_id, "[gtk] recompute_trash_state_cb"); g_object_unref (file); } diff --git a/gtk/gtkvideo.c b/gtk/gtkvideo.c index 89562c1ae9..df54a2d545 100644 --- a/gtk/gtkvideo.c +++ b/gtk/gtkvideo.c @@ -110,6 +110,7 @@ gtk_video_reveal_controls (GtkVideo *self) self->controls_hide_source = g_timeout_add (5 * 1000, gtk_video_hide_controls, self); + gdk_source_set_static_name_by_id (self->controls_hide_source, "[gtk] gtk_video_hide_controls"); } static void diff --git a/gtk/gtkwidgetpaintable.c b/gtk/gtkwidgetpaintable.c index 6e6d1ec03c..1fce5c11bf 100644 --- a/gtk/gtkwidgetpaintable.c +++ b/gtk/gtkwidgetpaintable.c @@ -24,6 +24,7 @@ #include "gtksnapshot.h" #include "gtkrendernodepaintableprivate.h" #include "gtkwidgetprivate.h" +#include "gtkprivate.h" /** * GtkWidgetPaintable: @@ -383,6 +384,7 @@ gtk_widget_paintable_update_image (GtkWidgetPaintable *self) gtk_widget_paintable_update_func, self, NULL); + gdk_source_set_static_name_by_id (self->pending_update_cb, "[gtk] gtk_widget_paintable_update_func"); } pending_image = gtk_widget_paintable_snapshot_widget (self); diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 70705cdcc8..21e0ac3036 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -6001,7 +6001,10 @@ gtk_window_set_focus_visible (GtkWindow *window, } if (priv->focus_visible) - priv->focus_visible_timeout = g_timeout_add_seconds (VISIBLE_FOCUS_DURATION, unset_focus_visible, window); + { + priv->focus_visible_timeout = g_timeout_add_seconds (VISIBLE_FOCUS_DURATION, unset_focus_visible, window); + gdk_source_set_static_name_by_id (priv->focus_visible_timeout, "[gtk] unset_focus_visible"); + } if (changed) { |