From 25fd230327c4349e0a970ebbac70684e4f9e222c Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 5 Feb 2019 11:26:20 +0100 Subject: [PATCH] gtk: Drop the "plus" Source names should use "[gtk]" without the plus. --- gtk/a11y/gtkiconviewaccessible.c | 2 +- gtk/gtkbutton.c | 2 +- gtk/gtkcalendar.c | 4 ++-- gtk/gtkcellrendererspin.c | 2 +- gtk/gtkcellrenderertext.c | 2 +- gtk/gtkdnd.c | 2 +- gtk/gtkentry.c | 12 +++++------ gtk/gtkentrycompletion.c | 4 ++-- gtk/gtkexpander.c | 2 +- gtk/gtkfilechooserwidget.c | 6 +++--- gtk/gtkfilesystemmodel.c | 2 +- gtk/gtkgesturelongpress.c | 2 +- gtk/gtkgesturemultipress.c | 2 +- gtk/gtkgladecatalog.c | 2 +- gtk/gtkicontheme.c | 2 +- gtk/gtkiconview.c | 4 ++-- gtk/gtkmain.c | 2 +- gtk/gtkmenu.c | 4 ++-- gtk/gtkmenuitem.c | 2 +- gtk/gtkmenusectionbox.c | 2 +- gtk/gtknotebook.c | 8 ++++---- gtk/gtkpapersize.c | 4 ++-- gtk/gtkprintoperation-win32.c | 4 ++-- gtk/gtkprintoperation.c | 6 +++--- gtk/gtkprintunixdialog.c | 2 +- gtk/gtkrange.c | 4 ++-- gtk/gtkrecentmanager.c | 2 +- gtk/gtkscrolledwindow.c | 6 +++--- gtk/gtksearchenginemodel.c | 2 +- gtk/gtksearchenginesimple.c | 4 ++-- gtk/gtksearchentry.c | 2 +- gtk/gtksettings.c | 28 +++++++++++++------------- gtk/gtkspinbutton.c | 4 ++-- gtk/gtkstackswitcher.c | 2 +- gtk/gtktextview.c | 20 +++++++++--------- gtk/gtktoolbar.c | 2 +- gtk/gtktooltip.c | 4 ++-- gtk/gtktreeview.c | 22 ++++++++++---------- gtk/gtkwindow.c | 6 +++--- gtk/org.gtk.Settings.Debug.gschema.xml | 4 ++-- 40 files changed, 99 insertions(+), 99 deletions(-) diff --git a/gtk/a11y/gtkiconviewaccessible.c b/gtk/a11y/gtkiconviewaccessible.c index 800f8274de..1cebf28df6 100644 --- a/gtk/a11y/gtkiconviewaccessible.c +++ b/gtk/a11y/gtkiconviewaccessible.c @@ -114,7 +114,7 @@ gtk_icon_view_item_accessible_do_action (AtkAction *action, if (!item->action_idle_handler) { item->action_idle_handler = g_idle_add (idle_do_action, item); - g_source_set_name_by_id (item->action_idle_handler, "[gtk+] idle_do_action"); + g_source_set_name_by_id (item->action_idle_handler, "[gtk] idle_do_action"); } return TRUE; diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index c0de0014a2..6b2346cdba 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -771,7 +771,7 @@ gtk_real_button_activate (GtkButton *button) if (gtk_widget_get_realized (widget) && !priv->activate_timeout) { priv->activate_timeout = g_timeout_add (ACTIVATE_TIMEOUT, button_activate_timeout, button); - g_source_set_name_by_id (priv->activate_timeout, "[gtk+] button_activate_timeout"); + g_source_set_name_by_id (priv->activate_timeout, "[gtk] button_activate_timeout"); priv->button_down = TRUE; } } diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 8b9de85d2a..561a474f5b 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -2487,7 +2487,7 @@ calendar_timer (gpointer data) TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR, (GSourceFunc) calendar_timer, calendar, NULL); - g_source_set_name_by_id (priv->timer, "[gtk+] calendar_timer"); + g_source_set_name_by_id (priv->timer, "[gtk] calendar_timer"); } else retval = TRUE; @@ -2511,7 +2511,7 @@ calendar_start_spinning (GtkCalendar *calendar, TIMEOUT_INITIAL, (GSourceFunc) calendar_timer, calendar, NULL); - g_source_set_name_by_id (priv->timer, "[gtk+] calendar_timer"); + g_source_set_name_by_id (priv->timer, "[gtk] calendar_timer"); } } diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c index b8cbdfe179..4483e5a01d 100644 --- a/gtk/gtkcellrendererspin.c +++ b/gtk/gtkcellrendererspin.c @@ -48,7 +48,7 @@ * of #GtkCellRendererSpin:digits to display. Other #GtkSpinButton properties * can be set in a handler for the #GtkCellRenderer::editing-started signal. * - * The #GtkCellRendererSpin cell renderer was added in GTK+ 2.10. + * The #GtkCellRendererSpin cell renderer was added in GTK 2.10. */ diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index f7ee9aaee2..093dfcbba0 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -1832,7 +1832,7 @@ gtk_cell_renderer_text_popup_unmap (GtkMenu *menu, return; priv->entry_menu_popdown_timeout = g_timeout_add (500, popdown_timeout, data); - g_source_set_name_by_id (priv->entry_menu_popdown_timeout, "[gtk+] popdown_timeout"); + g_source_set_name_by_id (priv->entry_menu_popdown_timeout, "[gtk] popdown_timeout"); } static void diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 1d70e56c86..0313566573 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -1246,7 +1246,7 @@ gtk_drag_drop (GtkDragSourceInfo *info) gtk_widget_hide (info->icon_window); info->drop_timeout = g_timeout_add (DROP_ABORT_TIME, gtk_drag_abort_timeout, info); - g_source_set_name_by_id (info->drop_timeout, "[gtk+] gtk_drag_abort_timeout"); + g_source_set_name_by_id (info->drop_timeout, "[gtk] gtk_drag_abort_timeout"); } /* diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 2115852aa3..4585df6899 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -4575,7 +4575,7 @@ buffer_inserted_text (GtkEntryBuffer *buffer, password_hint->source_id = g_timeout_add (password_hint_timeout, (GSourceFunc)gtk_entry_remove_password_hint, entry); - g_source_set_name_by_id (password_hint->source_id, "[gtk+] gtk_entry_remove_password_hint"); + g_source_set_name_by_id (password_hint->source_id, "[gtk] gtk_entry_remove_password_hint"); } } } @@ -8414,7 +8414,7 @@ gtk_entry_selection_bubble_popup_set (GtkEntry *entry) priv->selection_bubble_timeout_id = g_timeout_add (50, gtk_entry_selection_bubble_popup_show, entry); - g_source_set_name_by_id (priv->selection_bubble_timeout_id, "[gtk+] gtk_entry_selection_bubble_popup_cb"); + g_source_set_name_by_id (priv->selection_bubble_timeout_id, "[gtk] gtk_entry_selection_bubble_popup_cb"); } static void @@ -8832,7 +8832,7 @@ blink_cb (gpointer data) priv->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_OFF_MULTIPLIER / CURSOR_DIVIDER, blink_cb, entry); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); } else { @@ -8841,7 +8841,7 @@ blink_cb (gpointer data) priv->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_ON_MULTIPLIER / CURSOR_DIVIDER, blink_cb, entry); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); } return G_SOURCE_REMOVE; @@ -8860,7 +8860,7 @@ gtk_entry_check_cursor_blink (GtkEntry *entry) priv->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_ON_MULTIPLIER / CURSOR_DIVIDER, blink_cb, entry); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); } } else @@ -8888,7 +8888,7 @@ gtk_entry_pend_cursor_blink (GtkEntry *entry) priv->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_PEND_MULTIPLIER / CURSOR_DIVIDER, blink_cb, entry); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); show_cursor (entry); } } diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index d010d9e5f5..6d43daff98 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -2386,7 +2386,7 @@ gtk_entry_completion_changed (GtkWidget *widget, g_timeout_add (COMPLETION_TIMEOUT, gtk_entry_completion_timeout, completion); - g_source_set_name_by_id (completion->priv->completion_timeout, "[gtk+] gtk_entry_completion_timeout"); + g_source_set_name_by_id (completion->priv->completion_timeout, "[gtk] gtk_entry_completion_timeout"); } static gboolean @@ -2448,7 +2448,7 @@ completion_insert_text_callback (GtkEntry *entry, g_cclosure_new_object (G_CALLBACK (check_completion_callback), G_OBJECT (completion))); g_source_attach (completion->priv->check_completion_idle, NULL); - g_source_set_name (completion->priv->check_completion_idle, "[gtk+] check_completion_callback"); + g_source_set_name (completion->priv->check_completion_idle, "[gtk] check_completion_callback"); } } diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index fa412f8cf1..cba7916c12 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -542,7 +542,7 @@ gtk_expander_drag_motion (GtkWidget *widget, if (!priv->expanded && !priv->expand_timer) { priv->expand_timer = g_timeout_add (TIMEOUT_EXPAND, (GSourceFunc) expand_timeout, expander); - g_source_set_name_by_id (priv->expand_timer, "[gtk+] expand_timeout"); + g_source_set_name_by_id (priv->expand_timer, "[gtk] expand_timeout"); } return TRUE; diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index d52fd98dfd..707f40139d 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -2461,7 +2461,7 @@ reset_location_timeout (GtkFileChooserWidget *impl) priv->location_changed_id = g_timeout_add (LOCATION_CHANGED_TIMEOUT, location_changed_timeout_cb, impl); - g_source_set_name_by_id (priv->location_changed_id, "[gtk+] location_changed_timeout_cb"); + g_source_set_name_by_id (priv->location_changed_id, "[gtk] location_changed_timeout_cb"); } static void @@ -4285,7 +4285,7 @@ load_setup_timer (GtkFileChooserWidget *impl) g_assert (priv->load_state != LOAD_PRELOAD); priv->load_timeout_id = g_timeout_add (MAX_LOADING_TIME, load_timeout_cb, impl); - g_source_set_name_by_id (priv->load_timeout_id, "[gtk+] load_timeout_cb"); + g_source_set_name_by_id (priv->load_timeout_id, "[gtk] load_timeout_cb"); priv->load_state = LOAD_PRELOAD; } @@ -7471,7 +7471,7 @@ recent_start_loading (GtkFileChooserWidget *impl) recent_idle_load, load_data, recent_idle_cleanup); - g_source_set_name_by_id (priv->load_recent_id, "[gtk+] recent_idle_load"); + g_source_set_name_by_id (priv->load_recent_id, "[gtk] recent_idle_load"); } /* Called from ::should_respond(). We return whether there are selected diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index 1c39100bde..bf49e0196b 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -1148,7 +1148,7 @@ gtk_file_system_model_got_files (GObject *object, GAsyncResult *res, gpointer da thaw_func, model, NULL); - g_source_set_name_by_id (model->dir_thaw_source, "[gtk+] thaw_func"); + g_source_set_name_by_id (model->dir_thaw_source, "[gtk] thaw_func"); } for (walk = files; walk; walk = walk->next) diff --git a/gtk/gtkgesturelongpress.c b/gtk/gtkgesturelongpress.c index f16bc1da90..073a7b6d09 100644 --- a/gtk/gtkgesturelongpress.c +++ b/gtk/gtkgesturelongpress.c @@ -143,7 +143,7 @@ gtk_gesture_long_press_begin (GtkGesture *gesture, gtk_gesture_get_point (gesture, sequence, &priv->initial_x, &priv->initial_y); priv->timeout_id = g_timeout_add (delay, _gtk_gesture_long_press_timeout, gesture); - g_source_set_name_by_id (priv->timeout_id, "[gtk+] _gtk_gesture_long_press_timeout"); + g_source_set_name_by_id (priv->timeout_id, "[gtk] _gtk_gesture_long_press_timeout"); } static void diff --git a/gtk/gtkgesturemultipress.c b/gtk/gtkgesturemultipress.c index d6dc115d5f..d2877d46d7 100644 --- a/gtk/gtkgesturemultipress.c +++ b/gtk/gtkgesturemultipress.c @@ -152,7 +152,7 @@ _gtk_gesture_multi_press_update_timeout (GtkGestureMultiPress *gesture) g_object_get (settings, "gtk-double-click-time", &double_click_time, NULL); priv->double_click_timeout_id = g_timeout_add (double_click_time, _double_click_timeout_cb, gesture); - g_source_set_name_by_id (priv->double_click_timeout_id, "[gtk+] _double_click_timeout_cb"); + g_source_set_name_by_id (priv->double_click_timeout_id, "[gtk] _double_click_timeout_cb"); } static gboolean diff --git a/gtk/gtkgladecatalog.c b/gtk/gtkgladecatalog.c index a2dcfc18f5..c104562b33 100644 --- a/gtk/gtkgladecatalog.c +++ b/gtk/gtkgladecatalog.c @@ -38,7 +38,7 @@ void gtk_glade_catalog_init (const gchar *catalog_name); /* This function is referred to in gtk/glade/gtk-private-widgets.xml * and is used to ensure the private types for use in Glade while - * editing UI files that define GTK+’s various composite widget classes. + * editing UI files that define GTK’s various composite widget classes. */ void gtk_glade_catalog_init (const gchar *catalog_name) diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index ccdb7f77a8..f1b8545cda 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -729,7 +729,7 @@ queue_theme_changed (GtkIconTheme *icon_theme) theme_changed_idle, icon_theme, NULL); - g_source_set_name_by_id (priv->theme_changed_idle, "[gtk+] theme_changed_idle"); + g_source_set_name_by_id (priv->theme_changed_idle, "[gtk] theme_changed_idle"); } } diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 29ed4dff8a..3f95db58ff 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -1841,7 +1841,7 @@ gtk_icon_view_motion (GtkEventController *controller, if (icon_view->priv->scroll_timeout_id == 0) { icon_view->priv->scroll_timeout_id = g_timeout_add (30, rubberband_scroll_timeout, icon_view); - g_source_set_name_by_id (icon_view->priv->scroll_timeout_id, "[gtk+] rubberband_scroll_timeout"); + g_source_set_name_by_id (icon_view->priv->scroll_timeout_id, "[gtk] rubberband_scroll_timeout"); } } else @@ -6256,7 +6256,7 @@ gtk_icon_view_drag_motion (GtkWidget *widget, if (icon_view->priv->scroll_timeout_id == 0) { icon_view->priv->scroll_timeout_id = g_timeout_add (50, drag_scroll_timeout, icon_view); - g_source_set_name_by_id (icon_view->priv->scroll_timeout_id, "[gtk+] drag_scroll_timeout"); + g_source_set_name_by_id (icon_view->priv->scroll_timeout_id, "[gtk] drag_scroll_timeout"); } if (target == g_intern_static_string ("GTK_TREE_MODEL_ROW")) diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 50fae76925..e1bd39dd86 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -1090,7 +1090,7 @@ gtk_main_sync (void) store.store_loop = g_main_loop_new (NULL, TRUE); store_timeout = g_timeout_add_seconds (10, (GSourceFunc) g_main_loop_quit, store.store_loop); - g_source_set_name_by_id (store_timeout, "[gtk+] gtk_main_sync clipboard store timeout"); + g_source_set_name_by_id (store_timeout, "[gtk] gtk_main_sync clipboard store timeout"); if (g_main_loop_is_running (store.store_loop)) g_main_loop_run (store.store_loop); diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 45ac5b824d..c12b19bcf3 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -3066,7 +3066,7 @@ gtk_menu_handle_scrolling (GtkMenu *menu, : MENU_SCROLL_TIMEOUT1, gtk_menu_scroll_timeout, menu); - g_source_set_name_by_id (priv->scroll_timeout, "[gtk+] gtk_menu_scroll_timeout"); + g_source_set_name_by_id (priv->scroll_timeout, "[gtk] gtk_menu_scroll_timeout"); } else if (!enter && !in_arrow && priv->upper_arrow_prelight) { @@ -3132,7 +3132,7 @@ gtk_menu_handle_scrolling (GtkMenu *menu, : MENU_SCROLL_TIMEOUT1, gtk_menu_scroll_timeout, menu); - g_source_set_name_by_id (priv->scroll_timeout, "[gtk+] gtk_menu_scroll_timeout"); + g_source_set_name_by_id (priv->scroll_timeout, "[gtk] gtk_menu_scroll_timeout"); } else if (!enter && !in_arrow && priv->lower_arrow_prelight) { diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index f1843ab349..f516c38d6d 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -1548,7 +1548,7 @@ _gtk_menu_item_popup_submenu (GtkWidget *widget, info->trigger_event = gtk_get_current_event (); priv->timer = g_timeout_add (popup_delay, gtk_menu_item_popup_timeout, info); - g_source_set_name_by_id (priv->timer, "[gtk+] gtk_menu_item_popup_timeout"); + g_source_set_name_by_id (priv->timer, "[gtk] gtk_menu_item_popup_timeout"); return; } diff --git a/gtk/gtkmenusectionbox.c b/gtk/gtkmenusectionbox.c index f87259e3bb..7b21eebc13 100644 --- a/gtk/gtkmenusectionbox.c +++ b/gtk/gtkmenusectionbox.c @@ -164,7 +164,7 @@ gtk_menu_section_box_schedule_separator_sync (GtkMenuSectionBox *box) box->separator_sync_idle = g_idle_add_full (G_PRIORITY_HIGH_IDLE, /* before resize... */ gtk_menu_section_box_handle_sync_separators, box, NULL); - g_source_set_name_by_id (box->separator_sync_idle, "[gtk+] menu section box handle sync separators"); + g_source_set_name_by_id (box->separator_sync_idle, "[gtk] menu section box handle sync separators"); } } diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 8c52b52012..decf8c61cd 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -2689,7 +2689,7 @@ gtk_notebook_motion (GtkEventController *controller, priv->dnd_timer = g_timeout_add (TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR, scroll_notebook_timer, notebook); - g_source_set_name_by_id (priv->dnd_timer, "[gtk+] scroll_notebook_timer"); + g_source_set_name_by_id (priv->dnd_timer, "[gtk] scroll_notebook_timer"); } } else @@ -3084,7 +3084,7 @@ gtk_notebook_drag_motion (GtkWidget *widget, if (!priv->switch_tab_timer) { priv->switch_tab_timer = g_timeout_add (TIMEOUT_EXPAND, gtk_notebook_switch_tab_timeout, widget); - g_source_set_name_by_id (priv->switch_tab_timer, "[gtk+] gtk_notebook_switch_tab_timeout"); + g_source_set_name_by_id (priv->switch_tab_timer, "[gtk] gtk_notebook_switch_tab_timeout"); } } else @@ -4063,7 +4063,7 @@ gtk_notebook_timer (GtkNotebook *notebook) priv->timer = g_timeout_add (TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR, (GSourceFunc) gtk_notebook_timer, notebook); - g_source_set_name_by_id (priv->timer, "[gtk+] gtk_notebook_timer"); + g_source_set_name_by_id (priv->timer, "[gtk] gtk_notebook_timer"); } else retval = TRUE; @@ -4082,7 +4082,7 @@ gtk_notebook_set_scroll_timer (GtkNotebook *notebook) priv->timer = g_timeout_add (TIMEOUT_INITIAL, (GSourceFunc) gtk_notebook_timer, notebook); - g_source_set_name_by_id (priv->timer, "[gtk+] gtk_notebook_timer"); + g_source_set_name_by_id (priv->timer, "[gtk] gtk_notebook_timer"); priv->need_timer = TRUE; } } diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c index 2a39bec8d0..119b1a9eee 100644 --- a/gtk/gtkpapersize.c +++ b/gtk/gtkpapersize.c @@ -55,7 +55,7 @@ * and height) of a paper size and its name, it also provides * default [print margins][print-margins]. * - * Printing support has been added in GTK+ 2.10. + * Printing support has been added in GTK 2.10. */ @@ -765,7 +765,7 @@ gtk_paper_size_set_size (GtkPaperSize *size, * depends on the current locale. * * Returns: the name of the default paper size. The string - * is owned by GTK+ and should not be modified. + * is owned by GTK and should not be modified. */ const gchar * gtk_paper_size_get_default (void) diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c index c484209f5b..980e9c5925 100644 --- a/gtk/gtkprintoperation-win32.c +++ b/gtk/gtkprintoperation-win32.c @@ -538,7 +538,7 @@ win32_poll_status_timeout (GtkPrintOperation *op) op_win32->timeout_id = g_timeout_add (STATUS_POLLING_TIME, (GSourceFunc)win32_poll_status_timeout, op); - g_source_set_name_by_id (op_win32->timeout_id, "[gtk+] win32_poll_status_timeout"); + g_source_set_name_by_id (op_win32->timeout_id, "[gtk] win32_poll_status_timeout"); } g_object_unref (op); return FALSE; @@ -582,7 +582,7 @@ win32_end_run (GtkPrintOperation *op, op_win32->timeout_id = g_timeout_add (STATUS_POLLING_TIME, (GSourceFunc)win32_poll_status_timeout, op); - g_source_set_name_by_id (op_win32->timeout_id, "[gtk+] win32_poll_status_timeout"); + g_source_set_name_by_id (op_win32->timeout_id, "[gtk] win32_poll_status_timeout"); } else /* Dunno what happened, pretend its finished */ diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index 090a4d5a03..c18d3d2d78 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -641,7 +641,7 @@ preview_ready (GtkPrintOperationPreview *preview, preview_print_idle, pop, preview_print_idle_done); - g_source_set_name_by_id (id, "[gtk+] preview_print_idle"); + g_source_set_name_by_id (id, "[gtk] preview_print_idle"); } @@ -2907,7 +2907,7 @@ print_pages (GtkPrintOperation *op, g_timeout_add (SHOW_PROGRESS_TIME, (GSourceFunc) show_progress_timeout, data); - g_source_set_name_by_id (priv->show_progress_timeout_id, "[gtk+] show_progress_timeout"); + g_source_set_name_by_id (priv->show_progress_timeout_id, "[gtk] show_progress_timeout"); data->progress = progress; } @@ -2976,7 +2976,7 @@ print_pages (GtkPrintOperation *op, print_pages_idle, data, print_pages_idle_done); - g_source_set_name_by_id (priv->print_pages_idle_id, "[gtk+] print_pages_idle"); + g_source_set_name_by_id (priv->print_pages_idle_id, "[gtk] print_pages_idle"); /* Recursive main loop to make sure we don't exit on sync operations */ if (priv->is_sync) diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index 589fc4ebd4..7dc8c37202 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -1937,7 +1937,7 @@ schedule_idle_mark_conflicts (GtkPrintUnixDialog *dialog) return; priv->mark_conflicts_id = g_idle_add (mark_conflicts_callback, dialog); - g_source_set_name_by_id (priv->mark_conflicts_id, "[gtk+] mark_conflicts_callback"); + g_source_set_name_by_id (priv->mark_conflicts_id, "[gtk] mark_conflicts_callback"); } static void diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 7e4082532e..a96480abbf 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -2767,7 +2767,7 @@ initial_timeout (gpointer data) GtkRangePrivate *priv = gtk_range_get_instance_private (range); priv->timer->timeout_id = g_timeout_add (TIMEOUT_REPEAT, second_timeout, range); - g_source_set_name_by_id (priv->timer->timeout_id, "[gtk+] second_timeout"); + g_source_set_name_by_id (priv->timer->timeout_id, "[gtk] second_timeout"); return G_SOURCE_REMOVE; } @@ -2783,7 +2783,7 @@ gtk_range_add_step_timer (GtkRange *range, priv->timer = g_new (GtkRangeStepTimer, 1); priv->timer->timeout_id = g_timeout_add (TIMEOUT_INITIAL, initial_timeout, range); - g_source_set_name_by_id (priv->timer->timeout_id, "[gtk+] initial_timeout"); + g_source_set_name_by_id (priv->timer->timeout_id, "[gtk] initial_timeout"); priv->timer->step = step; gtk_range_scroll (range, priv->timer->step); diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c index 7d09ce7934..1e098f423e 100644 --- a/gtk/gtkrecentmanager.c +++ b/gtk/gtkrecentmanager.c @@ -1389,7 +1389,7 @@ gtk_recent_manager_changed (GtkRecentManager *manager) if (manager->priv->changed_timeout == 0) { manager->priv->changed_timeout = g_timeout_add (250, emit_manager_changed, manager); - g_source_set_name_by_id (manager->priv->changed_timeout, "[gtk+] emit_manager_changed"); + g_source_set_name_by_id (manager->priv->changed_timeout, "[gtk] emit_manager_changed"); } else { diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index b431e07e9c..b5ad5a7bb1 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -1108,7 +1108,7 @@ check_update_scrollbar_proximity (GtkScrolledWindow *sw, else if (indicator_close && !on_other_scrollbar) { indicator->over_timeout_id = g_timeout_add (30, enable_over_timeout_cb, indicator); - g_source_set_name_by_id (indicator->over_timeout_id, "[gtk+] enable_over_timeout_cb"); + g_source_set_name_by_id (indicator->over_timeout_id, "[gtk] enable_over_timeout_cb"); } else indicator_set_over (indicator, FALSE); @@ -1306,7 +1306,7 @@ scroll_controller_scroll (GtkEventControllerScroll *scroll, priv->scroll_events_overshoot_id = g_timeout_add (50, start_scroll_deceleration_cb, scrolled_window); g_source_set_name_by_id (priv->scroll_events_overshoot_id, - "[gtk+] start_scroll_deceleration_cb"); + "[gtk] start_scroll_deceleration_cb"); } return GDK_EVENT_STOP; @@ -3640,7 +3640,7 @@ indicator_set_fade (Indicator *indicator, if (visible && indicator->conceil_timer == 0) { indicator->conceil_timer = g_timeout_add (INDICATOR_FADE_OUT_TIME, maybe_hide_indicator, indicator); - g_source_set_name_by_id (indicator->conceil_timer, "[gtk+] maybe_hide_indicator"); + g_source_set_name_by_id (indicator->conceil_timer, "[gtk] maybe_hide_indicator"); } if (!visible && indicator->conceil_timer != 0) { diff --git a/gtk/gtksearchenginemodel.c b/gtk/gtksearchenginemodel.c index 2ff615246d..58682e15f9 100644 --- a/gtk/gtksearchenginemodel.c +++ b/gtk/gtksearchenginemodel.c @@ -129,7 +129,7 @@ gtk_search_engine_model_start (GtkSearchEngine *engine) return; model->idle = g_idle_add (do_search, engine); - g_source_set_name_by_id (model->idle, "[gtk+] gtk_search_engine_model_start"); + g_source_set_name_by_id (model->idle, "[gtk] gtk_search_engine_model_start"); } static void diff --git a/gtk/gtksearchenginesimple.c b/gtk/gtksearchenginesimple.c index 8f5d431674..dfefed3aca 100644 --- a/gtk/gtksearchenginesimple.c +++ b/gtk/gtksearchenginesimple.c @@ -181,7 +181,7 @@ send_batch (SearchThreadData *data) batch->thread_data = data; id = g_idle_add (search_thread_add_hits_idle, batch); - g_source_set_name_by_id (id, "[gtk+] search_thread_add_hits_idle"); + g_source_set_name_by_id (id, "[gtk] search_thread_add_hits_idle"); } data->hits = NULL; @@ -288,7 +288,7 @@ search_thread_func (gpointer user_data) send_batch (data); id = g_idle_add (search_thread_done_idle, data); - g_source_set_name_by_id (id, "[gtk+] search_thread_done_idle"); + g_source_set_name_by_id (id, "[gtk] search_thread_done_idle"); return NULL; } diff --git a/gtk/gtksearchentry.c b/gtk/gtksearchentry.c index 693fe6d485..b2368c308a 100644 --- a/gtk/gtksearchentry.c +++ b/gtk/gtksearchentry.c @@ -305,7 +305,7 @@ reset_timeout (GtkSearchEntry *entry) priv->delayed_changed_id = g_timeout_add (DELAYED_TIMEOUT_ID, gtk_search_entry_changed_timeout_cb, entry); - g_source_set_name_by_id (priv->delayed_changed_id, "[gtk+] gtk_search_entry_changed_timeout_cb"); + g_source_set_name_by_id (priv->delayed_changed_id, "[gtk] gtk_search_entry_changed_timeout_cb"); } static void diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index ad477d7cbd..9c9988e22d 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -74,7 +74,7 @@ * [XSettings](http://www.freedesktop.org/wiki/Specifications/xsettings-spec) * manager that is usually part of the desktop environment, along with * utilities that let the user change these settings. In the absence of - * an Xsettings manager, GTK+ reads default values for settings from + * an Xsettings manager, GTK reads default values for settings from * `settings.ini` files in * `/etc/gtk-4.0`, `$XDG_CONFIG_DIRS/gtk-4.0` * and `$XDG_CONFIG_HOME/gtk-4.0`. @@ -440,7 +440,7 @@ gtk_settings_class_init (GtkSettingsClass *class) /** * GtkSettings:gtk-font-name: * - * The default font to use. GTK+ uses the family name and size from this string. + * The default font to use. GTK uses the family name and size from this string. */ result = settings_install_property_parser (class, g_param_spec_string ("gtk-font-name", @@ -578,7 +578,7 @@ gtk_settings_class_init (GtkSettingsClass *class) * GtkSettings:gtk-print-backends: * * A comma-separated list of print backends to use in the print - * dialog. Available print backends depend on the GTK+ installation, + * dialog. Available print backends depend on the GTK installation, * and may include "file", "cups", "lpr" or "papi". */ result = settings_install_property_parser (class, @@ -633,7 +633,7 @@ gtk_settings_class_init (GtkSettingsClass *class) * Which IM (input method) module should be used by default. This is the * input method that will be used if the user has not explicitly chosen * another input method from the IM context menu. - * This also can be a colon-separated list of input methods, which GTK+ + * This also can be a colon-separated list of input methods, which GTK * will try in turn until it finds one available on the system. * * See #GtkIMContext. @@ -683,7 +683,7 @@ gtk_settings_class_init (GtkSettingsClass *class) * See the [Sound Theme Specifications](http://www.freedesktop.org/wiki/Specifications/sound-theme-spec) * for more information on event sounds and sound themes. * - * GTK+ itself does not support event sounds, you have to use a loadable + * GTK itself does not support event sounds, you have to use a loadable * module like the one that comes with libcanberra. */ result = settings_install_property_parser (class, @@ -703,7 +703,7 @@ gtk_settings_class_init (GtkSettingsClass *class) * See the [Sound Theme Specifications](http://www.freedesktop.org/wiki/Specifications/sound-theme-spec) * for more information on event sounds and sound themes. * - * GTK+ itself does not support event sounds, you have to use a loadable + * GTK itself does not support event sounds, you have to use a loadable * module like the one that comes with libcanberra. */ result = settings_install_property_parser (class, @@ -724,7 +724,7 @@ gtk_settings_class_init (GtkSettingsClass *class) * See the [Sound Theme Specifications](http://www.freedesktop.org/wiki/Specifications/sound-theme-spec) * for more information on event sounds and sound themes. * - * GTK+ itself does not support event sounds, you have to use a loadable + * GTK itself does not support event sounds, you have to use a loadable * module like the one that comes with libcanberra. */ result = settings_install_property_parser (class, @@ -745,7 +745,7 @@ gtk_settings_class_init (GtkSettingsClass *class) * slider/value to move by the range’s page-size towards the point clicked. * * Whichever action you choose for the primary button, the other action will - * be available by holding Shift and primary-clicking, or (since GTK+ 3.22.25) + * be available by holding Shift and primary-clicking, or (since GTK 3.22.25) * clicking the middle mouse button. */ result = settings_install_property_parser (class, @@ -760,7 +760,7 @@ gtk_settings_class_init (GtkSettingsClass *class) /** * GtkSettings:gtk-application-prefer-dark-theme: * - * Whether the application prefers to use a dark theme. If a GTK+ theme + * Whether the application prefers to use a dark theme. If a GTK theme * includes a dark variant, it will be used instead of the configured * theme. * @@ -935,7 +935,7 @@ gtk_settings_class_init (GtkSettingsClass *class) /** * GtkSettings:gtk-dialogs-use-header: * - * Whether builtin GTK+ dialogs such as the file chooser, the + * Whether builtin GTK dialogs such as the file chooser, the * color chooser or the font chooser will use a header bar at * the top to show action widgets, or an action area at the bottom. * @@ -945,7 +945,7 @@ gtk_settings_class_init (GtkSettingsClass *class) result = settings_install_property_parser (class, g_param_spec_boolean ("gtk-dialogs-use-header", P_("Dialogs use header bar"), - P_("Whether builtin GTK+ dialogs should use a header bar instead of an action area."), + P_("Whether builtin GTK dialogs should use a header bar instead of an action area."), FALSE, GTK_PARAM_READWRITE), NULL); @@ -969,13 +969,13 @@ gtk_settings_class_init (GtkSettingsClass *class) /** * GtkSettings:gtk-recent-files-enabled: * - * Whether GTK+ should keep track of items inside the recently used + * Whether GTK should keep track of items inside the recently used * resources list. If set to %FALSE, the list will always be empty. */ result = settings_install_property_parser (class, g_param_spec_boolean ("gtk-recent-files-enabled", P_("Recent Files Enabled"), - P_("Whether GTK+ remembers recent files"), + P_("Whether GTK remembers recent files"), TRUE, GTK_PARAM_READWRITE), NULL); @@ -998,7 +998,7 @@ gtk_settings_class_init (GtkSettingsClass *class) /** * GtkSettings:gtk-keynav-use-caret: * - * Whether GTK+ should make sure that text can be navigated with + * Whether GTK should make sure that text can be navigated with * a caret, even if it is not editable. This is useful when using * a screen reader. */ diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 181b91cd48..cc03839275 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -745,7 +745,7 @@ start_spinning (GtkSpinButton *spin, priv->timer = g_timeout_add (TIMEOUT_INITIAL, (GSourceFunc) gtk_spin_button_timer, (gpointer) spin); - g_source_set_name_by_id (priv->timer, "[gtk+] gtk_spin_button_timer"); + g_source_set_name_by_id (priv->timer, "[gtk] gtk_spin_button_timer"); } gtk_spin_button_real_spin (spin, click_child == priv->up_button ? step : -step); @@ -1172,7 +1172,7 @@ gtk_spin_button_timer (GtkSpinButton *spin_button) priv->timer = g_timeout_add (TIMEOUT_REPEAT, (GSourceFunc) gtk_spin_button_timer, spin_button); - g_source_set_name_by_id (priv->timer, "[gtk+] gtk_spin_button_timer"); + g_source_set_name_by_id (priv->timer, "[gtk] gtk_spin_button_timer"); } else { diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c index 50cdcecb55..3fb4dde191 100644 --- a/gtk/gtkstackswitcher.c +++ b/gtk/gtkstackswitcher.c @@ -332,7 +332,7 @@ gtk_stack_switcher_drag_motion (GtkWidget *widget, priv->switch_timer = g_timeout_add (TIMEOUT_EXPAND, gtk_stack_switcher_switch_timeout, self); - g_source_set_name_by_id (priv->switch_timer, "[gtk+] gtk_stack_switcher_switch_timeout"); + g_source_set_name_by_id (priv->switch_timer, "[gtk] gtk_stack_switcher_switch_timeout"); } return retval; diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 2950ad7dec..cf8d2cdca2 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -2633,7 +2633,7 @@ queue_update_im_spot_location (GtkTextView *text_view) do_update_im_spot_location, text_view, NULL); - g_source_set_name_by_id (priv->im_spot_idle, "[gtk+] do_update_im_spot_location"); + g_source_set_name_by_id (priv->im_spot_idle, "[gtk] do_update_im_spot_location"); } } @@ -4320,7 +4320,7 @@ gtk_text_view_invalidate (GtkTextView *text_view) if (!priv->first_validate_idle) { priv->first_validate_idle = g_idle_add_full (GTK_PRIORITY_RESIZE - 2, first_validate_callback, text_view, NULL); - g_source_set_name_by_id (priv->first_validate_idle, "[gtk+] first_validate_callback"); + g_source_set_name_by_id (priv->first_validate_idle, "[gtk] first_validate_callback"); DV (g_print (G_STRLOC": adding first validate idle %d\n", priv->first_validate_idle)); } @@ -4328,7 +4328,7 @@ gtk_text_view_invalidate (GtkTextView *text_view) if (!priv->incremental_validate_idle) { priv->incremental_validate_idle = g_idle_add_full (GTK_TEXT_VIEW_PRIORITY_VALIDATE, incremental_validate_callback, text_view, NULL); - g_source_set_name_by_id (priv->incremental_validate_idle, "[gtk+] incremental_validate_callback"); + g_source_set_name_by_id (priv->incremental_validate_idle, "[gtk] incremental_validate_callback"); DV (g_print (G_STRLOC": adding incremental validate idle %d\n", priv->incremental_validate_idle)); } @@ -5689,14 +5689,14 @@ blink_cb (gpointer data) priv->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_OFF_MULTIPLIER / CURSOR_DIVIDER, blink_cb, text_view); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); } else { priv->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_ON_MULTIPLIER / CURSOR_DIVIDER, blink_cb, text_view); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); priv->blink_time += get_cursor_time (text_view); } @@ -5735,7 +5735,7 @@ gtk_text_view_check_cursor_blink (GtkTextView *text_view) priv->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_OFF_MULTIPLIER / CURSOR_DIVIDER, blink_cb, text_view); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); } } else @@ -5767,7 +5767,7 @@ gtk_text_view_pend_cursor_blink (GtkTextView *text_view) priv->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_PEND_MULTIPLIER / CURSOR_DIVIDER, blink_cb, text_view); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); } } @@ -7116,7 +7116,7 @@ gtk_text_view_drag_gesture_update (GtkGestureDrag *gesture, g_source_remove (text_view->priv->scroll_timeout); text_view->priv->scroll_timeout = g_timeout_add (50, selection_scan_timeout, text_view); - g_source_set_name_by_id (text_view->priv->scroll_timeout, "[gtk+] selection_scan_timeout"); + g_source_set_name_by_id (text_view->priv->scroll_timeout, "[gtk] selection_scan_timeout"); gtk_text_view_selection_bubble_popup_unset (text_view); @@ -7783,7 +7783,7 @@ gtk_text_view_drag_motion (GtkWidget *widget, if (!priv->scroll_timeout) { priv->scroll_timeout = g_timeout_add (100, drag_scan_timeout, text_view); - g_source_set_name_by_id (text_view->priv->scroll_timeout, "[gtk+] drag_scan_timeout"); + g_source_set_name_by_id (text_view->priv->scroll_timeout, "[gtk] drag_scan_timeout"); } gtk_drag_highlight (widget); @@ -8861,7 +8861,7 @@ gtk_text_view_selection_bubble_popup_set (GtkTextView *text_view) g_source_remove (priv->selection_bubble_timeout_id); priv->selection_bubble_timeout_id = g_timeout_add (50, gtk_text_view_selection_bubble_popup_show, text_view); - g_source_set_name_by_id (priv->selection_bubble_timeout_id, "[gtk+] gtk_text_view_selection_bubble_popup_cb"); + g_source_set_name_by_id (priv->selection_bubble_timeout_id, "[gtk] gtk_text_view_selection_bubble_popup_cb"); } /* Child GdkSurfaces */ diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index f58844a960..6c455cb3d4 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -995,7 +995,7 @@ gtk_toolbar_begin_sliding (GtkToolbar *toolbar) if (!priv->idle_id) { priv->idle_id = g_idle_add (slide_idle_handler, toolbar); - g_source_set_name_by_id (priv->idle_id, "[gtk+] slide_idle_handler"); + g_source_set_name_by_id (priv->idle_id, "[gtk] slide_idle_handler"); } content_allocation.x = 0; diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index e2bcf29571..22fafbf47b 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -762,7 +762,7 @@ gtk_tooltip_hide_tooltip (GtkTooltip *tooltip) tooltip_browse_mode_expired, g_object_ref (tooltip), g_object_unref); - g_source_set_name_by_id (tooltip->browse_mode_timeout_id, "[gtk+] tooltip_browse_mode_expired"); + g_source_set_name_by_id (tooltip->browse_mode_timeout_id, "[gtk] tooltip_browse_mode_expired"); } if (tooltip->current_window) @@ -817,7 +817,7 @@ gtk_tooltip_start_delay (GdkDisplay *display) tooltip_popup_timeout, g_object_ref (display), g_object_unref); - g_source_set_name_by_id (tooltip->timeout_id, "[gtk+] tooltip_popup_timeout"); + g_source_set_name_by_id (tooltip->timeout_id, "[gtk] tooltip_popup_timeout"); } void diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 01f30f5450..3c5acc5a8c 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -3481,7 +3481,7 @@ do_prelight (GtkTreeView *tree_view, { tree_view->priv->auto_expand_timeout = g_timeout_add (AUTO_EXPAND_TIMEOUT, auto_expand_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->auto_expand_timeout, "[gtk+] auto_expand_timeout"); + g_source_set_name_by_id (tree_view->priv->auto_expand_timeout, "[gtk] auto_expand_timeout"); } } @@ -6362,7 +6362,7 @@ install_presize_handler (GtkTreeView *tree_view) { tree_view->priv->validate_rows_timer = g_idle_add_full (GTK_TREE_VIEW_PRIORITY_VALIDATE, (GSourceFunc) validate_rows, tree_view, NULL); - g_source_set_name_by_id (tree_view->priv->validate_rows_timer, "[gtk+] validate_rows"); + g_source_set_name_by_id (tree_view->priv->validate_rows_timer, "[gtk] validate_rows"); } } @@ -6391,7 +6391,7 @@ install_scroll_sync_handler (GtkTreeView *tree_view) { tree_view->priv->scroll_sync_timer = g_idle_add_full (GTK_TREE_VIEW_PRIORITY_SCROLL_SYNC, (GSourceFunc) scroll_sync_handler, tree_view, NULL); - g_source_set_name_by_id (tree_view->priv->scroll_sync_timer, "[gtk+] scroll_sync_handler"); + g_source_set_name_by_id (tree_view->priv->scroll_sync_timer, "[gtk] scroll_sync_handler"); } } @@ -6754,7 +6754,7 @@ add_scroll_timeout (GtkTreeView *tree_view) if (tree_view->priv->scroll_timeout == 0) { tree_view->priv->scroll_timeout = g_timeout_add (150, scroll_row_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->scroll_timeout, "[gtk+] scroll_row_timeout"); + g_source_set_name_by_id (tree_view->priv->scroll_timeout, "[gtk] scroll_row_timeout"); } } @@ -7296,7 +7296,7 @@ gtk_tree_view_drag_motion (GtkWidget *widget, { tree_view->priv->open_dest_timeout = g_timeout_add (AUTO_EXPAND_TIMEOUT, open_row_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->open_dest_timeout, "[gtk+] open_row_timeout"); + g_source_set_name_by_id (tree_view->priv->open_dest_timeout, "[gtk] open_row_timeout"); } else { @@ -10337,7 +10337,7 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view, g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc) gtk_tree_view_search_entry_flush_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk+] gtk_tree_view_search_entry_flush_timeout"); + g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk] gtk_tree_view_search_entry_flush_timeout"); /* send focus-in event */ send_focus_change (tree_view->priv->search_entry, device, TRUE); @@ -13856,7 +13856,7 @@ gtk_tree_view_search_preedit_changed (GtkIMContext *im_context, g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc) gtk_tree_view_search_entry_flush_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk+] gtk_tree_view_search_entry_flush_timeout"); + g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk] gtk_tree_view_search_entry_flush_timeout"); } } @@ -13911,7 +13911,7 @@ gtk_tree_view_search_enable_popdown (GtkWidget *widget, gtk_tree_view_real_search_enable_popdown, g_object_ref (data), g_object_unref); - g_source_set_name_by_id (id, "[gtk+] gtk_tree_view_real_search_enable_popdown"); + g_source_set_name_by_id (id, "[gtk] gtk_tree_view_real_search_enable_popdown"); } static void @@ -13957,7 +13957,7 @@ gtk_tree_view_search_scroll_event (GtkWidget *widget, g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc) gtk_tree_view_search_entry_flush_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk+] gtk_tree_view_search_entry_flush_timeout"); + g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk] gtk_tree_view_search_entry_flush_timeout"); } return GDK_EVENT_STOP; @@ -14034,7 +14034,7 @@ gtk_tree_view_search_key_pressed (GtkEventControllerKey *key, g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc) gtk_tree_view_search_entry_flush_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk+] gtk_tree_view_search_entry_flush_timeout"); + g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk] gtk_tree_view_search_entry_flush_timeout"); } if (!retval) @@ -14290,7 +14290,7 @@ gtk_tree_view_search_init (GtkWidget *entry, g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc) gtk_tree_view_search_entry_flush_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk+] gtk_tree_view_search_entry_flush_timeout"); + g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk] gtk_tree_view_search_entry_flush_timeout"); } if (*text == '\0') diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index b58610c341..44b83e678a 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -2920,7 +2920,7 @@ _gtk_window_notify_keys_changed (GtkWindow *window) if (!priv->keys_changed_handler) { priv->keys_changed_handler = g_idle_add (handle_keys_changed, window); - g_source_set_name_by_id (priv->keys_changed_handler, "[gtk+] handle_keys_changed"); + g_source_set_name_by_id (priv->keys_changed_handler, "[gtk] handle_keys_changed"); } } @@ -10453,7 +10453,7 @@ _gtk_window_schedule_mnemonics_visible (GtkWindow *window) priv->mnemonics_display_timeout_id = g_timeout_add (MNEMONICS_DELAY, schedule_mnemonics_visible_cb, window); - g_source_set_name_by_id (priv->mnemonics_display_timeout_id, "[gtk+] schedule_mnemonics_visible_cb"); + g_source_set_name_by_id (priv->mnemonics_display_timeout_id, "[gtk] schedule_mnemonics_visible_cb"); } /** @@ -10782,7 +10782,7 @@ gtk_window_update_debugging (void) gtk_window_update_debugging_id == 0) { gtk_window_update_debugging_id = g_idle_add (update_debugging, NULL); - g_source_set_name_by_id (gtk_window_update_debugging_id, "[gtk+] gtk_window_update_debugging"); + g_source_set_name_by_id (gtk_window_update_debugging_id, "[gtk] gtk_window_update_debugging"); } } diff --git a/gtk/org.gtk.Settings.Debug.gschema.xml b/gtk/org.gtk.Settings.Debug.gschema.xml index abb985dcc3..ab24ec6afc 100644 --- a/gtk/org.gtk.Settings.Debug.gschema.xml +++ b/gtk/org.gtk.Settings.Debug.gschema.xml @@ -6,7 +6,7 @@ false Enable inspector keybinding - If this setting is true, GTK+ lets the user open an interactive + If this setting is true, GTK lets the user open an interactive debugging window with a keybinding. The default shortcuts for the keybinding are Control-Shift-I and Control-Shift-D. @@ -15,7 +15,7 @@ true Inspector warning - If this setting is true, GTK+ shows a warning before letting + If this setting is true, GTK shows a warning before letting the user use the interactive debugger.