Revert ettore's broken patch.

2003-03-19  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-config-druid.c (mail_config_druid_new): Revert ettore's
	broken patch.

	* mail-search-dialogue.c: Removed - nothing uses this.

svn path=/trunk/; revision=20373

4 files changed, 1 insertions, 248 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8bb538889f..876f404239 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -3,8 +3,7 @@
 	* mail-config-druid.c (mail_config_druid_new): Revert ettore's
 	broken patch.
 
-	* mail-search-dialogue.c (mail_search_dialogue_construct): Make
-	the default size a little smaller.
+	* mail-search-dialogue.c: Removed - nothing uses this.
 
 2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
 
diff --git a/mail/Makefile.am b/mail/Makefile.am
index afdbf9a1d6..65d8c8bcc6 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -121,8 +121,6 @@ libevolution_mail_la_SOURCES =		\
 	mail-ops.h			\
 	mail-search.c			\
 	mail-search.h			\
-	mail-search-dialogue.c		\
-	mail-search-dialogue.h		\
 	mail-send-recv.c		\
 	mail-send-recv.h		\
 	mail-session.c			\
diff --git a/mail/mail-search-dialogue.c b/mail/mail-search-dialogue.c
deleted file mode 100644
index 86662793a7..0000000000
--- a/mail/mail-search-dialogue.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000, 2003 Ximian, Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- * 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 <glib.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkbox.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "mail-search-dialogue.h"
-
-static void mail_search_dialogue_class_init	(MailSearchDialogueClass *class);
-static void mail_search_dialogue_init	(MailSearchDialogue *gspaper);
-static void mail_search_dialogue_finalise	(GObject *obj);
-
-static GtkDialogClass *parent_class;
-
-GType
-mail_search_dialogue_get_type (void)
-{
-	static GType type = 0;
-	
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (MailSearchDialogueClass),
-			NULL, /* base_class_init */
-			NULL, /* base_class_finalize */
-			(GClassInitFunc) mail_search_dialogue_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof (MailSearchDialogue),
-			0,
-			(GInstanceInitFunc) mail_search_dialogue_init,
-		};
-		
-		type = g_type_register_static (gtk_dialog_get_type (), "MailSearchDialogue", &info, 0);
-	}
-	
-	return type;
-}
-
-static void
-mail_search_dialogue_class_init (MailSearchDialogueClass *class)
-{
-	GObjectClass *object_class;
-	
-	object_class = (GObjectClass *)class;
-	parent_class = g_type_class_ref(gtk_dialog_get_type ());
-
-	object_class->finalize = mail_search_dialogue_finalise;
-	/* override methods */
-
-}
-
-static void
-mail_search_dialogue_construct (MailSearchDialogue *o, FilterRule *rule)
-{
-	FilterPart *part;
-	GtkDialog *dialogue = GTK_DIALOG (o);
-	
-	gtk_window_set_default_size ((GtkWindow *) dialogue, 400, 350);
-	gtk_window_set_resizable ((GtkWindow *) dialogue, TRUE);
-	
-	o->context = rule_context_new ();
-	rule_context_add_part_set (o->context, "partset", filter_part_get_type (),
-				   rule_context_add_part, rule_context_next_part);
-	rule_context_load (o->context, EVOLUTION_PRIVDATADIR "/vfoldertypes.xml", "");
-	if (rule) {
-		o->rule = rule;
-		o->guts = filter_rule_get_widget (o->rule, o->context);
-	} else {
-		o->rule = filter_rule_new ();
-		part = rule_context_next_part (o->context, NULL);
-		if (part == NULL) {
-			g_warning ("Problem loading search: no parts to load");
-			o->guts = gtk_entry_new ();
-		} else {
-			filter_rule_add_part (o->rule, filter_part_clone (part));
-			o->guts = filter_rule_get_widget (o->rule, o->context);
-		}
-	}
-	
-	gtk_widget_show (o->guts);
-	gtk_box_pack_start (GTK_BOX (dialogue->vbox), o->guts, TRUE, TRUE, 0);
-}
-
-static void
-mail_search_dialogue_init (MailSearchDialogue *o)
-{
-	GtkDialog *dialogue = GTK_DIALOG (o);
-	
-	gtk_dialog_add_buttons (dialogue,
-				GTK_STOCK_OK,
-				GTK_RESPONSE_OK,
-				_("_Search"),
-				GTK_RESPONSE_APPLY,
-				GTK_STOCK_CANCEL,
-				GTK_RESPONSE_CANCEL,
-				NULL);
-	gtk_dialog_set_default_response (dialogue, GTK_RESPONSE_OK);
-}
-
-
-static void
-mail_search_dialogue_finalise (GObject *obj)
-{
-	MailSearchDialogue *o = (MailSearchDialogue *)obj;
-	
-	if (o->context)
-		g_object_unref(o->context);
-	if (o->rule)
-		g_object_unref(o->rule);
-	
-        ((GObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * mail_search_dialogue_new:
- *
- * Create a new MailSearchDialogue object.
- * 
- * Return value: A new #MailSearchDialogue object.
- **/
-MailSearchDialogue *
-mail_search_dialogue_new ()
-{
-	MailSearchDialogue *o = (MailSearchDialogue *)g_object_new(mail_search_dialogue_get_type(), NULL);
-	mail_search_dialogue_construct (o, NULL);
-	return o;
-}
-
-MailSearchDialogue *
-mail_search_dialogue_new_with_rule (FilterRule *rule)
-{
-	MailSearchDialogue *o = (MailSearchDialogue *)g_object_new (mail_search_dialogue_get_type (), NULL);
-	if (rule)
-		g_object_ref (rule);
-	mail_search_dialogue_construct (o, rule);
-	return o;
-}
-
-/**
- * mail_search_dialogue_get_query:
- * @msd: 
- * 
- * Get the query string represting the current search criterea.
- * 
- * Return value: 
- **/
-char *
-mail_search_dialogue_get_query (MailSearchDialogue *msd)
-{
-	GString *out = g_string_new ("");
-	char *ret;
-	
-	filter_rule_build_code (msd->rule, out);
-	ret = out->str;
-	g_string_free (out, FALSE);
-	return ret;
-}
diff --git a/mail/mail-search-dialogue.h b/mail/mail-search-dialogue.h
deleted file mode 100644
index 0bb0e7cb80..0000000000
--- a/mail/mail-search-dialogue.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- * 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_SEARCH_DIALOGUE_H
-#define _MAIL_SEARCH_DIALOGUE_H
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkdialog.h>
-
-#include "filter/rule-context.h"
-#include "filter/filter-rule.h"
-
-#define MAIL_SEARCH_DIALOGUE(obj)	G_TYPE_CHECK_INSTANCE_CAST (obj, mail_search_dialogue_get_type (), MailSearchDialogue)
-#define MAIL_SEARCH_DIALOGUE_CLASS(klass)	G_TYPE_CHECK_CLASS_CAST (klass, mail_search_dialogue_get_type (), MailSearchDialogueClass)
-#define IS_MAIL_SEARCH_DIALOGUE(obj)      G_TYPE_CHECK_INSTANCE_TYPE (obj, mail_search_dialogue_get_type ())
-
-typedef struct _MailSearchDialogue	MailSearchDialogue;
-typedef struct _MailSearchDialogueClass	MailSearchDialogueClass;
-
-struct _MailSearchDialogue {
-	GtkDialog parent;
-
-	RuleContext *context;
-	FilterRule *rule;
-	GtkWidget *guts;
-};
-
-struct _MailSearchDialogueClass {
-	GtkDialogClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-GType mail_search_dialogue_get_type (void);
-MailSearchDialogue *mail_search_dialogue_new (void);
-MailSearchDialogue *mail_search_dialogue_new_with_rule (FilterRule *rule);
-
-/* methods */
-char *mail_search_dialogue_get_query (MailSearchDialogue *msd);
-
-#endif /* ! _MAIL_SEARCH_DIALOGUE_H */
-