1 files changed, 14 insertions, 28 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index d3765314ba..7a167dc5ff 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -268,26 +268,19 @@ static GtkWidget *
 build_quick_add_dialog (QuickAdd *qa)
 {
 	GtkWidget *dialog;
-	GtkWidget *label;
 	GtkTable *table;
-	const gint xpad=0, ypad=0;
+	const gint xpad=6, ypad=6;
 
 	g_return_val_if_fail (qa != NULL, NULL);
 
 	dialog = gtk_dialog_new_with_buttons (_("Contact Quick-Add"),
 					      NULL, /* XXX */
-					      GTK_DIALOG_NO_SEPARATOR,
+					      (GtkDialogFlags) 0,
 					      _("_Edit Full"), QUICK_ADD_RESPONSE_EDIT_FULL,
-					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+					        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					      GTK_STOCK_OK, GTK_RESPONSE_OK,
 					      NULL);
 
-	gtk_widget_ensure_style (dialog);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 
-					0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 
-					12);
-
 	g_signal_connect (dialog, "response", G_CALLBACK (clicked_cb), qa);
 
 	qa->name_entry = gtk_entry_new ();
@@ -300,34 +293,27 @@ build_quick_add_dialog (QuickAdd *qa)
 		gtk_entry_set_text (GTK_ENTRY (qa->email_entry), qa->email);
 
 	table = GTK_TABLE (gtk_table_new (2, 2, FALSE));
-	gtk_table_set_row_spacings (table, 6);
-	gtk_table_set_col_spacings (table, 12);
 
-	label = gtk_label_new_with_mnemonic (_("_Full name:"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-
-	gtk_table_attach (table, label,
+	gtk_table_attach (table, gtk_label_new_with_mnemonic (_("_Full Name:")),
 			  0, 1, 0, 1,
-			  GTK_FILL, 0, xpad, ypad);
+			  0, 0, xpad, ypad);
 	gtk_table_attach (table, qa->name_entry,
 			  1, 2, 0, 1,
-			  GTK_EXPAND | GTK_FILL, 0, xpad, ypad);
-
-	label = gtk_label_new_with_mnemonic (_("E-_mail:"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-
-	gtk_table_attach (table, label,
+			  GTK_EXPAND | GTK_FILL, GTK_EXPAND, xpad, ypad);
+	gtk_table_attach (table, gtk_label_new_with_mnemonic (_("E-_mail:")),
 			  0, 1, 1, 2,
-			  GTK_FILL, 0, xpad, ypad);
+			  0, 0, xpad, ypad);
 	gtk_table_attach (table, qa->email_entry,
 			  1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL, 0, xpad, ypad);
+			  GTK_EXPAND | GTK_FILL, GTK_EXPAND, xpad, ypad);
+	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 
+					6);
+
+	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox),6);
 
-	gtk_container_set_border_width (GTK_CONTAINER (table), 
-					12);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
 			    GTK_WIDGET (table),
-			    FALSE, FALSE, 0);
+			    TRUE, TRUE, 6);
 	gtk_widget_show_all (GTK_WIDGET (table));