** Fixes bug #534360

2008-05-22  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #534360

	Migrate from deprecated GtkObject symbols to GObject equivalents.
	Touches over 150 files in all components; too many to list.


svn path=/trunk/; revision=35526

16 files changed, 47 insertions, 26 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index e6c7f09b83..361675de7c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,24 @@
+2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #534360
+
+	* em-account-prefs.h:
+	* em-filter-editor.c:
+	* em-filter-editor.h:
+	* em-folder-selector.h:
+	* em-format-html-display.c:
+	* em-mailer-prefs.c:
+	* em-mailer-prefs.h:
+	* em-utils.c:
+	* em-vfolder-editor.c:
+	* em-vfolder-editor.h:
+	* em-vfolder-rule.c:
+	* mail-vfolder.c:
+	* meessage-tag-editor.h:
+	* message-list.h:
+	* message-tag-followup.h:
+	Migrate from deprecated GtkObject symbols to GObject equivalents.
+
 2008-05-19  Matthew Barnes  <mbarnes@redhat.com>
 
 	* message-list.c (regen_list_done):
diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h
index 57d71fcfb9..c74d96b470 100644
--- a/mail/em-account-prefs.h
+++ b/mail/em-account-prefs.h
@@ -80,7 +80,7 @@ struct _EMAccountPrefsClass {
 };
 
 
-GtkType em_account_prefs_get_type (void);
+GType em_account_prefs_get_type (void);
 
 GtkWidget *em_account_prefs_new (GNOME_Evolution_Shell shell);
 
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c
index aff4bda747..599d5674e1 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -45,10 +45,10 @@ static void em_filter_editor_finalise (GObject *obj);
 static RuleEditorClass *parent_class = NULL;
 
 
