Deprecate GtkLockButton

demos/gtk-demo/builder.c

@@ -37,6 +37,8 @@ remove_timeout (gpointer data)
   g_source_remove (id);
 }
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static gboolean
 pop_status (gpointer data)
 {
@@ -57,6 +59,8 @@ status_message (GtkStatusbar *status,
   g_object_set_data_full (G_OBJECT (status), "timeout", GUINT_TO_POINTER (id), remove_timeout);
 }
 
+G_GNUC_END_IGNORE_DEPRECATIONS
+
 static void
 help_activate (GSimpleAction *action,
                GVariant      *parameter,

demos/widget-factory/widget-factory.c

@@ -2252,11 +2252,13 @@ activate (GApplication *app)
   for (i = 0; i < G_N_ELEMENTS (accels); i++)
     gtk_application_set_accels_for_action (GTK_APPLICATION (app), accels[i].action_and_target, accels[i].accelerators);
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "statusbar");
   gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "All systems are operating normally.");
   action = G_ACTION (g_property_action_new ("statusbar", widget, "visible"));
   g_action_map_add_action (G_ACTION_MAP (window), action);
   g_object_unref (G_OBJECT (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
   action = G_ACTION (g_property_action_new ("toolbar", widget, "visible"));
@@ -2430,6 +2432,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "record_button");
   g_object_set_data (G_OBJECT (window), "record_button", widget);
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "lockbox");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "lockbutton");
   g_object_set_data (G_OBJECT (window), "lockbutton", widget2);
@@ -2447,6 +2450,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
                           G_BINDING_SYNC_CREATE);
   gtk_lock_button_set_permission (GTK_LOCK_BUTTON (widget2), permission);
   g_object_unref (permission);
+G_GNUC_END_IGNORE_DEPRECATIONS
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "iconview1");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "increase_button");

docs/reference/gtk/migrating-4to5.md

@@ -109,3 +109,13 @@ Other libraries, such as libadwaita, may provide replacements as well.
 ## gtk_show_uri is being replaced
 
 Instead of gtk_show_uri(), you should use GtkUriLauncher or GtkFileLauncher.
+
+## GtkStatusbar is going away
+
+This is an oldfashioned widget that does not do all that much anymore, since
+it no longer has a resize handle for the window.
+
+## GtkLockButton is going away
+
+This is an very specialized widget that should better live with the application
+where it is used.

gdk/gdkdisplay.c

@@ -1149,7 +1149,7 @@ _gdk_display_get_next_serial (GdkDisplay *display)
  * [method@Gtk.Window.set_auto_startup_notification]
  * is called to disable that feature.
  *
