Fixed to build with -DG_DISABLE_DEPRECATED and -DGTK_DISABLE_DEPRECATED

2003-01-02  Jeffrey Stedfast  <fejj@ximian.com>

	Fixed to build with -DG_DISABLE_DEPRECATED and
	-DGTK_DISABLE_DEPRECATED

svn path=/trunk/; revision=19202

10 files changed, 76 insertions, 46 deletions

diff --git a/filter/.cvsignore b/filter/.cvsignore
index aa8a0e063a..40ccce097c 100644
--- a/filter/.cvsignore
+++ b/filter/.cvsignore
@@ -5,6 +5,6 @@
 .pure
 Makefile
 Makefile.in
-filter-driver
-filter-editor
 libfilter-i18n.h
+filter-marshal.c
+filter-marshal.h
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 1ecb51b9f4..21a2a1efcb 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-02  Jeffrey Stedfast  <fejj@ximian.com>
+
+	Fixed to build with -DG_DISABLE_DEPRECATED and
+	-DGTK_DISABLE_DEPRECATED
+
 2002-12-12  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* rule-editor.c (cursor_changed): Use an easier method for getting
diff --git a/filter/Makefile.am b/filter/Makefile.am
index 0752a0bd18..cd13ed2a82 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -9,6 +9,8 @@ INCLUDES = 					\
 	-I $(top_srcdir)/shell			\
 	-DFILTER_GLADEDIR=\"$(gladedir)\"	\
 	-DG_LOG_DOMAIN=\"filter\"		\
+	-DG_DISABLE_DEPRECATED			\
+	-DGTK_DISABLE_DEPRECATED		\
 	$(LIBFILTER_CFLAGS)
 
 noinst_LTLIBRARIES =				\
@@ -39,6 +41,8 @@ libfilter_la_SOURCES =				\
 	filter-int.h				\
 	filter-label.c				\
 	filter-label.h				\
+	filter-marshal.c			\
+	filter-marshal.h			\
 	filter-option.c				\
 	filter-option.h				\
 	filter-part.c				\
@@ -67,7 +71,7 @@ libfilter_la_SOURCES =				\
 libfilter_la_DEPENDENCIES = libfilter-i18n.h
 
 EXTRA_DIST = filtertypes.xml vfoldertypes.xml \
-	$(glade_DATA) libfilter-i18n.h
+	$(glade_DATA) libfilter-i18n.h filter-marshal.list
 
 # basic rules.
 filterdir = $(datadir)/evolution
@@ -78,3 +82,16 @@ libfilter-i18n.h: filtertypes.xml vfoldertypes.xml
 	cat $(srcdir)/filtertypes.xml $(srcdir)/vfoldertypes.xml |	      \
 		sed -n -e 's:.*<title>\(.*\)</title>:char *s = N_("\1");:p' | \
 		sort -u >> $@
+
+filter-marshal.h: filter-marshal.list
+	( @GLIB_GENMARSHAL@ --prefix=filter_marshal filter-marshal.list --header > filter-marshal.tmp \
+	&& mv filter-marshal.tmp filter-marshal.h ) \
+	|| ( rm -f filter-marshal.tmp && exit 1 )
+
+filter-marshal.c: filter-marshal.h
+	( @GLIB_GENMARSHAL@ --prefix=filter_marshal filter-marshal.list --body > filter-marshal.tmp \
+	&& mv filter-marshal.tmp filter-marshal.c ) \
+	|| ( rm -f filter-marshal.tmp && exit 1 )
+
+MARSHAL_GENERATED = filter-marshal.c filter-marshal.h
+
diff --git a/filter/filter-editor.c b/filter/filter-editor.c
index ccd6637411..4a23d2f3d2 100644
--- a/filter/filter-editor.c
+++ b/filter/filter-editor.c
@@ -33,7 +33,7 @@
 
 #define d(x)
 