-GtkType
+GType
 em_filter_editor_get_type (void)
 {
-	static GtkType type = 0;
+	static GType type = 0;
 
 	if (!type) {
 		static const GTypeInfo info = {
diff --git a/mail/em-filter-editor.h b/mail/em-filter-editor.h
index b778ce9f38..599372a308 100644
--- a/mail/em-filter-editor.h
+++ b/mail/em-filter-editor.h
@@ -30,7 +30,7 @@
 #define EM_FILTER_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), em_filter_editor_get_type(), EMFilterEditorClass))
 #define EM_IS_FILTER_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), em_filter_editor_get_type()))
 #define EM_IS_FILTER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), em_filter_editor_get_type()))
-#define EM_FILTER_EDITOR_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), em_filter_editor_get_type(), EMFilterEditorClass))
+#define EM_FILTER_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), em_filter_editor_get_type(), EMFilterEditorClass))
 
 typedef struct _EMFilterEditor EMFilterEditor;
 typedef struct _EMFilterEditorClass EMFilterEditorClass;
@@ -50,7 +50,7 @@ struct _EMFilterEditorClass {
 	RuleEditorClass parent_class;
 };
 
-GtkType em_filter_editor_get_type (void);
+GType em_filter_editor_get_type (void);
 
 EMFilterEditor *em_filter_editor_new (EMFilterContext *f, const EMFilterSource *source_names);
 void em_filter_editor_construct (EMFilterEditor *fe, EMFilterContext *fc, GladeXML *gui, const EMFilterSource *source_names);
diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h
index 7df2743c7c..7685a02c08 100644
--- a/mail/em-folder-selector.h
+++ b/mail/em-folder-selector.h
@@ -31,10 +31,10 @@ extern "C" {
 #endif /* cplusplus */
 
 #define EM_TYPE_FOLDER_SELECTOR			(em_folder_selector_get_type ())
-#define EM_FOLDER_SELECTOR(obj)			(GTK_CHECK_CAST ((obj), EM_TYPE_FOLDER_SELECTOR, EMFolderSelector))
-#define EM_FOLDER_SELECTOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), EM_TYPE_FOLDER_SELECTOR, EMFolderSelectorClass))
-#define EM_IS_FOLDER_SELECTOR(obj)		(GTK_CHECK_TYPE ((obj), EM_TYPE_FOLDER_SELECTOR))
-#define EM_IS_FOLDER_SELECTOR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), EM_TYPE_FOLDER_SELECTOR))
+#define EM_FOLDER_SELECTOR(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EM_TYPE_FOLDER_SELECTOR, EMFolderSelector))
+#define EM_FOLDER_SELECTOR_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EM_TYPE_FOLDER_SELECTOR, EMFolderSelectorClass))
+#define EM_IS_FOLDER_SELECTOR(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EM_TYPE_FOLDER_SELECTOR))
+#define EM_IS_FOLDER_SELECTOR_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), EM_TYPE_FOLDER_SELECTOR))
 
 typedef struct _EMFolderSelector        EMFolderSelector;
 typedef struct _EMFolderSelectorPrivate EMFolderSelectorPrivate;
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index d1bc065064..6738990a0d 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -611,7 +611,7 @@ clear_button_clicked_cb (GtkWidget *widget, gpointer dummy, EMFormatHTMLDisplay
 
 	gtk_entry_set_text (GTK_ENTRY (p->search_entry), "");
 
-	gtk_signal_emit_by_name (GTK_OBJECT (p->search_entry), "activate", efhd);
+	g_signal_emit_by_name (p->search_entry, "activate", efhd);
 }
 
 /* Controlls the visibility of icon_entry's visibility */
@@ -755,7 +755,7 @@ em_format_html_display_search_with (EMFormatHTMLDisplay *efhd, char *word)
 		gtk_widget_hide (p->search_entry_box);
 
 		/* Trigger the search */
-		gtk_signal_emit_by_name (GTK_OBJECT (p->search_entry), "activate", efhd);
+		g_signal_emit_by_name (p->search_entry, "activate", efhd);
 	}
 }
 
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index 6616cfcc48..df680c9fc1 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -111,7 +111,7 @@ static const struct {
 	{ N_("Once per month"), 30 },
 };
 
-GtkType
+GType
 em_mailer_prefs_get_type (void)
 {
 	static GType type = 0;
diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h
index 8f085142d3..e5c9a041df 100644
--- a/mail/em-mailer-prefs.h
+++ b/mail/em-mailer-prefs.h
@@ -146,7 +146,7 @@ struct _EMMailerPrefsClass {
 
 };
 
-GtkType em_mailer_prefs_get_type (void);
+GType em_mailer_prefs_get_type (void);
 GtkWidget * create_combo_text_widget (void);
 
 struct _GtkWidget *em_mailer_prefs_new (void);
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 7258581aa3..efbfee34ea 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -314,7 +314,7 @@ em_utils_edit_filters (GtkWidget *parent)
 		e_dialog_set_transient_for ((GtkWindow *) filter_editor, parent);
 
 	gtk_window_set_title (GTK_WINDOW (filter_editor), _("Message Filters"));
-	g_object_set_data_full ((GObject *) filter_editor, "context", fc, (GtkDestroyNotify) g_object_unref);
+	g_object_set_data_full ((GObject *) filter_editor, "context", fc, (GDestroyNotify) g_object_unref);
 	g_signal_connect (filter_editor, "response", G_CALLBACK (em_filter_editor_response), NULL);
 	gtk_widget_show (GTK_WIDGET (filter_editor));
 }
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index d077170824..9f5b4b0def 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -65,10 +65,10 @@ em_vfolder_editor_init (EMVFolderEditor *ve)
 	;
 }
 
-GtkType
+GType
 em_vfolder_editor_get_type (void)
 {
-	static GtkType type = 0;
+	static GType type = 0;
 
 	if (!type) {
 		static const GTypeInfo info = {
diff --git a/mail/em-vfolder-editor.h b/mail/em-vfolder-editor.h
index 65500ba374..84ee2e03e3 100644
--- a/mail/em-vfolder-editor.h
+++ b/mail/em-vfolder-editor.h
@@ -30,7 +30,7 @@
 #define EM_VFOLDER_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), em_vfolder_editor_get_type(), EMVFolderEditorClass))
 #define EM_IS_VFOLDER_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), em_vfolder_editor_get_type()))
 #define EM_IS_VFOLDER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), em_vfolder_editor_get_type()))
-#define EM_VFOLDER_EDITOR_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), em_vfolder_editor_get_type(), EMVFolderEditorClass))
+#define EM_VFOLDER_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), em_vfolder_editor_get_type(), EMVFolderEditorClass))
 
 typedef struct _EMVFolderEditor EMVFolderEditor;
 typedef struct _EMVFolderEditorClass EMVFolderEditorClass;
@@ -44,7 +44,7 @@ struct _EMVFolderEditorClass {
 	RuleEditorClass parent_class;
 };
 
-GtkType em_vfolder_editor_get_type (void);
+GType em_vfolder_editor_get_type (void);
 
 EMVFolderEditor *em_vfolder_editor_new (EMVFolderContext *vc);
 
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index d3b3ecc0e8..490ca9a778 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -383,7 +383,7 @@ static void source_remove(GtkWidget *widget, struct _source_data *data);
 
 static struct {
 	char *name;
-	GtkSignalFunc func;
+	GCallback func;
 } edit_buttons[] = {
 	{ "source_add",    G_CALLBACK(source_add)   },
 	{ "source_remove", G_CALLBACK(source_remove)},
@@ -673,7 +673,7 @@ get_widget(FilterRule *fr, RuleContext *rc)
 
 	rb = g_slist_nth_data(gtk_radio_button_get_group (rb), vr->with);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb), TRUE);
-	gtk_signal_emit_by_name (GTK_OBJECT (rb), "toggled");
+	g_signal_emit_by_name (rb, "toggled");
 
 	set_sensitive(data);
 
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 4e1662c595..0a57324c76 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -1070,8 +1070,8 @@ vfolder_edit_rule(const char *uri)
 		gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500);
 		gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
 		gtk_widget_show((GtkWidget *)gd);
-		g_object_set_data_full(G_OBJECT(gd), "rule", newrule, (GtkDestroyNotify)g_object_unref);
-		g_object_set_data_full(G_OBJECT(gd), "orig", rule, (GtkDestroyNotify)g_object_unref);
+		g_object_set_data_full(G_OBJECT(gd), "rule", newrule, (GDestroyNotify)g_object_unref);
+		g_object_set_data_full(G_OBJECT(gd), "orig", rule, (GDestroyNotify)g_object_unref);
 		g_signal_connect(gd, "response", G_CALLBACK(edit_rule_response), NULL);
 		gtk_widget_show((GtkWidget *)gd);
 	} else {
@@ -1160,7 +1160,7 @@ vfolder_gui_add_rule(EMVFolderRule *rule)
 	gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500);
 	gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
 	gtk_widget_show((GtkWidget *)gd);
-	g_object_set_data_full(G_OBJECT(gd), "rule", rule, (GtkDestroyNotify)g_object_unref);
+	g_object_set_data_full(G_OBJECT(gd), "rule", rule, (GDestroyNotify)g_object_unref);
 	g_signal_connect(gd, "response", G_CALLBACK(new_rule_clicked), NULL);
 	gtk_widget_show((GtkWidget *)gd);
 }
