[Xfce4-commits] [xfce/libxfce4ui] 02/08: Ignore what is hard to replace (Bug #15781)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   n   d   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/libxfce4ui.

commit cec6be7f4091a8188b6b3a6c7be65f9309b50926
Author: Andre Miranda <andreldm at xfce.org>
Date:   Sun Aug 4 13:35:10 2019 -0300

    Ignore what is hard to replace (Bug #15781)
---
 glade/libxfce4ui-glade.c         | 10 +++++++++-
 libxfce4ui/xfce-gtk-extensions.c |  2 ++
 libxfce4ui/xfce-sm-client.c      |  3 +++
 libxfce4ui/xfce-spawn.c          |  5 +++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/glade/libxfce4ui-glade.c b/glade/libxfce4ui-glade.c
index 2c98909..4a64b14 100644
--- a/glade/libxfce4ui-glade.c
+++ b/glade/libxfce4ui-glade.c
@@ -70,9 +70,12 @@ glade_xfce_titled_dialog_post_create (GladeWidgetAdaptor *adaptor,
       glade_widget_remove_property (vbox, "border-width");
 
       /* create the action area */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+      /* TODO: Move exo_gtk_dialog_get_action_area to libxfce4ui */
       action_area = glade_widget_adaptor_create_internal (vbox,
           G_OBJECT (gtk_dialog_get_action_area (dialog)),
           "action_area", "dialog", FALSE, reason);
+G_GNUC_END_IGNORE_DEPRECATIONS
       glade_widget_remove_property (action_area, "border-width");
       glade_widget_remove_property (action_area, "spacing");
 
@@ -102,7 +105,12 @@ glade_xfce_titled_dialog_get_internal_child (GladeWidgetAdaptor *adaptor,
   if (strcmp ("vbox", name) == 0)
     child = gtk_dialog_get_content_area (dialog);
   else if (strcmp ("action_area", name) == 0)
-    child = gtk_dialog_get_action_area (dialog);
+    {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+      /* TODO: Move exo_gtk_dialog_get_action_area to libxfce4ui */
+      child = gtk_dialog_get_action_area (dialog);
+G_GNUC_END_IGNORE_DEPRECATIONS
+    }
 
   return child;
 }
diff --git a/libxfce4ui/xfce-gtk-extensions.c b/libxfce4ui/xfce-gtk-extensions.c
index daec0cb..fe164f9 100644
--- a/libxfce4ui/xfce-gtk-extensions.c
+++ b/libxfce4ui/xfce-gtk-extensions.c
@@ -275,6 +275,7 @@ xfce_gtk_menu_popup_until_mapped (GtkMenu *menu,
 
   while ((i++ < 2500) && (!gtk_widget_get_mapped (GTK_WIDGET (menu))))
     {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
         gtk_menu_popup (GTK_MENU (menu),
                         parent_menu_shell,
                         parent_menu_item,
@@ -282,6 +283,7 @@ xfce_gtk_menu_popup_until_mapped (GtkMenu *menu,
                         data,
                         button,
                         activate_time);
+G_GNUC_END_IGNORE_DEPRECATIONS
 
         g_usleep (100);
     }
diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index 8b1d503..aae05ac 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -715,7 +715,10 @@ xfce_sm_client_parse_argv(XfceSMClient *sm_client)
         for(i = 0; i < argc; ++i)
             restart_command[i] = argv[i];
         restart_command[i++] = "--display";
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+        /* TODO: Move xfwm_make_display_name to libxfce4ui */
         restart_command[i++] = display_name = gdk_screen_make_display_name(gscreen);
+G_GNUC_END_IGNORE_DEPRECATIONS
     } else
         restart_command = argv;
 
diff --git a/libxfce4ui/xfce-spawn.c b/libxfce4ui/xfce-spawn.c
index b4946d3..77f55e9 100644
--- a/libxfce4ui/xfce-spawn.c
+++ b/libxfce4ui/xfce-spawn.c
@@ -365,7 +365,10 @@ xfce_spawn_on_screen_with_child_watch (GdkScreen    *screen,
     }
 
   /* add the real display name for the screen */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+  /* TODO: Move xfwm_make_display_name to libxfce4ui */
   display_name = gdk_screen_make_display_name (screen);
+G_GNUC_END_IGNORE_DEPRECATIONS
   cenvp[n_cenvp++] = g_strconcat ("DISPLAY=", display_name, NULL);
   g_free (display_name);
 
@@ -373,9 +376,11 @@ xfce_spawn_on_screen_with_child_watch (GdkScreen    *screen,
   /* initialize the sn launcher context */
   if (G_LIKELY (startup_notify))
     {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       sn_display = sn_display_new (GDK_SCREEN_XDISPLAY (screen),
                                    (SnDisplayErrorTrapPush) (void (*)(void)) gdk_error_trap_push,
                                    (SnDisplayErrorTrapPop) (void (*)(void)) gdk_error_trap_pop);
+G_GNUC_END_IGNORE_DEPRECATIONS
 
       if (G_LIKELY (sn_display != NULL))
         {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.