- * Deprecated: 4.10. Using gdk_toplevel_set_startup_id() is sufficient.
+ * Deprecated: 4.10: Using [method@Gdk.Toplevel.set_startup_id] is sufficient
  */
 void
 gdk_display_notify_startup_complete (GdkDisplay  *display,
@@ -1168,6 +1168,8 @@ gdk_display_notify_startup_complete (GdkDisplay  *display,
  * if no ID has been defined.
  *
  * Returns: (nullable): the startup notification ID for @display
+ *
+ * Deprecated: 4.10
  */
 const char *
 gdk_display_get_startup_notification_id (GdkDisplay *display)

gdk/gdkdisplay.h

@@ -86,7 +86,7 @@ GdkClipboard *          gdk_display_get_primary_clipboard       (GdkDisplay
 GDK_DEPRECATED_IN_4_10_FOR(gdk_toplevel_set_startup_id)
 void     gdk_display_notify_startup_complete   (GdkDisplay    *display,
                                                 const char    *startup_id);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 const char * gdk_display_get_startup_notification_id (GdkDisplay *display);
 
 GDK_AVAILABLE_IN_ALL

gdk/x11/gdkdisplay-x11.c

@@ -2074,8 +2074,10 @@ gdk_x11_display_make_default (GdkDisplay *display)
   display_x11->startup_notification_id = NULL;
 
   startup_id = gdk_get_startup_notification_id ();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   if (startup_id)
     gdk_x11_display_set_startup_notification_id (display, startup_id);
+G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static void
@@ -2303,6 +2305,8 @@ gdk_x11_display_get_user_time (GdkDisplay *display)
  * Gets the startup notification ID for a display.
  * 
  * Returns: the startup notification ID for @display
+ *
+ * Deprecated: 4.10
  */
 const char *
 gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
@@ -2329,7 +2333,9 @@ gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
  * The startup ID is also what is used to signal that the startup is
  * complete (for example, when opening a window or when calling
  * gdk_display_notify_startup_complete()).
- **/
+ *
+ * Deprecated: 4.10: Using [method@Gdk.Toplevel.set_startup_id] is sufficient
+ */
 void
 gdk_x11_display_set_startup_notification_id (GdkDisplay  *display,
                                              const char *startup_id)
@@ -3042,7 +3048,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
   display_class->get_app_launch_context = _gdk_x11_display_get_app_launch_context;
 
   display_class->get_next_serial = gdk_x11_display_get_next_serial;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   display_class->get_startup_notification_id = gdk_x11_display_get_startup_notification_id;
+G_GNUC_END_IGNORE_DEPRECATIONS
   display_class->notify_startup_complete = gdk_x11_display_notify_startup_complete;
   display_class->create_surface = _gdk_x11_display_create_surface;
   display_class->get_keymap = gdk_x11_display_get_keymap;

gdk/x11/gdkx11display.h

@@ -80,9 +80,9 @@ Cursor        gdk_x11_display_get_xcursor      (GdkDisplay  *display,
 GDK_AVAILABLE_IN_ALL
 guint32       gdk_x11_display_get_user_time (GdkDisplay *display);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 const char * gdk_x11_display_get_startup_notification_id         (GdkDisplay *display);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 void          gdk_x11_display_set_startup_notification_id         (GdkDisplay  *display,
                                                                    const char *startup_id);
 GDK_AVAILABLE_IN_ALL

gtk/deprecated/gtklockbutton.c

@@ -28,6 +28,8 @@
 #include "gtkstack.h"
 #include "gtkprivate.h"
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 /**
  * GtkLockButton:
  *

gtk/deprecated/gtklockbutton.h

@@ -32,11 +32,11 @@ typedef struct _GtkLockButton        GtkLockButton;
 
 GDK_AVAILABLE_IN_ALL
 GType        gtk_lock_button_get_type       (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 GtkWidget   *gtk_lock_button_new            (GPermission   *permission);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 GPermission *gtk_lock_button_get_permission (GtkLockButton *button);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 void         gtk_lock_button_set_permission (GtkLockButton *button,
                                              GPermission   *permission);
 

gtk/deprecated/gtkstatusbar.c

@@ -36,6 +36,8 @@
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 /**
  * GtkStatusbar:
  *

gtk/deprecated/gtkstatusbar.h

@@ -42,23 +42,23 @@ typedef struct _GtkStatusbar GtkStatusbar;
 
 GDK_AVAILABLE_IN_ALL
 GType      gtk_statusbar_get_type     	(void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 GtkWidget* gtk_statusbar_new          	(void);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 guint	   gtk_statusbar_get_context_id	(GtkStatusbar *statusbar,
 					 const char   *context_description);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 guint      gtk_statusbar_push          	(GtkStatusbar *statusbar,
 					 guint	       context_id,
 					 const char   *text);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 void       gtk_statusbar_pop          	(GtkStatusbar *statusbar,
 					 guint	       context_id);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 void       gtk_statusbar_remove        	(GtkStatusbar *statusbar,
 					 guint	       context_id,
 					 guint         message_id);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 void       gtk_statusbar_remove_all    	(GtkStatusbar *statusbar,
 					 guint	       context_id);
 

gtk/deprecated/meson.build

@@ -31,8 +31,10 @@ gtk_deprecated_sources = [
   'deprecated/gtkiconview.c',
   'deprecated/gtkinfobar.c',
   'deprecated/gtkliststore.c',
+  'deprecated/gtklockbutton.c',
   'deprecated/gtkrender.c',
   'deprecated/gtkshow.c',
+  'deprecated/gtkstatusbar.c',
   'deprecated/gtkstylecontext.c',
   'deprecated/gtktreedatalist.c',
   'deprecated/gtktreednd.c',
@@ -87,9 +89,11 @@ gtk_deprecated_headers = [
   'deprecated/gtkiconview.h',
   'deprecated/gtkinfobar.h',
   'deprecated/gtkliststore.h',
+  'deprecated/gtklockbutton.h',
   'deprecated/gtkmessagedialog.h',
   'deprecated/gtkrender.h',
   'deprecated/gtkshow.h',
+  'deprecated/gtkstatusbar.h',
   'deprecated/gtkstylecontext.h',
   'deprecated/gtktreednd.h',
   'deprecated/gtktreemodel.h',

gtk/gtk.h

@@ -177,7 +177,7 @@
 #include <gtk/gtklistitemfactory.h>
 #include <gtk/deprecated/gtkliststore.h>
 #include <gtk/gtklistview.h>
-#include <gtk/gtklockbutton.h>
+#include <gtk/deprecated/gtklockbutton.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmaplistmodel.h>
 #include <gtk/gtkmediacontrols.h>
@@ -252,7 +252,7 @@
 #include <gtk/gtkspinner.h>
 #include <gtk/gtkstack.h>
 #include <gtk/gtkstackswitcher.h>
-#include <gtk/gtkstatusbar.h>
+#include <gtk/deprecated/gtkstatusbar.h>
 #include <gtk/gtkstringfilter.h>
 #include <gtk/gtkstringlist.h>
 #include <gtk/gtkstringsorter.h>

gtk/gtkapplication-x11.c

@@ -87,7 +87,9 @@ gtk_application_impl_x11_before_emit (GtkApplicationImpl *impl,
 
   g_variant_lookup (platform_data, "desktop-startup-id", "&s", &startup_notification_id);
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gdk_x11_display_set_startup_notification_id (gdk_display_get_default (), startup_notification_id);
+G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static void

gtk/gtkapplication.c

@@ -321,7 +321,9 @@ gtk_application_add_platform_data (GApplication    *application,
     {
       const char *startup_id;
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       startup_id = gdk_display_get_startup_notification_id (display);
+G_GNUC_END_IGNORE_DEPRECATIONS
       if (startup_id && g_utf8_validate (startup_id, -1, NULL))
         {
           g_variant_builder_add (builder, "{sv}", "activation-token",

gtk/meson.build

@@ -276,7 +276,6 @@ gtk_public_sources = files([
   'gtklistitemwidget.c',
   'gtklistlistmodel.c',
   'gtklistview.c',
-  'gtklockbutton.c',
   'gtkmain.c',
   'gtkmaplistmodel.c',
   'gtkmediacontrols.c',
@@ -360,7 +359,6 @@ gtk_public_sources = files([
   'gtkstack.c',
   'gtkstacksidebar.c',
   'gtkstackswitcher.c',
-  'gtkstatusbar.c',
   'gtkstringfilter.c',
   'gtkstringlist.c',
   'gtkstringsorter.c',
@@ -521,7 +519,6 @@ gtk_public_headers = files([
   'gtklistitem.h',
   'gtklistitemfactory.h',
   'gtklistview.h',
-  'gtklockbutton.h',
   'gtkmain.h',
   'gtkmaplistmodel.h',
   'gtkmediacontrols.h',
@@ -593,7 +590,6 @@ gtk_public_headers = files([
   'gtkstack.h',
   'gtkstacksidebar.h',
   'gtkstackswitcher.h',
-  'gtkstatusbar.h',
   'gtkstringfilter.h',
   'gtkstringlist.h',
   'gtkstringsorter.h',

tests/testcolumnview.c

@@ -1,5 +1,7 @@
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 GSList *pending = NULL;
 guint active = 0;
 

tests/testlistview.c

@@ -1,5 +1,7 @@
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 #define FILE_INFO_TYPE_SELECTION (file_info_selection_get_type ())
 
 G_DECLARE_FINAL_TYPE (FileInfoSelection, file_info_selection, FILE_INFO, SELECTION, GObject)

testsuite/reftests/statusbar-remove-all.c

@@ -17,6 +17,7 @@
 
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 
 G_MODULE_EXPORT void
 statusbar_remove_all (GtkStatusbar *s)