diff --git a/mail/message-list.h b/mail/message-list.h
index 806c0e2417..db45b36787 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -172,7 +172,7 @@ typedef enum {
 	MESSAGE_LIST_SELECT_WRAP = 1<<1, /* option bit */
 } MessageListSelectDirection;
 
-GtkType        message_list_get_type   (void);
+GType          message_list_get_type   (void);
 GtkWidget     *message_list_new        (void);
 void           message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder, const char *uri, gboolean outgoing);
 
diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h
index cc96b648a7..8ae3b1926b 100644
--- a/mail/message-tag-editor.h
+++ b/mail/message-tag-editor.h
@@ -60,7 +60,7 @@ struct _MessageTagEditorClass {
 };
 
 
-GtkType message_tag_editor_get_type (void);
+GType message_tag_editor_get_type (void);
 
 /* methods */
 CamelTag *message_tag_editor_get_tag_list (MessageTagEditor *editor);
diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h
index a31dbd5df0..ff0d35497f 100644
--- a/mail/message-tag-followup.h
+++ b/mail/message-tag-followup.h
@@ -63,7 +63,7 @@ struct _MessageTagFollowUpClass {
 };
 
 
-GtkType message_tag_followup_get_type (void);
+GType message_tag_followup_get_type (void);
 
 MessageTagEditor *message_tag_followup_new (void);