[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] 02/13: Stop poking widgets internals
noreply at xfce.org
noreply at xfce.org
Thu May 24 04:05:06 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 963793be896f5d78977a4ed3832c9fcbb8a4b531
Author: Andre Miranda <andreldm at xfce.org>
Date: Wed Nov 15 20:57:00 2017 -0300
Stop poking widgets internals
---
tvp-git-helper/tgh-blame-dialog.c | 4 ++--
tvp-git-helper/tgh-branch-dialog.c | 14 +++++---------
tvp-git-helper/tgh-cell-renderer-graph.c | 30 ++++++++++++++++++++----------
tvp-git-helper/tgh-clean-dialog.c | 6 +++---
tvp-git-helper/tgh-dialog-common.c | 16 ----------------
tvp-git-helper/tgh-dialog-common.h | 2 --
tvp-git-helper/tgh-file-selection-dialog.c | 4 ++--
tvp-git-helper/tgh-log-dialog.c | 8 ++++----
tvp-git-helper/tgh-notify-dialog.c | 4 ++--
tvp-git-helper/tgh-stash-dialog.c | 26 ++++++++------------------
tvp-git-helper/tgh-status-dialog.c | 8 ++++----
tvp-git-helper/tgh-transfer-dialog.c | 2 +-
tvp-svn-helper/tsh-blame-dialog.c | 4 ++--
tvp-svn-helper/tsh-diff-dialog.c | 8 ++++----
tvp-svn-helper/tsh-file-dialog.c | 2 +-
tvp-svn-helper/tsh-file-selection-dialog.c | 4 ++--
tvp-svn-helper/tsh-lock-dialog.c | 4 ++--
tvp-svn-helper/tsh-log-dialog.c | 10 +++++-----
tvp-svn-helper/tsh-log-message-dialog.c | 2 +-
tvp-svn-helper/tsh-login-dialog.c | 2 +-
tvp-svn-helper/tsh-notify-dialog.c | 4 ++--
tvp-svn-helper/tsh-properties-dialog.c | 24 ++++--------------------
tvp-svn-helper/tsh-relocate-dialog.c | 2 +-
tvp-svn-helper/tsh-status-dialog.c | 10 +++++-----
tvp-svn-helper/tsh-transfer-dialog.c | 2 +-
tvp-svn-helper/tsh-trust-dialog.c | 15 +++++++++------
26 files changed, 91 insertions(+), 126 deletions(-)
diff --git a/tvp-git-helper/tgh-blame-dialog.c b/tvp-git-helper/tgh-blame-dialog.c
index 03893b4..f1151ab 100644
--- a/tvp-git-helper/tgh-blame-dialog.c
+++ b/tvp-git-helper/tgh-blame-dialog.c
@@ -122,7 +122,7 @@ tgh_blame_dialog_init (TghBlameDialog *dialog)
g_object_unref (model);
gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll_window, TRUE, TRUE, 0);
gtk_widget_show (tree_view);
gtk_widget_show (scroll_window);
@@ -132,7 +132,7 @@ tgh_blame_dialog_init (TghBlameDialog *dialog)
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (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 dbdb47b..ca21453 100644
--- a/tvp-git-helper/tgh-branch-dialog.c
+++ b/tvp-git-helper/tgh-branch-dialog.c
@@ -97,7 +97,6 @@ tgh_branch_dialog_init (TghBranchDialog *dialog)
GtkWidget *scroll_window;
GtkCellRenderer *renderer;
GtkTreeModel *model;
- GtkWidget *box;
scroll_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -124,20 +123,17 @@ tgh_branch_dialog_init (TghBranchDialog *dialog)
g_object_unref (model);
gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll_window, TRUE, TRUE, 0);
gtk_widget_show (tree_view);
gtk_widget_show (scroll_window);
- tgh_dialog_replace_action_area (GTK_DIALOG (dialog));
- box = GTK_DIALOG (dialog)->action_area;
-
dialog->checkout = button = gtk_button_new_from_stock(GTK_STOCK_JUMP_TO);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (checkout_clicked), dialog);
gtk_widget_show (button);
dialog->create = button = gtk_button_new_from_stock(GTK_STOCK_NEW);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (create_clicked), dialog);
gtk_widget_show (button);
@@ -147,7 +143,7 @@ tgh_branch_dialog_init (TghBranchDialog *dialog)
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_box_pack_end (GTK_BOX (box), button, FALSE, TRUE, 0);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
@@ -289,7 +285,7 @@ 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 (name_dialog)->vbox), 14); /* 14 + 2 * 5 = 24 */
+ 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);
diff --git a/tvp-git-helper/tgh-cell-renderer-graph.c b/tvp-git-helper/tgh-cell-renderer-graph.c
index 1721cdd..781c423 100644
--- a/tvp-git-helper/tgh-cell-renderer-graph.c
+++ b/tvp-git-helper/tgh-cell-renderer-graph.c
@@ -47,8 +47,8 @@ enum {
static void tgh_cell_renderer_graph_get_property (GObject*, guint, GValue*, GParamSpec*);
static void tgh_cell_renderer_graph_set_property (GObject*, guint, const GValue*, GParamSpec*);
-static void tgh_cell_renderer_graph_get_size (GtkCellRenderer*, GtkWidget*, GdkRectangle*, gint*, gint*, gint*, gint*);
static void tgh_cell_renderer_graph_render (GtkCellRenderer*, GdkDrawable*, GtkWidget*, GdkRectangle*, GdkRectangle*, GdkRectangle*, GtkCellRendererState);
+static void tgh_cell_renderer_graph_get_size (GtkCellRenderer*, GtkWidget*, const GdkRectangle*, gint*, gint*, gint*, gint*);
G_DEFINE_TYPE (TghCellRendererGraph, tgh_cell_renderer_graph, GTK_TYPE_CELL_RENDERER)
@@ -120,13 +120,15 @@ tgh_cell_renderer_graph_set_property (GObject *object, guint property_id, const
}
static void
-tgh_cell_renderer_graph_get_size (GtkCellRenderer *cell, GtkWidget *widget, GdkRectangle *cell_area, gint *x_offset, gint *y_offset, gint *width, gint *height)
+tgh_cell_renderer_graph_get_size (GtkCellRenderer *cell, GtkWidget *widget, const GdkRectangle *cell_area, gint *x_offset, gint *y_offset, gint *width, gint *height)
{
TghCellRendererGraph *renderer = TGH_CELL_RENDERER_GRAPH (cell);
gint graph_width = 0;
gint graph_height = 0;
gint calc_width;
gint calc_height;
+ gint xpad, ypad;
+ gfloat xalign, yalign;
if (renderer->graph_iter)
{
@@ -151,21 +153,24 @@ tgh_cell_renderer_graph_get_size (GtkCellRenderer *cell, GtkWidget *widget, GdkR
}
}
- calc_width = (gint) cell->xpad * 2 + graph_width;
- calc_height = (gint) cell->ypad * 2 + graph_height;
+ gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+ gtk_cell_renderer_get_alignment (cell, &xalign, &yalign);
+
+ calc_width = (gint) xpad * 2 + graph_width;
+ calc_height = (gint) ypad * 2 + graph_height;
if (cell_area && graph_width > 0 && graph_height > 0)
{
if (x_offset)
{
*x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
- (1.0 - cell->xalign) : cell->xalign) * (cell_area->width - calc_width));
+ (1.0 - xalign) : xalign) * (cell_area->width - calc_width));
if (*x_offset < 0)
*x_offset = 0;
}
if (y_offset)
{
- *y_offset = (cell->yalign * (cell_area->height - calc_height));
+ *y_offset = (yalign * (cell_area->height - calc_height));
if (*y_offset < 0)
*y_offset = 0;
}
@@ -269,6 +274,8 @@ tgh_cell_renderer_graph_render (GtkCellRenderer *cell, GdkDrawable *window, GtkW
gint x;
gboolean rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
GtkStateType state;
+ gint xpad;
+ gfloat xalign;
if (flags & GTK_CELL_RENDERER_INSENSITIVE)
state = GTK_STATE_INSENSITIVE;
@@ -279,8 +286,11 @@ tgh_cell_renderer_graph_render (GtkCellRenderer *cell, GdkDrawable *window, GtkW
else
state = GTK_STATE_NORMAL;
- x_offset += cell_area->x + cell->xpad;
- x2_offset = x_offset + width - cell->xpad * 2;
+ gtk_cell_renderer_get_padding (cell, &xpad, NULL);
+ gtk_cell_renderer_get_alignment (cell, &xalign, NULL);
+
+ x_offset += cell_area->x + xpad;
+ x2_offset = x_offset + width - xpad * 2;
y_offset = background_area->y;
height = background_area->height;
@@ -309,7 +319,7 @@ tgh_cell_renderer_graph_render (GtkCellRenderer *cell, GdkDrawable *window, GtkW
x2_offset = tgh_graph_node_length (graph_iter->data);
x2_offset = renderer->spacing + renderer->spacing * x2_offset + x2_offset;
- x2_offset = ((rtl ? (1.0 - cell->xalign) : cell->xalign) * (cell_area->width - x2_offset)) + (rtl ? x2_offset : 0);
+ x2_offset = ((rtl ? (1.0 - xalign) : xalign) * (cell_area->width - x2_offset)) + (rtl ? x2_offset : 0);
if (x2_offset < 0)
x2_offset = 0;
x2_offset += cell_area->x;
@@ -344,7 +354,7 @@ tgh_cell_renderer_graph_render (GtkCellRenderer *cell, GdkDrawable *window, GtkW
x2_offset = tgh_graph_node_length (graph_iter->data);
x2_offset = renderer->spacing + renderer->spacing * x2_offset + x2_offset;
- x2_offset = ((rtl ? (1.0 - cell->xalign) : cell->xalign) * (cell_area->width - x2_offset)) + (rtl ? x2_offset : 0);
+ x2_offset = ((rtl ? (1.0 - xalign) : xalign) * (cell_area->width - x2_offset)) + (rtl ? x2_offset : 0);
if (x2_offset < 0)
x2_offset = 0;
x2_offset += cell_area->x;
diff --git a/tvp-git-helper/tgh-clean-dialog.c b/tvp-git-helper/tgh-clean-dialog.c
index 43bb93b..aed60a6 100644
--- a/tvp-git-helper/tgh-clean-dialog.c
+++ b/tvp-git-helper/tgh-clean-dialog.c
@@ -54,13 +54,13 @@ tgh_clean_dialog_init (TghCleanDialog *dialog)
GtkCellRenderer *renderer;
dialog->directories = gtk_check_button_new_with_label (_("Remove directories."));
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), dialog->directories, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), dialog->directories, FALSE, TRUE, 0);
gtk_widget_show(dialog->directories);
model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT));
dialog->ignore = gtk_combo_box_new_with_model (model);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), dialog->ignore, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), dialog->ignore, FALSE, TRUE, 0);
gtk_widget_show(dialog->ignore);
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
@@ -90,7 +90,7 @@ tgh_clean_dialog_init (TghCleanDialog *dialog)
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (dialog->ignore), renderer, "text", 0);
dialog->force = gtk_check_button_new_with_label (_("Force clean."));
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), dialog->force, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), dialog->force, FALSE, TRUE, 0);
gtk_widget_show(dialog->force);
gtk_window_set_title (GTK_WINDOW (dialog), _("Clean"));
diff --git a/tvp-git-helper/tgh-dialog-common.c b/tvp-git-helper/tgh-dialog-common.c
index cd4a647..763013f 100644
--- a/tvp-git-helper/tgh-dialog-common.c
+++ b/tvp-git-helper/tgh-dialog-common.c
@@ -50,22 +50,6 @@ close_response (GtkDialog *dialog, gint response, gpointer user_data)
}
void
-tgh_dialog_replace_action_area (GtkDialog *dialog)
-{
- GtkWidget *box;
-
- gtk_container_remove (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), GTK_DIALOG (dialog)->action_area);
-
- GTK_DIALOG (dialog)->action_area = box = gtk_hbox_new (FALSE, 0);
-
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), box,
- FALSE, TRUE, 0);
- gtk_widget_show (box);
-
- gtk_box_reorder_child (GTK_BOX (GTK_DIALOG (dialog)->vbox), box, 0);
-}
-
-void
tgh_make_homogeneous (GtkWidget *first, ...)
{
GtkWidget *iter;
diff --git a/tvp-git-helper/tgh-dialog-common.h b/tvp-git-helper/tgh-dialog-common.h
index ce342ff..cff2423 100644
--- a/tvp-git-helper/tgh-dialog-common.h
+++ b/tvp-git-helper/tgh-dialog-common.h
@@ -23,8 +23,6 @@ G_BEGIN_DECLS
void tgh_dialog_start (GtkDialog*, gboolean);
-void tgh_dialog_replace_action_area (GtkDialog *);
-
void tgh_make_homogeneous (GtkWidget *, ...) G_GNUC_NULL_TERMINATED;
G_END_DECLS
diff --git a/tvp-git-helper/tgh-file-selection-dialog.c b/tvp-git-helper/tgh-file-selection-dialog.c
index 129a30c..5ba558c 100644
--- a/tvp-git-helper/tgh-file-selection-dialog.c
+++ b/tvp-git-helper/tgh-file-selection-dialog.c
@@ -107,7 +107,7 @@ tgh_file_selection_dialog_init (TghFileSelectionDialog *dialog)
g_object_unref (model);
gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll_window, TRUE, TRUE, 0);
gtk_widget_show (tree_view);
gtk_widget_show (scroll_window);
@@ -115,7 +115,7 @@ tgh_file_selection_dialog_init (TghFileSelectionDialog *dialog)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (all), TRUE);
gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (all), TRUE);
g_signal_connect (all, "toggled", G_CALLBACK (selection_all_toggled), dialog);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), all, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), all, FALSE, FALSE, 0);
gtk_widget_show (all);
gtk_window_set_title (GTK_WINDOW (dialog), _("Status"));
diff --git a/tvp-git-helper/tgh-log-dialog.c b/tvp-git-helper/tgh-log-dialog.c
index 7b0c3aa..6d01018 100644
--- a/tvp-git-helper/tgh-log-dialog.c
+++ b/tvp-git-helper/tgh-log-dialog.c
@@ -237,20 +237,20 @@ tgh_log_dialog_init (TghLogDialog *dialog)
gtk_paned_pack2 (GTK_PANED(pane), vpane, TRUE, FALSE);
gtk_widget_show (vpane);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), pane, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), pane, TRUE, TRUE, 0);
gtk_widget_show (pane);
gtk_window_set_title (GTK_WINDOW (dialog), _("Log"));
- gtk_button_box_set_layout(GTK_BUTTON_BOX (GTK_DIALOG (dialog)->action_area), GTK_BUTTONBOX_EDGE);
+ gtk_button_box_set_layout(GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (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_from_stock(GTK_STOCK_REFRESH);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (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 91e0678..05c643c 100644
--- a/tvp-git-helper/tgh-notify-dialog.c
+++ b/tvp-git-helper/tgh-notify-dialog.c
@@ -100,7 +100,7 @@ tgh_notify_dialog_init (TghNotifyDialog *dialog)
g_object_unref (model);
gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll_window, TRUE, TRUE, 0);
gtk_widget_show (tree_view);
gtk_widget_show (scroll_window);
@@ -110,7 +110,7 @@ tgh_notify_dialog_init (TghNotifyDialog *dialog)
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (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 2d53503..afd9b03 100644
--- a/tvp-git-helper/tgh-stash-dialog.c
+++ b/tvp-git-helper/tgh-stash-dialog.c
@@ -145,7 +145,6 @@ tgh_stash_dialog_init (TghStashDialog *dialog)
GtkWidget *file_view;
GtkWidget *scroll_window;
GtkWidget *vpane;
- GtkWidget *box;
GtkCellRenderer *renderer;
GtkTreeModel *model;
@@ -216,50 +215,41 @@ tgh_stash_dialog_init (TghStashDialog *dialog)
gtk_widget_show (file_view);
gtk_widget_show (scroll_window);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vpane, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vpane, TRUE, TRUE, 0);
gtk_widget_show (vpane);
- //gtk_button_box_set_layout(GTK_BUTTON_BOX (GTK_DIALOG (dialog)->action_area), GTK_BUTTONBOX_EDGE);
- tgh_dialog_replace_action_area (GTK_DIALOG (dialog));
- box = GTK_DIALOG (dialog)->action_area;
-
- //box = gtk_hbox_new (FALSE, 12);
-
dialog->save = button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (save_clicked), dialog);
gtk_widget_show (button);
dialog->apply = button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (apply_clicked), dialog);
gtk_widget_show (button);
dialog->pop = button = gtk_button_new_from_stock(GTK_STOCK_OK);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (pop_clicked), dialog);
gtk_widget_show (button);
dialog->drop = button = gtk_button_new_from_stock(GTK_STOCK_DELETE);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (drop_clicked), dialog);
gtk_widget_show (button);
dialog->clear = button = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (clear_clicked), dialog);
gtk_widget_show (button);
- //gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
- //gtk_widget_show (box);
-
gtk_window_set_title (GTK_WINDOW (dialog), _("Stash"));
dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (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);
@@ -424,7 +414,7 @@ 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 (name_dialog)->vbox), 14); /* 14 + 2 * 5 = 24 */
+ 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);
diff --git a/tvp-git-helper/tgh-status-dialog.c b/tvp-git-helper/tgh-status-dialog.c
index f52e332..6aa9685 100644
--- a/tvp-git-helper/tgh-status-dialog.c
+++ b/tvp-git-helper/tgh-status-dialog.c
@@ -117,21 +117,21 @@ tgh_status_dialog_init (TghStatusDialog *dialog)
g_object_unref (model);
gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll_window, TRUE, TRUE, 0);
gtk_widget_show (tree_view);
gtk_widget_show (scroll_window);
gtk_window_set_title (GTK_WINDOW (dialog), _("Status"));
- gtk_button_box_set_layout(GTK_BUTTON_BOX (GTK_DIALOG (dialog)->action_area), GTK_BUTTONBOX_EDGE);
+ gtk_button_box_set_layout(GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (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_from_stock(GTK_STOCK_REFRESH);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (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-transfer-dialog.c b/tvp-git-helper/tgh-transfer-dialog.c
index e8330ef..946c252 100644
--- a/tvp-git-helper/tgh-transfer-dialog.c
+++ b/tvp-git-helper/tgh-transfer-dialog.c
@@ -60,7 +60,7 @@ tgh_transfer_dialog_init (TghTransferDialog *dialog)
table = gtk_table_new (2, 2, FALSE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, FALSE, TRUE, 0);
gtk_widget_show (table);
label = gtk_label_new_with_mnemonic (_("_Repository:"));
diff --git a/tvp-svn-helper/tsh-blame-dialog.c b/tvp-svn-helper/tsh-blame-dialog.c
index 3fae4ac..a1fea9b 100644
--- a/tvp-svn-helper/tsh-blame-dialog.c
+++ b/tvp-svn-helper/tsh-blame-dialog.c
@@ -125,7 +125,7 @@ tsh_blame_dialog_init (TshBlameDialog *dialog)
g_object_unref (model);
gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll_window, TRUE, TRUE, 0);
gtk_widget_show (tree_view);
gtk_widget_show (scroll_window);
@@ -135,7 +135,7 @@ tsh_blame_dialog_init (TshBlameDialog *dialog)
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (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 595fec6..e9417ab 100644
--- a/tvp-svn-helper/tsh-diff-dialog.c
+++ b/tvp-svn-helper/tsh-diff-dialog.c
@@ -130,7 +130,7 @@ tsh_diff_dialog_init (TshDiffDialog *dialog)
}
gtk_container_add (GTK_CONTAINER (scroll_window), text_view);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll_window, TRUE, TRUE, 0);
gtk_widget_show (text_view);
gtk_widget_show (scroll_window);
@@ -140,12 +140,12 @@ tsh_diff_dialog_init (TshDiffDialog *dialog)
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (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_from_stock(GTK_STOCK_REFRESH);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (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);
@@ -214,7 +214,7 @@ tsh_diff_dialog_init (TshDiffDialog *dialog)
gtk_widget_show (show_copies_as_adds);
#endif
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, FALSE, FALSE, 0);
gtk_widget_show (table);
gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
diff --git a/tvp-svn-helper/tsh-file-dialog.c b/tvp-svn-helper/tsh-file-dialog.c
index 7f6ac36..c88569a 100644
--- a/tvp-svn-helper/tsh-file-dialog.c
+++ b/tvp-svn-helper/tsh-file-dialog.c
@@ -53,7 +53,7 @@ tsh_file_dialog_init (TshFileDialog *dialog)
table = gtk_table_new (2, 2, FALSE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, FALSE, TRUE, 0);
gtk_widget_show (table);
label = gtk_label_new_with_mnemonic (_("_Certificate:"));
diff --git a/tvp-svn-helper/tsh-file-selection-dialog.c b/tvp-svn-helper/tsh-file-selection-dialog.c
index ca3cb1b..1298a02 100644
--- a/tvp-svn-helper/tsh-file-selection-dialog.c
+++ b/tvp-svn-helper/tsh-file-selection-dialog.c
@@ -137,7 +137,7 @@ tsh_file_selection_dialog_init (TshFileSelectionDialog *dialog)
g_object_unref (model);
gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll_window, TRUE, TRUE, 0);
gtk_widget_show (tree_view);
gtk_widget_show (scroll_window);
@@ -145,7 +145,7 @@ tsh_file_selection_dialog_init (TshFileSelectionDialog *dialog)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (all), TRUE);
gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (all), TRUE);
g_signal_connect (all, "toggled", G_CALLBACK (selection_all_toggled), dialog);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), all, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), all, FALSE, FALSE, 0);
gtk_widget_show (all);
gtk_window_set_title (GTK_WINDOW (dialog), _("Status"));
diff --git a/tvp-svn-helper/tsh-lock-dialog.c b/tvp-svn-helper/tsh-lock-dialog.c
index d7b7eca..fad555f 100644
--- a/tvp-svn-helper/tsh-lock-dialog.c
+++ b/tvp-svn-helper/tsh-lock-dialog.c
@@ -61,11 +61,11 @@ tsh_lock_dialog_init (TshLockDialog *dialog)
gtk_container_add (GTK_CONTAINER (scroll_window), text_view);
gtk_widget_show (text_view);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll_window, TRUE, TRUE, 0);
gtk_widget_show (scroll_window);
dialog->steal = steal = gtk_check_button_new_with_label("Steal Lock");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), steal, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), steal, FALSE, FALSE, 0);
gtk_widget_show (steal);
gtk_window_set_title (GTK_WINDOW (dialog), _("Lock"));
diff --git a/tvp-svn-helper/tsh-log-dialog.c b/tvp-svn-helper/tsh-log-dialog.c
index c9dd1b2..d49ae61 100644
--- a/tvp-svn-helper/tsh-log-dialog.c
+++ b/tvp-svn-helper/tsh-log-dialog.c
@@ -206,7 +206,7 @@ tsh_log_dialog_init (TshLogDialog *dialog)
gtk_paned_pack2 (GTK_PANED(pane), vpane, TRUE, FALSE);
gtk_widget_show (vpane);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), pane, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), pane, TRUE, TRUE, 0);
gtk_widget_show (pane);
table = gtk_table_new (3, 2, FALSE);
@@ -219,20 +219,20 @@ tsh_log_dialog_init (TshLogDialog *dialog)
gtk_table_attach (GTK_TABLE (table), merged_revisions, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (merged_revisions);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, FALSE, FALSE, 0);
gtk_widget_show (table);
gtk_window_set_title (GTK_WINDOW (dialog), _("Log"));
- gtk_button_box_set_layout(GTK_BUTTON_BOX (GTK_DIALOG (dialog)->action_area), GTK_BUTTONBOX_EDGE);
+ gtk_button_box_set_layout(GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (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_from_stock(GTK_STOCK_REFRESH);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (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-message-dialog.c b/tvp-svn-helper/tsh-log-message-dialog.c
index 6200047..a8fd35d 100644
--- a/tvp-svn-helper/tsh-log-message-dialog.c
+++ b/tvp-svn-helper/tsh-log-message-dialog.c
@@ -111,7 +111,7 @@ tsh_log_message_dialog_init (TshLogMessageDialog *dialog)
gtk_widget_show (tree_view);
gtk_widget_show (scroll_window);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vpane, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vpane, TRUE, TRUE, 0);
gtk_widget_show (vpane);
gtk_window_set_title (GTK_WINDOW (dialog), _("Log Message"));
diff --git a/tvp-svn-helper/tsh-login-dialog.c b/tvp-svn-helper/tsh-login-dialog.c
index 0eea362..ef2eb9b 100644
--- a/tvp-svn-helper/tsh-login-dialog.c
+++ b/tvp-svn-helper/tsh-login-dialog.c
@@ -58,7 +58,7 @@ tsh_login_dialog_init (TshLoginDialog *dialog)
table = gtk_table_new (2, 3, FALSE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, FALSE, TRUE, 0);
gtk_widget_show (table);
dialog->user_lbl = gtk_label_new_with_mnemonic (_("_Username:"));
diff --git a/tvp-svn-helper/tsh-notify-dialog.c b/tvp-svn-helper/tsh-notify-dialog.c
index af4015b..415c214 100644
--- a/tvp-svn-helper/tsh-notify-dialog.c
+++ b/tvp-svn-helper/tsh-notify-dialog.c
@@ -107,7 +107,7 @@ tsh_notify_dialog_init (TshNotifyDialog *dialog)
g_object_unref (model);
gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll_window, TRUE, TRUE, 0);
gtk_widget_show (tree_view);
gtk_widget_show (scroll_window);
@@ -117,7 +117,7 @@ tsh_notify_dialog_init (TshNotifyDialog *dialog)
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (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 72d654d..8cad557 100644
--- a/tvp-svn-helper/tsh-properties-dialog.c
+++ b/tvp-svn-helper/tsh-properties-dialog.c
@@ -248,42 +248,26 @@ tsh_properties_dialog_init (TshPropertiesDialog *dialog)
gtk_paned_pack2 (GTK_PANED(vpane), box, TRUE, FALSE);
gtk_widget_show (box);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vpane, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vpane, TRUE, TRUE, 0);
gtk_widget_show (vpane);
- //gtk_button_box_set_layout(GTK_BUTTON_BOX (GTK_DIALOG (dialog)->action_area), GTK_BUTTONBOX_EDGE);
- gtk_container_remove (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), GTK_DIALOG (dialog)->action_area);
-
- GTK_DIALOG (dialog)->action_area = box = gtk_hbox_new (FALSE, 0);
-
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), box,
- FALSE, TRUE, 0);
- gtk_widget_show (box);
-
- gtk_box_reorder_child (GTK_BOX (GTK_DIALOG (dialog)->vbox), box, 0);
-
- //box = gtk_hbox_new (FALSE, 12);
-
dialog->set = button = gtk_button_new_from_stock(GTK_STOCK_ADD);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (set_clicked), dialog);
gtk_widget_show (button);
dialog->delete = button = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (delete_clicked), dialog);
gtk_widget_show (button);
- //gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
- //gtk_widget_show (box);
-
gtk_window_set_title (GTK_WINDOW (dialog), _("Properties"));
dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
gtk_widget_hide (button);
dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (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-relocate-dialog.c b/tvp-svn-helper/tsh-relocate-dialog.c
index e5b93ea..038a070 100644
--- a/tvp-svn-helper/tsh-relocate-dialog.c
+++ b/tvp-svn-helper/tsh-relocate-dialog.c
@@ -81,7 +81,7 @@ tsh_relocate_dialog_init (TshRelocateDialog *dialog)
table = gtk_table_new (2, 3, FALSE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, FALSE, TRUE, 0);
gtk_widget_show (table);
label = gtk_label_new_with_mnemonic (_("_From:"));
diff --git a/tvp-svn-helper/tsh-status-dialog.c b/tvp-svn-helper/tsh-status-dialog.c
index 6dc53ea..4985417 100644
--- a/tvp-svn-helper/tsh-status-dialog.c
+++ b/tvp-svn-helper/tsh-status-dialog.c
@@ -149,7 +149,7 @@ tsh_status_dialog_init (TshStatusDialog *dialog)
g_object_unref (model);
gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll_window, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll_window, TRUE, TRUE, 5);
gtk_widget_show (tree_view);
gtk_widget_show (scroll_window);
@@ -240,20 +240,20 @@ tsh_status_dialog_init (TshStatusDialog *dialog)
gtk_table_attach (GTK_TABLE (table), update, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (update);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, FALSE, FALSE, 0);
gtk_widget_show (table);
gtk_window_set_title (GTK_WINDOW (dialog), _("Status"));
- gtk_button_box_set_layout(GTK_BUTTON_BOX (GTK_DIALOG (dialog)->action_area), GTK_BUTTONBOX_EDGE);
+ gtk_button_box_set_layout(GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (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_from_stock(GTK_STOCK_REFRESH);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (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-transfer-dialog.c b/tvp-svn-helper/tsh-transfer-dialog.c
index b5c8d8d..7a30b8a 100644
--- a/tvp-svn-helper/tsh-transfer-dialog.c
+++ b/tvp-svn-helper/tsh-transfer-dialog.c
@@ -75,7 +75,7 @@ tsh_transfer_dialog_init (TshTransferDialog *dialog)
table = gtk_table_new (2, 2, FALSE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, FALSE, TRUE, 0);
gtk_widget_show (table);
label = gtk_label_new_with_mnemonic (_("_Repository:"));
diff --git a/tvp-svn-helper/tsh-trust-dialog.c b/tvp-svn-helper/tsh-trust-dialog.c
index 73e6e18..12fedeb 100644
--- a/tvp-svn-helper/tsh-trust-dialog.c
+++ b/tvp-svn-helper/tsh-trust-dialog.c
@@ -54,23 +54,26 @@ tsh_trust_dialog_class_init (TshTrustDialogClass *klass)
static void
tsh_trust_dialog_init (TshTrustDialog *dialog)
{
+ GtkBox *content_area;
+ content_area = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
+
dialog->notyetvalid = gtk_check_button_new_with_label (_("Certificate is not yet valid."));
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), dialog->notyetvalid, FALSE, TRUE, 0);
+ gtk_box_pack_start (content_area, dialog->notyetvalid, FALSE, TRUE, 0);
dialog->expired = gtk_check_button_new_with_label (_("Certificate has expired."));
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), dialog->expired, FALSE, TRUE, 0);
+ gtk_box_pack_start (content_area, dialog->expired, FALSE, TRUE, 0);
dialog->cnmismatch = gtk_check_button_new_with_label (_("Certificate does not match the remote hostname."));
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), dialog->cnmismatch, FALSE, TRUE, 0);
+ gtk_box_pack_start (content_area, dialog->cnmismatch, FALSE, TRUE, 0);
dialog->unknownca = gtk_check_button_new_with_label (_("Certificate authority is unknown."));
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), dialog->unknownca, FALSE, TRUE, 0);
+ gtk_box_pack_start (content_area, dialog->unknownca, FALSE, TRUE, 0);
dialog->other = gtk_check_button_new_with_label (_("Other failure."));
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), dialog->other, FALSE, TRUE, 0);
+ gtk_box_pack_start (content_area, dialog->other, FALSE, TRUE, 0);
dialog->may_save = gtk_check_button_new_with_label(_("Remember"));
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), dialog->may_save, FALSE, TRUE, 0);
+ gtk_box_pack_start (content_area, dialog->may_save, FALSE, TRUE, 0);
gtk_widget_show(dialog->may_save);
gtk_window_set_title (GTK_WINDOW (dialog), _("Trust"));
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list