Readded Source url stuff.

2000-10-26  Jeffrey Stedfast  <fejj@helixcode.com>

	* filtertypes.xml: Readded Source url stuff.

	* filter-element.c (filter_element_new_type_name): Added url stuff
	back in.

	* filter-url.[c,h]: Back from the dead...

	* Makefile.am: Re-added filter-url.[c,h].

svn path=/trunk/; revision=6200

7 files changed, 310 insertions, 0 deletions

diff --git a/filter/ChangeLog b/filter/ChangeLog
index b35fc305f2..def818a6be 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,14 @@
+2000-10-26  Jeffrey Stedfast  <fejj@helixcode.com>
+
+	* filtertypes.xml: Readded Source url stuff.
+
+	* filter-element.c (filter_element_new_type_name): Added url stuff
+	back in.
+
+	* filter-url.[c,h]: Back from the dead...
+
+	* Makefile.am: Re-added filter-url.[c,h].
+
 2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* filtertypes.xml: Added option menu items to allow searching
diff --git a/filter/Makefile.am b/filter/Makefile.am
index 968b5b5625..3f8e3ed165 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -52,6 +52,8 @@ 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 41f3ffb6d4..21df744fe5 100644
--- a/filter/filter-element.c
+++ b/filter/filter-element.c
@@ -29,6 +29,7 @@
 #include "filter-datespec.h"
 #include "filter-score.h"
 #include "filter-folder.h"
+#include "filter-url.h"
 
 static void xml_create(FilterElement *fe, xmlNodePtr node);
 static FilterElement *clone(FilterElement *fe);
@@ -251,6 +252,8 @@ 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
new file mode 100644
index 0000000000..d647d38e65
--- /dev/null
+++ b/filter/filter-url.c
@@ -0,0 +1,214 @@
+/* -*- 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"
+
+#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 = NULL;  /* this needs to be a list of urls */
+	
+	combo = gtk_combo_new ();
+	gtk_combo_set_popdown_strings (GTK_COMBO (combo), 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
new file mode 100644
index 0000000000..f526acc5bf
--- /dev/null
+++ b/filter/filter-url.h
@@ -0,0 +1,59 @@
+/* -*- 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;
+	
+	GList *urls;  /* maybe use this? I dunno */
+	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 */
+
diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml
index 6417ef261c..6766f4bf3b 100644
--- a/filter/filtertypes.xml
+++ b/filter/filtertypes.xml
@@ -264,6 +264,26 @@
   </input>
  </part>
 
+ <part name="source">
+  <title>Source</title>
+  <input type="optionlist" name="url-type">
+   <option value="is">
+    <title>is</title>
+    <code>
+       (match-all (= (get-source) ${source}))
+    </code>
+   </option>
+   <option value="is-not">
+    <title>is not</title>
+    <code>
+       (match-all (not (= (get-source) ${source})))
+    </code>
+   </option>
+  </input>
+  <input type="url" name="source">
+  </input>
+ </part>
+
 </partset>
 
 
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
index c998d4ba0e..f053dae7ec 100644
--- a/filter/libfilter-i18n.h
+++ b/filter/libfilter-i18n.h
@@ -14,6 +14,7 @@ char *s = N_("Move to Folder");
 char *s = N_("Priority");
 char *s = N_("Recipients");
 char *s = N_("Sender");
+char *s = N_("Source");
 char *s = N_("Specific header");
 char *s = N_("Stop Processing");
 char *s = N_("Subject");