diff options
Diffstat (limited to 'libnautilus-private/nautilus-file-conflict-dialog.c')
| -rw-r--r-- | libnautilus-private/nautilus-file-conflict-dialog.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.c b/libnautilus-private/nautilus-file-conflict-dialog.c index 4ff762cc4..e48ec5438 100644 --- a/libnautilus-private/nautilus-file-conflict-dialog.c +++ b/libnautilus-private/nautilus-file-conflict-dialog.c @@ -194,7 +194,8 @@ file_list_ready_cb (GList *files, label = gtk_label_new (primary_text); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_line_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD_CHAR); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_label_set_yalign (GTK_LABEL (label), 0.5); gtk_box_pack_start (GTK_BOX (details->titles_vbox), label, FALSE, FALSE, 0); gtk_widget_show (label); @@ -210,7 +211,8 @@ file_list_ready_cb (GList *files, label = gtk_label_new (secondary_text); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_label_set_yalign (GTK_LABEL (label), 0.5); gtk_box_pack_start (GTK_BOX (details->titles_vbox), label, FALSE, FALSE, 0); gtk_widget_show (label); @@ -459,7 +461,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; @@ -477,7 +479,6 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd) widget = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG); gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (widget), 0.5, 0.0); /* Setup the vbox containing the dialog body */ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); @@ -489,11 +490,7 @@ 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); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); @@ -526,9 +523,6 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd) g_signal_connect (widget, "clicked", G_CALLBACK (reset_button_clicked_cb), dialog); - gtk_widget_show_all (alignment); - - /* Setup the checkbox to apply the action to all files */ widget = gtk_check_button_new_with_mnemonic (_("Apply this action to all files")); gtk_box_pack_start (GTK_BOX (vbox), |