-static FilterRule * create_rule(RuleEditor *re);
+static FilterRule *create_rule (RuleEditor *re);
 
 static void filter_editor_class_init (FilterEditorClass *klass);
 static void filter_editor_init (FilterEditor *fe);
@@ -49,18 +49,19 @@ filter_editor_get_type (void)
 	static GtkType type = 0;
 	
 	if (!type) {
-		static const GtkTypeInfo info = {
-			"FilterEditor",
-			sizeof (FilterEditor),
+		static const GTypeInfo info = {
 			sizeof (FilterEditorClass),
-			(GtkClassInitFunc) filter_editor_class_init,
-			(GtkObjectInitFunc) filter_editor_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
+			NULL, /* base_class_init */
+			NULL, /* base_class_finalize */
+			(GClassInitFunc) filter_editor_class_init,
+			NULL, /* class_finalize */
+			NULL, /* class_data */
+			sizeof (FilterEditor),
+			0,    /* n_preallocs */
+			(GInstanceInitFunc) filter_editor_init,
 		};
 		
-		type = gtk_type_unique (RULE_TYPE_EDITOR, &info);
+		type = g_type_register_static (RULE_TYPE_EDITOR, "FilterEditor", &info, 0);
 	}
 	
 	return type;
diff --git a/filter/filter-marshal.list b/filter/filter-marshal.list
new file mode 100644
index 0000000000..9d6744db44
--- /dev/null
+++ b/filter/filter-marshal.list
@@ -0,0 +1,2 @@
+NONE:NONE
+NONE:POINTER
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 75017da19c..22ab424f3c 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -32,6 +32,7 @@
 
 #include "filter-rule.h"
 #include "filter-context.h"
+#include "filter-marshal.h"
 
 #define d(x)
 
@@ -112,7 +113,7 @@ filter_rule_class_init (FilterRuleClass *klass)
 			      G_STRUCT_OFFSET (FilterRuleClass, changed),
 			      NULL,
 			      NULL,
-			      gtk_marshal_NONE__NONE,
+			      filter_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 }
 
diff --git a/filter/rule-context.c b/filter/rule-context.c
index bed9045ddb..4cf8071f5a 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -38,6 +38,7 @@
 
 #include "rule-context.h"
 #include "filter-rule.h"
+#include "filter-marshal.h"
 
 #define d(x) 
 
@@ -117,7 +118,7 @@ rule_context_class_init (RuleContextClass *klass)
 			      G_STRUCT_OFFSET (RuleContextClass, rule_added),
 			      NULL,
 			      NULL,
-			      gtk_marshal_NONE__POINTER,
+			      filter_marshal_NONE__POINTER,
 			      G_TYPE_NONE, 1, G_TYPE_POINTER);
 	
 	signals[RULE_REMOVED] =
@@ -127,7 +128,7 @@ rule_context_class_init (RuleContextClass *klass)
 			      G_STRUCT_OFFSET (RuleContextClass, rule_removed),
 			      NULL,
 			      NULL,
-			      gtk_marshal_NONE__POINTER,
+			      filter_marshal_NONE__POINTER,
 			      G_TYPE_NONE, 1, G_TYPE_POINTER);
 	
 	signals[CHANGED] =
@@ -137,7 +138,7 @@ rule_context_class_init (RuleContextClass *klass)
 			      G_STRUCT_OFFSET (RuleContextClass, changed),
 			      NULL,
 			      NULL,
