[gtk/matthiasc/for-master] Remove deprecation guards around gtk_window_present



commit c6a7b39ee1093fd74cb88f5ca822ebad27d537cb
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Aug 8 14:49:50 2020 -0400

    Remove deprecation guards around gtk_window_present
    
    It is not deprecated anymore.

 gtk/gtkcolorbutton.c         | 2 --
 gtk/gtkfilechooserbutton.c   | 6 +-----
 gtk/gtkfilechoosernative.c   | 2 --
 gtk/gtkfontbutton.c          | 2 --
 gtk/gtkpagesetupunixdialog.c | 2 --
 gtk/gtkprintoperation.c      | 2 --
 gtk/gtkprintunixdialog.c     | 2 --
 gtk/gtkshow.c                | 2 --
 8 files changed, 1 insertion(+), 19 deletions(-)
---
diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 511f26bd59..6a59a62296 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -435,9 +435,7 @@ gtk_color_button_clicked (GtkButton *b,
 
   gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (button->cs_dialog), &button->rgba);
 
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gtk_window_present (GTK_WINDOW (button->cs_dialog));
-  G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static void
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index f57c8f2a92..7df5603d59 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -2639,11 +2639,7 @@ open_dialog (GtkFileChooserButton *button)
 
   gtk_widget_set_sensitive (button->combo_box, FALSE);
   if (button->dialog)
-    {
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-      gtk_window_present (GTK_WINDOW (button->dialog));
-      G_GNUC_END_IGNORE_DEPRECATIONS
-    }
+    gtk_window_present (GTK_WINDOW (button->dialog));
   else
     gtk_native_dialog_show (GTK_NATIVE_DIALOG (button->native));
 }
diff --git a/gtk/gtkfilechoosernative.c b/gtk/gtkfilechoosernative.c
index 08512ee079..2ab10d0b96 100644
--- a/gtk/gtkfilechoosernative.c
+++ b/gtk/gtkfilechoosernative.c
@@ -591,9 +591,7 @@ show_dialog (GtkFileChooserNative *self)
                     G_CALLBACK (dialog_response_cb),
                     self);
 
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gtk_window_present (GTK_WINDOW (self->dialog));
-  G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static void
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 0dcb9723d0..dc842eb737 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -975,9 +975,7 @@ gtk_font_button_clicked (GtkButton *button,
       gtk_font_chooser_set_font_desc (font_dialog, font_button->font_desc);
     }
 
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gtk_window_present (GTK_WINDOW (font_button->font_dialog));
-  G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 
diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index 6cce41b50f..190a9f7e9a 100644
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -686,9 +686,7 @@ paper_size_changed (GtkDropDown            *combo_box,
           /* And show the custom paper dialog */
           custom_paper_dialog = _gtk_custom_paper_unix_dialog_new (GTK_WINDOW (dialog), NULL);
           g_signal_connect (custom_paper_dialog, "response", G_CALLBACK (custom_paper_dialog_response_cb), 
dialog);
-          G_GNUC_BEGIN_IGNORE_DEPRECATIONS
           gtk_window_present (GTK_WINDOW (custom_paper_dialog));
-          G_GNUC_END_IGNORE_DEPRECATIONS
 
           return;
         }
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index 56547c2403..3ffcfa45d2 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -2809,9 +2809,7 @@ handle_progress_response (GtkWidget *dialog,
 static gboolean
 show_progress_timeout (PrintPagesData *data)
 {
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gtk_window_present (GTK_WINDOW (data->progress));
-  G_GNUC_END_IGNORE_DEPRECATIONS
 
   data->op->priv->show_progress_timeout_id = 0;
 
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 23e43d9877..5375926db4 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -2992,9 +2992,7 @@ paper_size_changed (GtkDropDown *combo_box,
           /* And show the custom paper dialog */
           custom_paper_dialog = _gtk_custom_paper_unix_dialog_new (GTK_WINDOW (dialog), _("Manage Custom 
Sizes"));
           g_signal_connect (custom_paper_dialog, "response", G_CALLBACK (custom_paper_dialog_response_cb), 
dialog);
-          G_GNUC_BEGIN_IGNORE_DEPRECATIONS
           gtk_window_present (GTK_WINDOW (custom_paper_dialog));
-          G_GNUC_END_IGNORE_DEPRECATIONS
 
           g_object_unref (page_setup);
 
diff --git a/gtk/gtkshow.c b/gtk/gtkshow.c
index 4de007fa95..0160a8fe9d 100644
--- a/gtk/gtkshow.c
+++ b/gtk/gtkshow.c
@@ -181,9 +181,7 @@ show_uri_done (GObject      *object,
       g_signal_connect (dialog, "response",
                         G_CALLBACK (gtk_window_destroy), NULL);
 
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       gtk_window_present (GTK_WINDOW (dialog));
-      G_GNUC_END_IGNORE_DEPRECATIONS
     }
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]