diff options
| author | Ernestas Kulik <ernestas.kulik@gmail.com> | 2016-04-17 12:41:22 +0300 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@src.gnome.org> | 2016-05-02 10:50:21 +0300 |
| commit | 470235f9349e5244ed5060006b015afb0c47b346 (patch) | |
| tree | 97e27fcb2d4f4a60292ffa73b0611e24b4b91d0a | |
| parent | 792dab05836b2db1ba7dccc176a340b7101a7895 (diff) | |
| download | nautilus-470235f9349e5244ed5060006b015afb0c47b346.tar.gz | |
file-conflict-dialog: use widget properties instead of GtkAlignment
GtkAlignment has been deprecated since GTK+ 3.14 and the use of
halign, valign and margin properties is encouraged.
This commit aligns widgets by use of said properties instead of the
GtkAlignment widget.
https://bugzilla.gnome.org/show_bug.cgi?id=762238
| -rw-r--r-- | src/nautilus-file-conflict-dialog.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/nautilus-file-conflict-dialog.c b/src/nautilus-file-conflict-dialog.c index 91b7fb286..bfce4c948 100644 --- a/src/nautilus-file-conflict-dialog.c +++ b/src/nautilus-file-conflict-dialog.c @@ -470,7 +470,7 @@ reset_button_clicked_cb (GtkButton *w, static void nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd) { - GtkWidget *hbox, *vbox, *vbox2, *alignment; + GtkWidget *hbox, *vbox, *vbox2; GtkWidget *widget, *dialog_area; NautilusFileConflictDialogDetails *details; GtkDialog *dialog; @@ -500,11 +500,10 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd) details->titles_vbox = widget; /* Setup the hboxes to pack file infos into */ - alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); - g_object_set (alignment, "left-padding", 12, NULL); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); - gtk_container_add (GTK_CONTAINER (alignment), vbox2); - gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0); + gtk_widget_set_halign (vbox2, GTK_ALIGN_START); + gtk_widget_set_margin_start (vbox2, 12); + gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); @@ -537,7 +536,7 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd) g_signal_connect (widget, "clicked", G_CALLBACK (reset_button_clicked_cb), dialog); - gtk_widget_show_all (alignment); + gtk_widget_show_all (vbox2); /* Setup the checkbox to apply the action to all files */ |