From c7d90017045defc5c7eb61e8f7d90d42bbf79dfd Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@helixcode.com>
Date: Wed, 25 Oct 2000 02:53:37 +0000
Subject: Remove filter-url code.
2000-10-24 Jeffrey Stedfast <fejj@helixcode.com>
* filter-element.c (filter_element_new_type_name): Remove
filter-url code.
* filter-url.[c,h]: What was I smoking? There's no good reason to
filter on source urls as there are other ways to get the same
effect. Thanks to both Zucchi and Miguel for helping me see this
:-)
svn path=/trunk/; revision=6158
---
filter/ChangeLog | 12 ++-
filter/Makefile.am | 2 -
filter/filter-element.c | 3 -
filter/filter-url.c | 225 ------------------------------------------------
filter/filter-url.h | 58 -------------
5 files changed, 11 insertions(+), 289 deletions(-)
delete mode 100644 filter/filter-url.c
delete mode 100644 filter/filter-url.h
(limited to 'filter')
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 1e80d11b1e..643ae92b9a 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,4 +1,14 @@
-2022-10-24 Jeffrey Stedfast <fejj@helixcode.com>
+2000-10-24 Jeffrey Stedfast <fejj@helixcode.com>
+
+ * filter-element.c (filter_element_new_type_name): Remove
+ filter-url code.
+
+ * filter-url.[c,h]: What was I smoking? There's no good reason to
+ filter on source urls as there are other ways to get the same
+ effect. Thanks to both Zucchi and Miguel for helping me see this
+ :-)
+
+2000-10-24 Jeffrey Stedfast <fejj@helixcode.com>
* filter-driver.c: Fixed NULL in fprintf.
diff --git a/filter/Makefile.am b/filter/Makefile.am
index 3f8e3ed165..968b5b5625 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -52,8 +52,6 @@ libfilter_la_SOURCES = \
filter-rule.h \
filter-score.c \
filter-score.h \
- filter-url.c \
- filter-url.h \
rule-context.c \
rule-context.h \
score-context.c \
diff --git a/filter/filter-element.c b/filter/filter-element.c
index 40a9357598..41f3ffb6d4 100644
--- a/filter/filter-element.c
+++ b/filter/filter-element.c
@@ -28,7 +28,6 @@
#include "filter-colour.h"
#include "filter-datespec.h"
#include "filter-score.h"
-#include "filter-url.h"
#include "filter-folder.h"
static void xml_create(FilterElement *fe, xmlNodePtr node);
@@ -252,8 +251,6 @@ filter_element_new_type_name (const char *type)
return (FilterElement *)filter_datespec_new ();
} else if (!strcmp (type, "score")) {
return (FilterElement *)filter_score_new ();
- } else if (!strcmp (type, "url")) {
- return (FilterElement *)filter_url_new ();
} else {
g_warning("Unknown filter type '%s'", type);
return 0;
diff --git a/filter/filter-url.c b/filter/filter-url.c
deleted file mode 100644
index f84470d934..0000000000
--- a/filter/filter-url.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (www.helixcode.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.
- *
- */
-
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "e-util/e-sexp.h"
-#include "filter-url.h"
-/*#include "mail/mail-config.h"*/
-
-#define d(x)
-
-static void xml_create (FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode (FilterElement *fe);
-static int xml_decode (FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget (FilterElement *fe);
-static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp (FilterElement *, GString *);
-
-static void filter_url_class_init (FilterUrlClass *class);
-static void filter_url_init (FilterUrl *gspaper);
-static void filter_url_finalise (GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterUrl *)(x))->priv)
-
-struct _FilterUrlPrivate {
-};
-
-static FilterElementClass *parent_class;
-
-enum {
- LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_url_get_type (void)
-{
- static guint type = 0;
-
- if (!type) {
- GtkTypeInfo type_info = {
- "FilterUrl",
- sizeof (FilterUrl),
- sizeof (FilterUrlClass),
- (GtkClassInitFunc) filter_url_class_init,
- (GtkObjectInitFunc) filter_url_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
- };
-
- type = gtk_type_unique (filter_element_get_type (), &type_info);
- }
-
- return type;
-}
-
-static void
-filter_url_class_init (FilterUrlClass *class)
-{
- GtkObjectClass *object_class;
- FilterElementClass *filter_element = (FilterElementClass *)class;
-
- object_class = (GtkObjectClass *) class;
- parent_class = gtk_type_class (filter_element_get_type ());
-
- object_class->finalize = filter_url_finalise;
-
- /* override methods */
- filter_element->xml_create = xml_create;
- filter_element->xml_encode = xml_encode;
- filter_element->xml_decode = xml_decode;
- filter_element->get_widget = get_widget;
- filter_element->build_code = build_code;
- filter_element->format_sexp = format_sexp;
-
- /* signals */
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_url_init (FilterUrl *o)
-{
- o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_url_finalise (GtkObject *obj)
-{
- FilterUrl *o = (FilterUrl *)obj;
-
- o = o;
-
- ((GtkObjectClass *)(parent_class))->finalize (obj);
-}
-
-/**
- * filter_url_new:
- *
- * Create a new FilterUrl object.
- *
- * Return value: A new #FilterUrl object.
- **/
-FilterUrl *
-filter_url_new (void)
-{
- FilterUrl *o = (FilterUrl *) gtk_type_new (filter_url_get_type ());
-
- return o;
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
- /*FilterUrl *fu = (FilterUrl *)fe;*/
-
- /* parent implementation */
- ((FilterElementClass *)(parent_class))->xml_create (fe, node);
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
- xmlNodePtr value;
- FilterUrl *fu = (FilterUrl *)fe;
-
- d(printf ("Encoding url as xml\n"));
- value = xmlNewNode (NULL, "value");
- xmlSetProp (value, "name", fe->name);
- xmlSetProp (value, "type", "url");
-
- xmlSetProp (value, "url", fu->url);
-
- return value;
-}
-
-static gchar *
-get_value (xmlNodePtr node, char *name)
-{
- gchar *value;
-
- value = xmlGetProp (node, name);
-
- return value;
-}
-
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
- FilterUrl *fu = (FilterUrl *)fe;
-
- fe->name = xmlGetProp (node, "name");
- fu->url = get_value (node, "url");
-
- return 0;
-}
-
-static void
-set_url (GtkWidget *entry, FilterUrl *fu)
-{
- fu->url = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
- GtkWidget *combo;
- GList *sources;
- GSList *s;
-
- combo = gtk_combo_new ();
- /*s = mail_config_get_sources ();
- sources = NULL;
- while (s) {
- MailConfigService *service = s->data;
- sources = g_list_append (sources, service->url);
- s = s->next;
- }
- gtk_combo_set_popdown_strings (GTK_COMBO (combo), sources);
- g_list_free (sources);
- */
-
- gtk_widget_show (combo);
- gtk_signal_connect (GTK_OBJECT (GTK_EDITABLE (GTK_COMBO (combo)->entry)), "changed", set_url, fe);
-
- return combo;
-}
-
-static void
-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
- return;
-}
-
-static void
-format_sexp (FilterElement *fe, GString *out)
-{
- FilterUrl *fu = (FilterUrl *)fe;
-
- e_sexp_encode_string (out, fu->url);
-}
diff --git a/filter/filter-url.h b/filter/filter-url.h
deleted file mode 100644
index be27efa6e5..0000000000
--- a/filter/filter-url.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (www.helixcode.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 _FILTER_URL_H
-#define _FILTER_URL_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_URL(obj) GTK_CHECK_CAST (obj, filter_url_get_type (), FilterUrl)
-#define FILTER_URL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, filter_url_get_type (), FilterUrlClass)
-#define IS_FILTER_URL(obj) GTK_CHECK_TYPE (obj, filter_url_get_type ())
-
-typedef struct _FilterUrl FilterUrl;
-typedef struct _FilterUrlClass FilterUrlClass;
-
-struct _FilterUrl {
- FilterElement parent;
- struct _FilterUrlPrivate *priv;
-
- gchar *url;
-};
-
-struct _FilterUrlClass {
- FilterElementClass parent_class;
-
- /* virtual methods */
-
- /* signals */
-};
-
-guint filter_url_get_type (void);
-FilterUrl *filter_url_new (void);
-
-/* methods */
-
-#endif /* ! _FILTER_URL_H */
-
--
cgit