-			      gtk_marshal_NONE__NONE,
+			      filter_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 }
 
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index 13b77b72ec..cfb1b917f6 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -72,21 +72,22 @@ rule_editor_get_type (void)
 	static GtkType type = 0;
 	
 	if (!type) {
-		static const GtkTypeInfo info = {
-			"RuleEditor",
-			sizeof (RuleEditor),
+		static const GTypeInfo info = {
 			sizeof (RuleEditorClass),
-			(GtkClassInitFunc) rule_editor_class_init,
-			(GtkObjectInitFunc) rule_editor_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
+			NULL, /* base_class_init */
+			NULL, /* base_class_finalize */
+			(GClassInitFunc) rule_editor_class_init,
+			NULL, /* class_finalize */
+			NULL, /* class_data */
+			sizeof (RuleEditor),
+			0,    /* n_preallocs */
+			(GInstanceInitFunc) rule_editor_init,
 		};
 		
 		/* TODO: Remove when it works (or never will) */
 		enable_undo = getenv ("EVOLUTION_RULE_UNDO") != NULL;
 		
-		type = gtk_type_unique (gtk_dialog_get_type (), &info);
+		type = g_type_register_static (gtk_dialog_get_type (), "RuleEditor", &info, 0);
 	}
 	
 	return type;
diff --git a/filter/score-editor.c b/filter/score-editor.c
index f43c5a2c42..064272f321 100644
--- a/filter/score-editor.c
+++ b/filter/score-editor.c
@@ -49,18 +49,19 @@ score_editor_get_type (void)
 	static GtkType type = 0;
 	
 	if (!type) {
-		static const GtkTypeInfo info = {
-			"ScoreEditor",
-			sizeof (ScoreEditor),
+		static const GTypeInfo info = {
 			sizeof (ScoreEditorClass),
-			(GtkClassInitFunc) score_editor_class_init,
-			(GtkObjectInitFunc) score_editor_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
+			NULL, /* base_class_init */
+			NULL, /* base_class_finalize */
+			(GClassInitFunc) score_editor_class_init,
+			NULL, /* class_finalize */
+			NULL, /* class_data */
+			sizeof (ScoreEditor),
+			0,    /* n_preallocs */
+			(GInstanceInitFunc) score_editor_init,
 		};
 		
-		type = gtk_type_unique (RULE_TYPE_EDITOR, &info);
+		type = g_type_register_static (RULE_TYPE_EDITOR, "ScoreEditor", &info, 0);
 	}
 	
 	return type;
diff --git a/filter/vfolder-editor.c b/filter/vfolder-editor.c
index ea84300668..31c6f103f0 100644
--- a/filter/vfolder-editor.c
+++ b/filter/vfolder-editor.c
@@ -33,7 +33,7 @@
 
 #define d(x)
 
-static FilterRule * create_rule(RuleEditor *re);
+static FilterRule *create_rule (RuleEditor *re);
 
 static void vfolder_editor_class_init (VfolderEditorClass *klass);
 static void vfolder_editor_init (VfolderEditor *ve);
@@ -49,18 +49,19 @@ vfolder_editor_get_type (void)
 	static GtkType type = 0;
 	
 	if (!type) {
-		static const GtkTypeInfo info = {
-			"VfolderEditor",
-			sizeof (VfolderEditor),
+		static const GTypeInfo info = {
 			sizeof (VfolderEditorClass),
-			(GtkClassInitFunc) vfolder_editor_class_init,
-			(GtkObjectInitFunc) vfolder_editor_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
+			NULL, /* base_class_init */
+			NULL, /* base_class_finalize */
+			(GClassInitFunc) vfolder_editor_class_init,
+			NULL, /* class_finalize */
+			NULL, /* class_data */
+			sizeof (VfolderEditor),
+			0,    /* n_preallocs */
+			(GInstanceInitFunc) vfolder_editor_init,
 		};
 		
-		type = gtk_type_unique (RULE_TYPE_EDITOR, &info);
+		type = g_type_register_static (RULE_TYPE_EDITOR, "VfolderEditor", &info, 0);
 	}
 	
 	return type;
@@ -73,7 +74,7 @@ vfolder_editor_class_init (VfolderEditorClass *klass)
 	GtkObjectClass *object_class = (GtkObjectClass *) klass;
 	RuleEditorClass *re_class = (RuleEditorClass *) klass;
 	
-	parent_class = g_type_class_ref(rule_editor_get_type ());
+	parent_class = g_type_class_ref (rule_editor_get_type ());
 	
 	gobject_class->finalize = vfolder_editor_finalise;