6250.patch 2.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970
  1. From 4d7277f72c8f4915f237e36982ffd7dfba524b15 Mon Sep 17 00:00:00 2001
  2. From: Xi Ruoyao <xry111@xry111.site>
  3. Date: Mon, 7 Aug 2023 18:00:34 +0800
  4. Subject: [PATCH] print: Revert "Start sorting apart includes" change for
  5. gtkprinteroptionprivate.h
  6. The print backends needs the functions in gtkprinteroptionprivate.h to
  7. be exported.
  8. Fixes #6003.
  9. ---
  10. gtk/print/gtkprinteroptionprivate.h | 12 ++++++++++++
  11. 1 file changed, 12 insertions(+)
  12. diff --git a/gtk/print/gtkprinteroptionprivate.h b/gtk/print/gtkprinteroptionprivate.h
  13. index 82dd8739ba1..a7d8e8ad5b6 100644
  14. --- a/gtk/print/gtkprinteroptionprivate.h
  15. +++ b/gtk/print/gtkprinteroptionprivate.h
  16. @@ -27,6 +27,7 @@
  17. #endif
  18. #include <glib-object.h>
  19. +#include <gdk/gdk.h>
  20. G_BEGIN_DECLS
  21. @@ -87,28 +88,39 @@ struct _GtkPrinterOptionClass
  22. void (*_gtk_reserved4) (void);
  23. };
  24. +GDK_AVAILABLE_IN_ALL
  25. GType gtk_printer_option_get_type (void) G_GNUC_CONST;
  26. +GDK_AVAILABLE_IN_ALL
  27. GtkPrinterOption *gtk_printer_option_new (const char *name,
  28. const char *display_text,
  29. GtkPrinterOptionType type);
  30. +GDK_AVAILABLE_IN_ALL
  31. void gtk_printer_option_set (GtkPrinterOption *option,
  32. const char *value);
  33. +GDK_AVAILABLE_IN_ALL
  34. void gtk_printer_option_set_has_conflict (GtkPrinterOption *option,
  35. gboolean has_conflict);
  36. +GDK_AVAILABLE_IN_ALL
  37. void gtk_printer_option_clear_has_conflict (GtkPrinterOption *option);
  38. +GDK_AVAILABLE_IN_ALL
  39. void gtk_printer_option_set_boolean (GtkPrinterOption *option,
  40. gboolean value);
  41. +GDK_AVAILABLE_IN_ALL
  42. void gtk_printer_option_allocate_choices (GtkPrinterOption *option,
  43. int num);
  44. +GDK_AVAILABLE_IN_ALL
  45. void gtk_printer_option_choices_from_array (GtkPrinterOption *option,
  46. int num_choices,
  47. const char **choices,
  48. const char **choices_display);
  49. +GDK_AVAILABLE_IN_ALL
  50. gboolean gtk_printer_option_has_choice (GtkPrinterOption *option,
  51. const char *choice);
  52. +GDK_AVAILABLE_IN_ALL
  53. void gtk_printer_option_set_activates_default (GtkPrinterOption *option,
  54. gboolean activates);
  55. +GDK_AVAILABLE_IN_ALL
  56. gboolean gtk_printer_option_get_activates_default (GtkPrinterOption *option);
  57. --
  58. GitLab