Made some fields invisible that were visible before.

2000-04-30  Christopher James Lahey  <clahey@helixcode.com>

	* contact-editor/contact-editor.glade,
	contact-editor/e-contact-editor.c, gui/minicard/e-minicard.c: Made
	some fields invisible that were visible before.

svn path=/trunk/; revision=2697

7 files changed, 48 insertions, 18 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 57c10947a5..9adb070fe9 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,11 @@
 2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
 
+	* contact-editor/contact-editor.glade,
+	contact-editor/e-contact-editor.c, gui/minicard/e-minicard.c: Made
+	some fields invisible that were visible before.
+
+2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
+
 	* backend/ebook/e-card.c: Make file as not have the : after it if
 	it's empty.  If there's no name, or file_as, fill in these fields
 	with defaults based on full_name or name respectively.
diff --git a/addressbook/contact-editor/contact-editor.glade b/addressbook/contact-editor/contact-editor.glade
index 33721520e6..910fa873cd 100644
--- a/addressbook/contact-editor/contact-editor.glade
+++ b/addressbook/contact-editor/contact-editor.glade
@@ -453,6 +453,7 @@
 	<widget>
 	  <class>GtkCheckButton</class>
 	  <name>checkbutton-mailingaddress</name>
+	  <visible>False</visible>
 	  <can_focus>True</can_focus>
 	  <label>This is the mailing address</label>
 	  <active>False</active>
@@ -930,6 +931,7 @@
 	<widget>
 	  <class>GtkCheckButton</class>
 	  <name>checkbutton-htmlmail</name>
+	  <visible>False</visible>
 	  <can_focus>True</can_focus>
 	  <label>Wants HTML mail</label>
 	  <active>False</active>
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index b4c20987f9..3b81cd51b6 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/contact-editor/e-contact-editor.c
@@ -132,17 +132,23 @@ e_contact_editor_class_init (EContactEditorClass *klass)
 static void
 _add_image(GtkTable *table, gchar *image, int left, int right, int top, int bottom)
 {
+	GtkWidget *pixmap = gnome_pixmap_new_from_file(image);
+	GtkWidget *alignment = gtk_widget_new(gtk_alignment_get_type(),
+					      "child", pixmap,
+					      "xalign", (double) 0,
+					      "yalign", (double) 0,
+					      "xscale", (double) 0,
+					      "yscale", (double) 0,
+					      NULL);
+	
 	gtk_table_attach(table,
-			 gtk_widget_new(gtk_alignment_get_type(),
-					"child", gnome_pixmap_new_from_file(image),
-					"xalign", (double) 0,
-					"yalign", (double) 0,
-					"xscale", (double) 0,
-					"yscale", (double) 0,
-					NULL),
+			 alignment,
 			 left, right, top, bottom,
 			 GTK_FILL, GTK_FILL,
 			 0, 0);
+
+	gtk_widget_show(pixmap);
+	gtk_widget_show(alignment);
 }
 
 static void
@@ -169,11 +175,14 @@ _replace_button(EContactEditor *editor, gchar *button_xml, gchar *image, GtkSign
 {
 	GladeXML *gui = editor->gui;
 	GtkWidget *button = glade_xml_get_widget(gui, button_xml);
+	GtkWidget *pixmap;
 	gchar *image_temp;
 	image_temp = g_strdup_printf("%s%s", DATADIR "/evolution/", image);
+	pixmap = gnome_pixmap_new_from_file(image_temp);
 	gtk_container_add(GTK_CONTAINER(button),
-			  gnome_pixmap_new_from_file(image_temp));
+			  pixmap);
 	g_free(image_temp);
+	gtk_widget_show(pixmap);
 	gtk_signal_connect(GTK_OBJECT(button), "button_press_event", func, editor);
 			   
 }
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 33721520e6..910fa873cd 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -453,6 +453,7 @@
 	<widget>
 	  <class>GtkCheckButton</class>
 	  <name>checkbutton-mailingaddress</name>
+	  <visible>False</visible>
 	  <can_focus>True</can_focus>
 	  <label>This is the mailing address</label>
 	  <active>False</active>
@@ -930,6 +931,7 @@
 	<widget>
 	  <class>GtkCheckButton</class>
 	  <name>checkbutton-htmlmail</name>
+	  <visible>False</visible>
 	  <can_focus>True</can_focus>
 	  <label>Wants HTML mail</label>
 	  <active>False</active>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index b4c20987f9..3b81cd51b6 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -132,17 +132,23 @@ e_contact_editor_class_init (EContactEditorClass *klass)
 static void
 _add_image(GtkTable *table, gchar *image, int left, int right, int top, int bottom)
 {
+	GtkWidget *pixmap = gnome_pixmap_new_from_file(image);
+	GtkWidget *alignment = gtk_widget_new(gtk_alignment_get_type(),
+					      "child", pixmap,
+					      "xalign", (double) 0,
+					      "yalign", (double) 0,
+					      "xscale", (double) 0,
+					      "yscale", (double) 0,
+					      NULL);
+	
 	gtk_table_attach(table,
-			 gtk_widget_new(gtk_alignment_get_type(),
-					"child", gnome_pixmap_new_from_file(image),
-					"xalign", (double) 0,
-					"yalign", (double) 0,
-					"xscale", (double) 0,
-					"yscale", (double) 0,
-					NULL),
+			 alignment,
 			 left, right, top, bottom,
 			 GTK_FILL, GTK_FILL,
 			 0, 0);
+
+	gtk_widget_show(pixmap);
+	gtk_widget_show(alignment);
 }
 
 static void
@@ -169,11 +175,14 @@ _replace_button(EContactEditor *editor, gchar *button_xml, gchar *image, GtkSign
 {
 	GladeXML *gui = editor->gui;
 	GtkWidget *button = glade_xml_get_widget(gui, button_xml);
+	GtkWidget *pixmap;
 	gchar *image_temp;
 	image_temp = g_strdup_printf("%s%s", DATADIR "/evolution/", image);
+	pixmap = gnome_pixmap_new_from_file(image_temp);
 	gtk_container_add(GTK_CONTAINER(button),
-			  gnome_pixmap_new_from_file(image_temp));
+			  pixmap);
 	g_free(image_temp);
+	gtk_widget_show(pixmap);
 	gtk_signal_connect(GTK_OBJECT(button), "button_press_event", func, editor);
 			   
 }
diff --git a/addressbook/gui/minicard/e-minicard.c b/addressbook/gui/minicard/e-minicard.c
index 6ff1d94aeb..76aec54854 100644
--- a/addressbook/gui/minicard/e-minicard.c
+++ b/addressbook/gui/minicard/e-minicard.c
@@ -347,7 +347,8 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)
 			gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox),
 					    contact_editor, TRUE, TRUE, 0);
 			
-			gtk_widget_show_all (dlg);
+			gtk_widget_show(contact_editor);
+			gtk_widget_show (dlg);
 			
 			gnome_dialog_close_hides (GNOME_DIALOG (dlg), TRUE);
 			result = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 6ff1d94aeb..76aec54854 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -347,7 +347,8 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)
 			gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox),
 					    contact_editor, TRUE, TRUE, 0);
 			
-			gtk_widget_show_all (dlg);
+			gtk_widget_show(contact_editor);
+			gtk_widget_show (dlg);
 			
 			gnome_dialog_close_hides (GNOME_DIALOG (dlg), TRUE);
 			result = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));