[Xfce4-commits] [xfce/thunar-volman] 02/11: Replace macros by functions

[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/thunar-volman.

commit f5a7741a010c2f7a6b98d173345824d785d10856
Author: Andre Miranda <andre42m at gmail.com>
Date:   Sat Jul 22 23:38:45 2017 -0300

    Replace macros by functions
---
 thunar-volman-settings/tvm-command-entry.c      | 2 +-
 thunar-volman-settings/tvm-preferences-dialog.c | 6 +++---
 thunar-volman/tvm-prompt.c                      | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/thunar-volman-settings/tvm-command-entry.c b/thunar-volman-settings/tvm-command-entry.c
index 8ab3589..dd803d5 100644
--- a/thunar-volman-settings/tvm-command-entry.c
+++ b/thunar-volman-settings/tvm-command-entry.c
@@ -234,7 +234,7 @@ tvm_command_entry_clicked (GtkWidget       *button,
 
   /* determine the toplevel widget */
   toplevel = gtk_widget_get_toplevel (button);
-  if (toplevel == NULL || !GTK_WIDGET_TOPLEVEL (toplevel))
+  if (toplevel == NULL || !gtk_widget_is_toplevel (toplevel))
     return;
 
   chooser = gtk_file_chooser_dialog_new (_("Select an Application"),
diff --git a/thunar-volman-settings/tvm-preferences-dialog.c b/thunar-volman-settings/tvm-preferences-dialog.c
index 62646f6..4c9366b 100644
--- a/thunar-volman-settings/tvm-preferences-dialog.c
+++ b/thunar-volman-settings/tvm-preferences-dialog.c
@@ -108,9 +108,9 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
   button = gtk_button_new_from_stock (GTK_STOCK_HELP);
   g_signal_connect (G_OBJECT (button), "clicked", 
                     G_CALLBACK (tvm_preferences_dialog_help_clicked), dialog);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, 
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, 
                       FALSE, FALSE, 0);
-  gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (GTK_DIALOG (dialog)->action_area),
+  gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))),
                                       button, TRUE);
   gtk_widget_show (button);
 
@@ -121,7 +121,7 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
 
   notebook = gtk_notebook_new ();
   gtk_container_set_border_width (GTK_CONTAINER (notebook), 6);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), notebook, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), notebook, TRUE, TRUE, 0);
   gtk_widget_show (notebook);
 
   /*
diff --git a/thunar-volman/tvm-prompt.c b/thunar-volman/tvm-prompt.c
index 985cf0c..cff18db 100644
--- a/thunar-volman/tvm-prompt.c
+++ b/thunar-volman/tvm-prompt.c
@@ -98,9 +98,8 @@ tvm_prompt (TvmContext  *context,
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
   g_object_set_data_full (G_OBJECT (dialog), "device", g_object_ref (context->device), 
                           g_object_unref);
-  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 6);
-  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 12);
-  gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+  gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 6);
+  gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), 12);
 
   /* apply the specified title */
   if (title != NULL && *title != '\0')
@@ -125,7 +124,7 @@ tvm_prompt (TvmContext  *context,
   /* create the hbox */
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area  (GTK_DIALOG (dialog))), hbox, TRUE, TRUE, 0);
   gtk_widget_show (hbox);
 
   /* apply the specified icon */

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