Sync with yet-another-mail-config branch.

2002-03-26  Jeffrey Stedfast  <fejj@ximian.com>

	Sync with yet-another-mail-config branch.

	* mail-composer-prefs.c: Updated to get the right widgets and
	whatnot. Also updated to tell the evolution-config-control that
	stuff has changed.

	* mail-preferences.c: Updated to get the right widgets and
	whatnot. Also updated to tell the evolution-config-control that
	stuff has changed.

	* mail-accounts.etspec: New file needed by mail-accounts.c

svn path=/trunk/; revision=16257

1 files changed, 118 insertions, 0 deletions

diff --git a/mail/mail-preferences.h b/mail/mail-preferences.h
new file mode 100644
index 0000000000..916fcb4d1f
--- /dev/null
+++ b/mail/mail-preferences.h
@@ -0,0 +1,118 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifndef __MAIL_PREFERENCES_H__
+#define __MAIL_PREFERENCES_H__
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif
+
+#include <gtk/gtk.h>
+#include <libgnomeui/gnome-color-picker.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-file-entry.h>
+#include <glade/glade.h>
+
+#include <gconf/gconf-client.h>
+
+#include "evolution-config-control.h"
+
+#include <shell/Evolution.h>
+
+#define MAIL_PREFERENCES_TYPE        (mail_preferences_get_type ())
+#define MAIL_PREFERENCES(o)          (GTK_CHECK_CAST ((o), MAIL_PREFERENCES_TYPE, MailPreferences))
+#define MAIL_PREFERENCES_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), MAIL_PREFERENCES_TYPE, MailPreferencesClass))
+#define IS_MAIL_PREFERENCES(o)       (GTK_CHECK_TYPE ((o), MAIL_PREFERENCES_TYPE))
+#define IS_MAIL_PREFERENCES_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), MAIL_PREFERENCES_TYPE))
+
+typedef struct _MailPreferences MailPreferences;
+typedef struct _MailPreferencesClass MailPreferencesClass;
+
+struct _MailPreferences {
+	GtkVBox parent_object;
+	
+	GNOME_Evolution_Shell shell;
+	
+	EvolutionConfigControl *control;
+	
+	GladeXML *gui;
+	GConfClient *gconf;
+	
+	/* General tab */
+	
+	/* Message Display */
+	GtkToggleButton *timeout_toggle;
+	GtkSpinButton *timeout;
+	GtkOptionMenu *charset;
+	GtkToggleButton *citation_highlight;
+	GnomeColorPicker *citation_color;
+	
+	/* Deleting Mail */
+	GtkToggleButton *empty_trash;
+	GtkToggleButton *confirm_expunge;
+	
+	/* New Mail Notification */
+	GtkToggleButton *notify_not;
+	GtkToggleButton *notify_beep;
+	GtkToggleButton *notify_play_sound;
+	GnomeFileEntry *notify_sound_file;
+	
+	/* HTML Mail tab */
+	
+	/* Loading Images */
+	GtkToggleButton *images_always;
+	GtkToggleButton *images_sometimes;
+	GtkToggleButton *images_never;
+	
+	GtkToggleButton *show_animated;
+	GtkToggleButton *autodetect_links;
+	GtkToggleButton *prompt_unwanted_html;
+	
+	/* Security tab */
+	GnomeFileEntry *pgp_path;
+};
+
+struct _MailPreferencesClass {
+	GtkVBoxClass parent_class;
+	
+	/* signals */
+	
+};
+
+
+GtkType mail_preferences_get_type (void);
+
+GtkWidget *mail_preferences_new (void);
+
+void mail_preferences_apply (MailPreferences *prefs);
+
+/* needed by global config */
+#define MAIL_PREFERENCES_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_Preferences_ConfigControl"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIL_PREFERENCES_H__ */