[Xfce4-commits] [xfce/thunar] 01/01: replaced gtk3 deprecation "gtk_misc_set_padding" with "gtk_widget_set_margin_*"

noreply at xfce.org noreply at xfce.org
Mon Dec 4 20:40:13 CET 2017


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

a   l   e   x       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/thunar.

commit 3074acfba06589b00ffff95d4c3248c628da9057
Author: Alexander Schwinn <acs82 at gmx.de>
Date:   Sat Dec 2 22:20:22 2017 +0100

    replaced gtk3 deprecation "gtk_misc_set_padding" with
    "gtk_widget_set_margin_*"
---
 thunar/thunar-dialogs.c | 20 ++++++++++++++++----
 thunar/thunar-window.c  |  5 ++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
index 1ad8905..992444c 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
@@ -118,7 +118,10 @@ thunar_dialogs_show_rename_file (gpointer    parent,
   g_object_unref (G_OBJECT (icon_factory));
 
   image = gtk_image_new_from_pixbuf (icon);
-  gtk_misc_set_padding (GTK_MISC (image), 6, 6);
+  gtk_widget_set_margin_start (GTK_WIDGET(image), 6);
+  gtk_widget_set_margin_end (GTK_WIDGET(image), 6);
+  gtk_widget_set_margin_top (GTK_WIDGET(image), 6);
+  gtk_widget_set_margin_bottom (GTK_WIDGET(image), 6);
   gtk_grid_attach (GTK_GRID (grid), image, 0, 0, 1, 2);
   g_object_unref (G_OBJECT (icon));
   gtk_widget_show (image);
@@ -573,7 +576,10 @@ thunar_dialogs_show_job_ask_replace (GtkWindow  *parent,
   image = gtk_image_new_from_icon_name ("stock_folder-copy", GTK_ICON_SIZE_BUTTON);
   gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (image, GTK_ALIGN_START);
-  gtk_misc_set_padding (GTK_MISC (image), 6, 6);
+  gtk_widget_set_margin_start (GTK_WIDGET(image), 6);
+  gtk_widget_set_margin_end (GTK_WIDGET(image), 6);
+  gtk_widget_set_margin_top (GTK_WIDGET(image), 6);
+  gtk_widget_set_margin_bottom (GTK_WIDGET(image), 6);
   gtk_widget_set_vexpand (image, TRUE);
   gtk_grid_attach (GTK_GRID (grid), image, 0, 0, 1, 1);
   gtk_widget_show (image);
@@ -618,7 +624,10 @@ thunar_dialogs_show_job_ask_replace (GtkWindow  *parent,
 
   icon = thunar_icon_factory_load_file_icon (icon_factory, dst_file, THUNAR_FILE_ICON_STATE_DEFAULT, 48);
   image = gtk_image_new_from_pixbuf (icon);
-  gtk_misc_set_padding (GTK_MISC (image), 6, 6);
+  gtk_widget_set_margin_start (GTK_WIDGET(image), 6);
+  gtk_widget_set_margin_end (GTK_WIDGET(image), 6);
+  gtk_widget_set_margin_top (GTK_WIDGET(image), 6);
+  gtk_widget_set_margin_bottom (GTK_WIDGET(image), 6);
   gtk_grid_attach (GTK_GRID (grid), image, 1, 2, 1, 1);
   g_object_unref (G_OBJECT (icon));
   gtk_widget_show (image);
@@ -651,7 +660,10 @@ thunar_dialogs_show_job_ask_replace (GtkWindow  *parent,
 
   icon = thunar_icon_factory_load_file_icon (icon_factory, src_file, THUNAR_FILE_ICON_STATE_DEFAULT, 48);
   image = gtk_image_new_from_pixbuf (icon);
-  gtk_misc_set_padding (GTK_MISC (image), 6, 6);
+  gtk_widget_set_margin_start (GTK_WIDGET(image), 6);
+  gtk_widget_set_margin_end (GTK_WIDGET(image), 6);
+  gtk_widget_set_margin_top (GTK_WIDGET(image), 6);
+  gtk_widget_set_margin_bottom (GTK_WIDGET(image), 6);
   gtk_grid_attach (GTK_GRID (grid), image, 1, 4, 1, 1);
   g_object_unref (G_OBJECT (icon));
   gtk_widget_show (image);
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 9d846e9..fb3c65f 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -1781,7 +1781,10 @@ thunar_window_notebook_insert (ThunarWindow *window,
   exo_binding_new (G_OBJECT (view), "tooltip-text", G_OBJECT (label), "tooltip-text");
   gtk_widget_set_has_tooltip (label, TRUE);
   gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
-  gtk_misc_set_padding (GTK_MISC (label), 3, 3);
+  gtk_widget_set_margin_start (GTK_WIDGET(label), 3);
+  gtk_widget_set_margin_end (GTK_WIDGET(label), 3);
+  gtk_widget_set_margin_top (GTK_WIDGET(label), 3);
+  gtk_widget_set_margin_bottom (GTK_WIDGET(label), 3);
   gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
   gtk_label_set_single_line_mode (GTK_LABEL (label), TRUE);
   gtk_box_pack_start (GTK_BOX (label_box), label, TRUE, TRUE, 0);

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


More information about the Xfce4-commits mailing list