aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog2
-rw-r--r--mail/mail-account-editor-news.c193
-rw-r--r--mail/mail-account-editor-news.h72
3 files changed, 2 insertions, 265 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0d72a06085..09ff19f96d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,7 @@
2002-07-04 Jeffrey Stedfast <fejj@ximian.com>
+ * mail-account-editor-news.[c,h]: Removed.
+
* mail-accounts.c: Removed special-case code for NNTP support.
* mail-account-gui.c (mail_account_gui_setup): Allow configuration
diff --git a/mail/mail-account-editor-news.c b/mail/mail-account-editor-news.c
deleted file mode 100644
index 2b5d80f785..0000000000
--- a/mail/mail-account-editor-news.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Cloned from mail-account-editor by Sam Creasey <sammy@oh.verio.com>
- *
- * Authors:
- * Jeffrey Stedfast <fejj@ximian.com>
- * Dan Winship <danw@ximian.com>
- *
- * Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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 Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
-#include <camel/camel-url.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-gui-utils.h>
-
-#include "mail-account-editor-news.h"
-#include "mail-session.h"
-
-static void mail_account_editor_news_class_init (MailAccountEditorNewsClass *class);
-static void mail_account_editor_news_finalize (GtkObject *obj);
-
-static GnomeDialogClass *parent_class;
-
-
-GtkType
-mail_account_editor_news_get_type ()
-{
- static GtkType type = 0;
-
- if (!type) {
- GtkTypeInfo type_info = {
- "MailAccountEditorNews",
- sizeof (MailAccountEditorNews),
- sizeof (MailAccountEditorNewsClass),
- (GtkClassInitFunc) mail_account_editor_news_class_init,
- (GtkObjectInitFunc) NULL,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
- };
-
- type = gtk_type_unique (gnome_dialog_get_type (), &type_info);
- }
-
- return type;
-}
-
-static void
-mail_account_editor_news_class_init (MailAccountEditorNewsClass *class)
-{
- GtkObjectClass *object_class;
-
- object_class = (GtkObjectClass *) class;
- parent_class = gtk_type_class (gnome_dialog_get_type ());
-
- object_class->finalize = mail_account_editor_news_finalize;
-}
-
-static void
-mail_account_editor_news_finalize (GtkObject *obj)
-{
- MailAccountEditorNews *editor = (MailAccountEditorNews *) obj;
-
- gtk_object_unref (GTK_OBJECT (editor->xml));
-
- ((GtkObjectClass *)(parent_class))->finalize (obj);
-}
-
-static gboolean
-apply_changes(MailAccountEditorNews *editor)
-{
-
- CamelURL *url;
- GtkEntry *service_ent;
-
- service_ent = GTK_ENTRY(glade_xml_get_widget(editor->xml, "source_name"));
- url = g_new0 (CamelURL, 1);
-
- url->protocol = g_strdup("nntp");
- url->host = g_strdup(gtk_entry_get_text(service_ent));
- if(strlen(url->host) == 0) {
- e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("You have not filled in all of the required information."));
- camel_url_free(url);
- return FALSE;
- }
-
- if(editor->service->url == NULL)
- mail_config_add_news(editor->service);
-
- editor->service->url = camel_url_to_string(url, 0);
-
- mail_config_write();
- return TRUE;
-}
-
-static void
-apply_clicked (GtkWidget *widget, gpointer data)
-{
- MailAccountEditorNews *editor = data;
-
- apply_changes (editor);
-}
-
-static void
-ok_clicked (GtkWidget *widget, gpointer data)
-{
- MailAccountEditorNews *editor = data;
-
- if (apply_changes (editor))
- gtk_widget_destroy (GTK_WIDGET (editor));
-}
-
-static void
-cancel_clicked (GtkWidget *widget, gpointer data)
-{
- MailAccountEditorNews *editor = data;
-
- gtk_widget_destroy (GTK_WIDGET (editor));
-}
-
-GtkWidget *
-mail_account_editor_news_new (MailConfigService *service)
-{
- MailAccountEditorNews *editor;
- GtkEntry *service_ent;
-
- editor = (MailAccountEditorNews *) gtk_type_new (mail_account_editor_news_get_type ());
-
- editor->service = service;
- editor->xml = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", NULL);
-
- /* get our toplevel widget and reparent it */
- editor->notebook = GTK_NOTEBOOK (glade_xml_get_widget (editor->xml, "news_editor_notebook"));
- gtk_widget_reparent (GTK_WIDGET (editor->notebook), GNOME_DIALOG (editor)->vbox);
-
- /* give our dialog an OK button and title */
- gtk_window_set_title (GTK_WINDOW (editor), _("Evolution News Editor"));
- gtk_window_set_policy (GTK_WINDOW (editor), FALSE, TRUE, TRUE);
- gtk_window_set_modal (GTK_WINDOW (editor), TRUE);
- gnome_dialog_append_buttons (GNOME_DIALOG (editor),
- GNOME_STOCK_BUTTON_OK,
- GNOME_STOCK_BUTTON_APPLY,
- GNOME_STOCK_BUTTON_CANCEL,
- NULL);
-
- gnome_dialog_button_connect (GNOME_DIALOG (editor), 0 /* OK */,
- GTK_SIGNAL_FUNC (ok_clicked),
- editor);
- gnome_dialog_button_connect (GNOME_DIALOG (editor), 1 /* APPLY */,
- GTK_SIGNAL_FUNC (apply_clicked),
- editor);
- gnome_dialog_button_connect (GNOME_DIALOG (editor), 2 /* CANCEL */,
- GTK_SIGNAL_FUNC (cancel_clicked),
- editor);
-
- if (service->url) {
- CamelURL *url;
-
- url = camel_url_new (service->url, NULL);
-
- if (url->host) {
- service_ent = GTK_ENTRY (glade_xml_get_widget (editor->xml, "source_name"));
- gtk_entry_set_text (service_ent, url->host);
- }
-
- camel_url_free (url);
- }
-
- return GTK_WIDGET (editor);
-}
diff --git a/mail/mail-account-editor-news.h b/mail/mail-account-editor-news.h
deleted file mode 100644
index b7c04fb305..0000000000
--- a/mail/mail-account-editor-news.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Cloned from mail-account-editor by Sam Creasey <sammy@oh.verio.com>
- *
- * Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 2001 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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 Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef MAIL_ACCOUNT_EDITOR_NEWS_H
-#define MAIL_ACCOUNT_EDITOR_NEWS_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-file-entry.h>
-#include <gtk/gtk.h>
-#include <glade/glade-xml.h>
-#include <camel/camel-provider.h>
-
-#include "mail-config.h"
-
-#define MAIL_ACCOUNT_EDITOR_NEWS_TYPE (mail_account_editor_news_get_type ())
-#define MAIL_ACCOUNT_EDITOR_NEWS(o) (GTK_CHECK_CAST ((o), MAIL_ACCOUNT_EDITOR_NEWS_TYPE, MailAccountEditorNews))
-#define MAIL_ACCOUNT_EDITOR_NEWS_CLASS(k) (GTK_CHECK_CLASS_CAST((k), MAIL_ACCOUNT_EDITOR_NEWS_TYPE, MailAccountEditorNewsClass))
-#define MAIL_IS_ACCOUNT_EDITOR_NEWS(o) (GTK_CHECK_TYPE ((o), MAIL_ACCOUNT_EDITOR_NEWS_TYPE))
-#define MAIL_IS_ACCOUNT_EDITOR_NEWS_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), MAIL_ACCOUNT_EDITOR_NEWS_TYPE))
-
-struct _MailAccountEditorNews {
- GnomeDialog parent;
-
- GladeXML *xml;
- MailConfigService *service;
- GtkNotebook *notebook;
-};
-
-typedef struct _MailAccountEditorNews MailAccountEditorNews;
-
-typedef struct {
- GnomeDialogClass parent_class;
-
- /* signals */
-
-} MailAccountEditorNewsClass;
-
-GtkType mail_account_editor_news_get_type (void);
-
-GtkWidget *mail_account_editor_news_new (MailConfigService *service);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* MAIL_ACCOUNT_EDITOR_NEWS_H */