Finished the configuration dialogs and renamed some Tools/ menu items

this should also fix the bug where the VFolders menu item isn't removed when using the Calendar/etc

svn path=/trunk/; revision=3336

3 files changed, 18 insertions, 9 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index eb264985a5..a6e96cced4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2000-06-01  Jeffrey Stedfast  <fejj@helixcode.com>
+
+	* mail-config.c: Config dialogs are completed.
+
+	* folder-browser-factory.c: Renamed Tool/ menu items
+	Vfolder was changed to Virtual Folder and
+	Configure Camel Providers was changed to Mail Configuration
+
 2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* Makefile.am (evolution_mail_LDADD): Link with
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 3f492374bb..6cd36daebc 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -76,13 +76,13 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih)
 					 0,
 					 0, 0, filter_edit, folder_browser);
 
-	bonobo_ui_handler_menu_new_item (uih, "/Tools/Vfolder Druid ...", N_("_Vfolder Druid ..."),
+	bonobo_ui_handler_menu_new_item (uih, "/Tools/Virtual Folder Druid ...", N_("_Virtual Folder Druid ..."),
 					 NULL, -1,
 					 BONOBO_UI_HANDLER_PIXMAP_NONE,
 					 0,
 					 0, 0, vfolder_edit, folder_browser);
 
-	bonobo_ui_handler_menu_new_item (uih, "/Tools/Configure Camel Providers ...", N_("_Configure Camel Providers ..."),
+	bonobo_ui_handler_menu_new_item (uih, "/Tools/Mail Configuration ...", N_("_Mail Configuration ..."),
 					 NULL, -1,
 					 BONOBO_UI_HANDLER_PIXMAP_NONE,
 					 0,
@@ -118,8 +118,8 @@ control_deactivate (BonoboControl *control, BonoboUIHandler *uih)
 	bonobo_ui_handler_menu_remove (uih, "/File/Mail");
 	bonobo_ui_handler_menu_remove (uih, "/Tools/Expunge");
 	bonobo_ui_handler_menu_remove (uih, "/Tools/Filter Druid ...");
-	bonobo_ui_handler_menu_remove (uih, "/Tools/VFolder Druid ...");
-	bonobo_ui_handler_menu_remove (uih, "/Tools/Configure Camel Providers ...");
+	bonobo_ui_handler_menu_remove (uih, "/Tools/Virtual Folder Druid ...");
+	bonobo_ui_handler_menu_remove (uih, "/Tools/Mail Configuration ...");
 	bonobo_ui_handler_dock_remove (uih, "/Toolbar");
 }
 
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 49649b1add..2aa80553aa 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -1380,6 +1380,7 @@ on_SourceConfigDialogButton_clicked (GnomeDialog *dialog, int button, gpointer u
 					g_strdup (data->source));
 		break;
 	case 1: /* Cancel clicked */
+		g_print ("Cancel clicked\n");
 		if (data && data->new_entry) {
 			gtk_clist_remove (GTK_CLIST (data->clist), source_row);
 			source_row = -1;
@@ -1393,7 +1394,7 @@ on_SourceConfigDialogButton_clicked (GnomeDialog *dialog, int button, gpointer u
 }
 
 static GtkWidget*
-create_source_config_dialog (gboolean edit_mode, char *sourcep, GtkWidget *clist)
+create_source_config_dialog (gboolean edit_mode, char **sourcep, GtkWidget *clist)
 {
 	GtkWidget *config_dialog;
 	GtkWidget *dialog_vbox1;
@@ -1476,11 +1477,11 @@ create_source_config_dialog (gboolean edit_mode, char *sourcep, GtkWidget *clist
 	GTK_WIDGET_SET_FLAGS (cmdConfigDialogCancel, GTK_CAN_DEFAULT);
 	
         /* create/pack our source widget */
-	create_source_page (vbox, sources, &sourcep);
+	create_source_page (vbox, sources, sourcep);
 	
 	data = g_malloc0 (sizeof (struct source_dialog_data));
 	data->clist = clist;
-	data->source = sourcep;
+	data->source = *sourcep;
 	data->new_entry = !edit_mode;
 
 	gtk_signal_connect(GTK_OBJECT (config_dialog), "clicked",
@@ -1573,7 +1574,7 @@ on_cmdSourcesAdd_clicked (GtkWidget *widget, gpointer user_data)
 	gtk_clist_select_row (GTK_CLIST (user_data), source_row + 1, 0);
 
 	/* now create the editing dialog */
-	dialog = create_source_config_dialog (FALSE, source, GTK_WIDGET (user_data));
+	dialog = create_source_config_dialog (FALSE, &source, GTK_WIDGET (user_data));
 	gtk_widget_show (dialog);
 }
 
@@ -1592,7 +1593,7 @@ on_cmdSourcesEdit_clicked (GtkWidget *widget, gpointer user_data)
 	}
 
 	/* now create the editing dialog */
-	dialog = create_source_config_dialog (TRUE, sourcep, GTK_WIDGET (user_data));
+	dialog = create_source_config_dialog (TRUE, &sourcep, GTK_WIDGET (user_data));
 	gtk_widget_show (dialog);
 }