summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-03-12 15:59:03 -0400
committerMatthias Clasen <mclasen@redhat.com>2019-03-12 16:25:10 -0400
commitf88e8ea6fe77d366c0cab4a45b8f3843fb27c7c6 (patch)
treea7c75959a9f539ecce4ea945db435291eb57c816
parentc3e065374fbdf3b8cc1bca67e1776d4bf15bbf3b (diff)
downloadgtk+-f88e8ea6fe77d366c0cab4a45b8f3843fb27c7c6.tar.gz
Undo the gtk_window_present deprecation
It doesn't make sense to have it in 3.x if we don't have it in master.
-rw-r--r--gtk/gtkwindow.c2
-rw-r--r--gtk/gtkwindow.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 10c5618cae..b65e0fe8c8 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -10486,8 +10486,6 @@ gtk_window_draw (GtkWidget *widget,
* Presents a window to the user. This function should not be used
* as when it is called, it is too late to gather a valid timestamp
* to allow focus stealing prevention to work correctly.
- *
- * Deprecated: 3.24: Use gtk_window_present_with_time() instead.
**/
void
gtk_window_present (GtkWindow *window)
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index e5d333155b..322cfc96f8 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -366,7 +366,7 @@ GDK_AVAILABLE_IN_ALL
gboolean gtk_window_propagate_key_event (GtkWindow *window,
GdkEventKey *event);
-GDK_DEPRECATED_IN_3_24_FOR(gtk_window_present_with_time)
+GDK_AVAILABLE_IN_ALL
void gtk_window_present (GtkWindow *window);
GDK_AVAILABLE_IN_ALL
void gtk_window_present_with_time (GtkWindow *window,