[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] 04/09: Use exo's wrapper for gtk_dialog_get_action_area
noreply at xfce.org
noreply at xfce.org
Sat Jun 2 05:09:38 CEST 2018
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 thunar-plugins/thunar-vcs-plugin.
commit da2a0842e20f74ef5ded5281a28fcc8fec9544eb
Author: Andre Miranda <andreldm at xfce.org>
Date: Fri Jun 1 22:30:15 2018 -0300
Use exo's wrapper for gtk_dialog_get_action_area
This wrapper dispels deprecation warnings
---
configure.ac.in | 2 +-
tvp-git-helper/Makefile.am | 24 +++++++++++++-----------
tvp-git-helper/tgh-blame-dialog.c | 6 ++++--
tvp-git-helper/tgh-branch-dialog.c | 8 +++++---
tvp-git-helper/tgh-log-dialog.c | 10 ++++++----
tvp-git-helper/tgh-notify-dialog.c | 6 ++++--
tvp-git-helper/tgh-stash-dialog.c | 10 ++++++----
tvp-git-helper/tgh-status-dialog.c | 10 ++++++----
tvp-svn-helper/Makefile.am | 16 +++++++++-------
tvp-svn-helper/tsh-blame-dialog.c | 6 ++++--
tvp-svn-helper/tsh-diff-dialog.c | 8 +++++---
tvp-svn-helper/tsh-log-dialog.c | 10 ++++++----
tvp-svn-helper/tsh-notify-dialog.c | 6 ++++--
tvp-svn-helper/tsh-properties-dialog.c | 6 ++++--
tvp-svn-helper/tsh-status-dialog.c | 10 ++++++----
15 files changed, 83 insertions(+), 55 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index c0cae2f..c1af963 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -83,7 +83,7 @@ dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
XDT_CHECK_PACKAGE([THUNARX], [thunarx-3], [1.2.0])
-XDT_CHECK_PACKAGE([EXO], [exo-2], [0.10.0])
+XDT_CHECK_PACKAGE([EXO], [exo-2], [0.11.4])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.32.0])
diff --git a/tvp-git-helper/Makefile.am b/tvp-git-helper/Makefile.am
index 628f0bd..f1b4e2b 100644
--- a/tvp-git-helper/Makefile.am
+++ b/tvp-git-helper/Makefile.am
@@ -79,18 +79,20 @@ tvp_git_helper_CPPFLAGS = \
-DG_LOG_DOMAIN=\"tvp-git-helper\" \
$(AM_CPPFLAGS)
-tvp_git_helper_CFLAGS = \
- $(PLATFORM_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(GTK_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(GOBJECT_CFLAGS)
+tvp_git_helper_CFLAGS = \
+ $(PLATFORM_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GOBJECT_CFLAGS) \
+ $(EXO_CFLAGS)
-tvp_git_helper_LDFLAGS = \
- $(PLATFORM_LDFLAGS) \
- $(LIBXFCE4UTIL_LIBS) \
+tvp_git_helper_LDFLAGS = \
+ $(PLATFORM_LDFLAGS) \
+ $(LIBXFCE4UTIL_LIBS) \
$(GTK_LIBS) \
- $(GLIB_LIBS) \
- $(GOBJECT_LIBS)
+ $(GLIB_LIBS) \
+ $(GOBJECT_LIBS) \
+ $(EXO_LIBS)
# vi:set ts=8 sw=8 noet ai nocindent:
diff --git a/tvp-git-helper/tgh-blame-dialog.c b/tvp-git-helper/tgh-blame-dialog.c
index b31cece..9eb5585 100644
--- a/tvp-git-helper/tgh-blame-dialog.c
+++ b/tvp-git-helper/tgh-blame-dialog.c
@@ -20,9 +20,11 @@
#include <config.h>
#endif
-#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
+#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
+
#include "tgh-common.h"
#include "tgh-blame-dialog.h"
@@ -132,7 +134,7 @@ tgh_blame_dialog_init (TghBlameDialog *dialog)
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_with_mnemonic(_("_Cancel"));
- gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
diff --git a/tvp-git-helper/tgh-branch-dialog.c b/tvp-git-helper/tgh-branch-dialog.c
index c8feb85..165e33c 100644
--- a/tvp-git-helper/tgh-branch-dialog.c
+++ b/tvp-git-helper/tgh-branch-dialog.c
@@ -20,9 +20,11 @@
#include <config.h>
#endif
-#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
+#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
+
#include "tgh-common.h"
#include "tgh-dialog-common.h"
#include "tgh-branch-dialog.h"
@@ -283,8 +285,8 @@ create_clicked (GtkButton *button, gpointer user_data)
gtk_container_set_border_width (GTK_CONTAINER (name_dialog), 5);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (name_dialog))), 14); /* 14 + 2 * 5 = 24 */
- gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (name_dialog))), 5);
- gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (name_dialog))), 6);
+ gtk_container_set_border_width (GTK_CONTAINER (exo_gtk_dialog_get_action_area (GTK_DIALOG (name_dialog))), 5);
+ gtk_box_set_spacing (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (name_dialog))), 6);
gtk_widget_show_all (hbox);
diff --git a/tvp-git-helper/tgh-log-dialog.c b/tvp-git-helper/tgh-log-dialog.c
index 5d02420..50c1e10 100644
--- a/tvp-git-helper/tgh-log-dialog.c
+++ b/tvp-git-helper/tgh-log-dialog.c
@@ -20,9 +20,11 @@
#include <config.h>
#endif
-#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
+#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
+
#include "tgh-common.h"
#include "tgh-cell-renderer-graph.h"
#include "tgh-log-dialog.h"
@@ -243,15 +245,15 @@ tgh_log_dialog_init (TghLogDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Log"));
- gtk_button_box_set_layout(GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
+ gtk_button_box_set_layout(GTK_BUTTON_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
dialog->refresh = button = gtk_button_new_with_mnemonic (_("_Refresh"));
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (refresh_clicked), dialog);
gtk_widget_hide (button);
diff --git a/tvp-git-helper/tgh-notify-dialog.c b/tvp-git-helper/tgh-notify-dialog.c
index aa476d5..a44e9f9 100644
--- a/tvp-git-helper/tgh-notify-dialog.c
+++ b/tvp-git-helper/tgh-notify-dialog.c
@@ -20,9 +20,11 @@
#include <config.h>
#endif
-#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
+#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
+
#include "tgh-notify-dialog.h"
static void cancel_clicked (GtkButton*, gpointer);
@@ -110,7 +112,7 @@ tgh_notify_dialog_init (TghNotifyDialog *dialog)
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
- gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
diff --git a/tvp-git-helper/tgh-stash-dialog.c b/tvp-git-helper/tgh-stash-dialog.c
index f05b791..24d8e27 100644
--- a/tvp-git-helper/tgh-stash-dialog.c
+++ b/tvp-git-helper/tgh-stash-dialog.c
@@ -20,9 +20,11 @@
#include <config.h>
#endif
-#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
+#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
+
#include "tgh-common.h"
#include "tgh-dialog-common.h"
#include "tgh-stash-dialog.h"
@@ -249,7 +251,7 @@ tgh_stash_dialog_init (TghStashDialog *dialog)
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
- gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
@@ -412,8 +414,8 @@ save_clicked (GtkButton *button, gpointer user_data)
gtk_container_set_border_width (GTK_CONTAINER (name_dialog), 5);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (name_dialog))), 14); /* 14 + 2 * 5 = 24 */
- gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (name_dialog))), 5);
- gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (name_dialog))), 6);
+ gtk_container_set_border_width (GTK_CONTAINER (exo_gtk_dialog_get_action_area (GTK_DIALOG (name_dialog))), 5);
+ gtk_box_set_spacing (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (name_dialog))), 6);
gtk_widget_show_all (hbox);
diff --git a/tvp-git-helper/tgh-status-dialog.c b/tvp-git-helper/tgh-status-dialog.c
index f4962fe..b711541 100644
--- a/tvp-git-helper/tgh-status-dialog.c
+++ b/tvp-git-helper/tgh-status-dialog.c
@@ -20,9 +20,11 @@
#include <config.h>
#endif
-#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
+#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
+
#include "tgh-common.h"
#include "tgh-status-dialog.h"
@@ -123,15 +125,15 @@ tgh_status_dialog_init (TghStatusDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Status"));
- gtk_button_box_set_layout(GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
+ gtk_button_box_set_layout(GTK_BUTTON_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
dialog->refresh = button = gtk_button_new_with_mnemonic (_("_Refresh"));
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (refresh_clicked), dialog);
gtk_widget_hide (button);
diff --git a/tvp-svn-helper/Makefile.am b/tvp-svn-helper/Makefile.am
index 634bf0b..f86599b 100644
--- a/tvp-svn-helper/Makefile.am
+++ b/tvp-svn-helper/Makefile.am
@@ -111,22 +111,24 @@ tvp_svn_helper_CPPFLAGS = \
-DG_LOG_DOMAIN=\"tvp-svn-helper\" \
$(AM_CPPFLAGS)
-tvp_svn_helper_CFLAGS = \
+tvp_svn_helper_CFLAGS = \
$(PLATFORM_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
$(GTK_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(GOBJECT_CFLAGS) \
- $(APR_CFLAGS)
+ $(APR_CFLAGS) \
+ $(EXO_CFLAGS)
-tvp_svn_helper_LDFLAGS = \
+tvp_svn_helper_LDFLAGS = \
$(PLATFORM_LDFLAGS) \
- $(LIBXFCE4UTIL_LIBS) \
- $(GTK_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
+ $(GTK_LIBS) \
$(GLIB_LIBS) \
$(GTHREAD_LIBS) \
$(GOBJECT_LIBS) \
- $(APR_LIBS)
+ $(APR_LIBS) \
+ $(EXO_LIBS)
# vi:set ts=8 sw=8 noet ai nocindent:
diff --git a/tvp-svn-helper/tsh-blame-dialog.c b/tvp-svn-helper/tsh-blame-dialog.c
index 11033b3..179f617 100644
--- a/tvp-svn-helper/tsh-blame-dialog.c
+++ b/tvp-svn-helper/tsh-blame-dialog.c
@@ -20,9 +20,11 @@
#include <config.h>
#endif
-#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
+#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
+
#include <subversion-1/svn_client.h>
#include <subversion-1/svn_pools.h>
@@ -135,7 +137,7 @@ tsh_blame_dialog_init (TshBlameDialog *dialog)
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
- gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
diff --git a/tvp-svn-helper/tsh-diff-dialog.c b/tvp-svn-helper/tsh-diff-dialog.c
index d30397e..3642441 100644
--- a/tvp-svn-helper/tsh-diff-dialog.c
+++ b/tvp-svn-helper/tsh-diff-dialog.c
@@ -21,12 +21,14 @@
#include <config.h>
#endif
-#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
#include <subversion-1/svn_client.h>
#include <subversion-1/svn_pools.h>
+#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
+
#include "tsh-common.h"
#include "tsh-diff-dialog.h"
@@ -139,12 +141,12 @@ tsh_diff_dialog_init (TshDiffDialog *dialog)
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
- gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
dialog->refresh = button = gtk_button_new_with_mnemonic (_("_Refresh"));
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (refresh_clicked), dialog);
gtk_widget_hide (button);
diff --git a/tvp-svn-helper/tsh-log-dialog.c b/tvp-svn-helper/tsh-log-dialog.c
index 5bc172a..c8f8104 100644
--- a/tvp-svn-helper/tsh-log-dialog.c
+++ b/tvp-svn-helper/tsh-log-dialog.c
@@ -20,11 +20,13 @@
#include <config.h>
#endif
-#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
#include <subversion-1/svn_client.h>
+#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
+
#include "tsh-common.h"
#include "tsh-tree-common.h"
#include "tsh-log-dialog.h"
@@ -226,15 +228,15 @@ tsh_log_dialog_init (TshLogDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Log"));
- gtk_button_box_set_layout(GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
+ gtk_button_box_set_layout(GTK_BUTTON_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
dialog->refresh = button = gtk_button_new_with_mnemonic (_("_Refresh"));
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (refresh_clicked), dialog);
gtk_widget_hide (button);
diff --git a/tvp-svn-helper/tsh-notify-dialog.c b/tvp-svn-helper/tsh-notify-dialog.c
index 5ff6a34..55323bf 100644
--- a/tvp-svn-helper/tsh-notify-dialog.c
+++ b/tvp-svn-helper/tsh-notify-dialog.c
@@ -20,9 +20,11 @@
#include <config.h>
#endif
-#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
+#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
+
#include "tsh-notify-dialog.h"
static void cancel_clicked (GtkButton*, gpointer);
@@ -117,7 +119,7 @@ tsh_notify_dialog_init (TshNotifyDialog *dialog)
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
- gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
diff --git a/tvp-svn-helper/tsh-properties-dialog.c b/tvp-svn-helper/tsh-properties-dialog.c
index 4f905c6..e631163 100644
--- a/tvp-svn-helper/tsh-properties-dialog.c
+++ b/tvp-svn-helper/tsh-properties-dialog.c
@@ -20,12 +20,14 @@
#include <config.h>
#endif
-#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
#include <subversion-1/svn_client.h>
#include <subversion-1/svn_props.h>
+#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
+
#include "tsh-common.h"
#include "tsh-properties-dialog.h"
@@ -252,7 +254,7 @@ tsh_properties_dialog_init (TshPropertiesDialog *dialog)
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
- gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
diff --git a/tvp-svn-helper/tsh-status-dialog.c b/tvp-svn-helper/tsh-status-dialog.c
index ae913fc..aa21743 100644
--- a/tvp-svn-helper/tsh-status-dialog.c
+++ b/tvp-svn-helper/tsh-status-dialog.c
@@ -20,11 +20,13 @@
#include <config.h>
#endif
-#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
#include <subversion-1/svn_client.h>
+#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
+
#include "tsh-common.h"
#include "tsh-tree-common.h"
#include "tsh-status-dialog.h"
@@ -251,15 +253,15 @@ tsh_status_dialog_init (TshStatusDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Status"));
- gtk_button_box_set_layout(GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
+ gtk_button_box_set_layout(GTK_BUTTON_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
dialog->refresh = button = gtk_button_new_with_mnemonic (_("_Refresh"));
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (refresh_clicked), dialog);
gtk_widget_hide (button);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list