thunar-volman gtk3 patch

diff --git a/configure.ac.in b/configure.ac.in
index 738e6b0..44012cd 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -92,15 +92,15 @@ XDT_I18N([@LINGUAS@])
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([EXO], [exo-1], [0.10.0])
+XDT_CHECK_PACKAGE([EXO], [exo-2], [0.10.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0])
 XDT_CHECK_PACKAGE([GUDEV], [gudev-1.0], [145])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0])
 
 dnl *******************************************************
 dnl *** Optional mount notification support (libnotify) ***
diff --git a/thunar-volman-settings/thunar-volman-settings b/thunar-volman-settings/thunar-volman-settings
new file mode 100755
index 0000000..f6f61c7
Binary files /dev/null and b/thunar-volman-settings/thunar-volman-settings differ
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..59d355f 100644
--- a/thunar-volman-settings/tvm-preferences-dialog.c
+++ b/thunar-volman-settings/tvm-preferences-dialog.c
@@ -96,7 +96,6 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
   channel = xfconf_channel_get ("thunar-volman");
 
   /* configure the dialog properties */
-  gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
   gtk_window_set_icon_name (GTK_WINDOW (dialog), "drive-removable-media");
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
   gtk_window_set_title (GTK_WINDOW (dialog), _("Removable Drives and Media"));
@@ -108,9 +107,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 +120,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/thunar-volman b/thunar-volman/thunar-volman
new file mode 100755
index 0000000..07fc767
Binary files /dev/null and b/thunar-volman/thunar-volman differ
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 */