** 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

10 files changed, 57 insertions, 42 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 4f9092fe45..e3844c5e28 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,18 @@
+2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #534360
+
+	* e-component-view.h:
+	* e-corba-config-page.h:
+	* e-history.h:
+	* e-shell-folder-title-bar.h:
+	* e-shell-settings-dialog.h:
+	* e-shell-view.h:
+	* e-shell.h:
+	* e-user-creatable-items-handler.h:
+	* evolution-config-control.h:
+	Migrate from deprecated GtkObject symbols to GObject equivalents.
+
 2008-05-08  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #525241 (EPluginUI)
diff --git a/shell/e-component-view.h b/shell/e-component-view.h
index d0c8d56a09..9503a1a671 100644
--- a/shell/e-component-view.h
+++ b/shell/e-component-view.h
@@ -40,10 +40,10 @@ typedef struct _EComponentViewClass   EComponentViewClass;
 #include "Evolution.h"
 
 #define E_TYPE_COMPONENT_VIEW			(e_component_view_get_type ())
-#define E_COMPONENT_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_COMPONENT_VIEW, EComponentView))
-#define E_COMPONENT_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_COMPONENT_VIEW, EComponentViewClass))
-#define E_IS_COMPONENT_VIEW(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_COMPONENT_VIEW))
-#define E_IS_COMPONENT_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_COMPONENT_VIEW))
+#define E_COMPONENT_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_COMPONENT_VIEW, EComponentView))
+#define E_COMPONENT_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_COMPONENT_VIEW, EComponentViewClass))
+#define E_IS_COMPONENT_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_COMPONENT_VIEW))
+#define E_IS_COMPONENT_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_COMPONENT_VIEW))
 
 struct _EComponentView {
 	BonoboObject parent;
diff --git a/shell/e-corba-config-page.h b/shell/e-corba-config-page.h
index 60da07d4e6..581f7a499c 100644
--- a/shell/e-corba-config-page.h
+++ b/shell/e-corba-config-page.h
@@ -35,10 +35,10 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define E_TYPE_CORBA_CONFIG_PAGE			(e_corba_config_page_get_type ())
-#define E_CORBA_CONFIG_PAGE(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_CORBA_CONFIG_PAGE, ECorbaConfigPage))
-#define E_CORBA_CONFIG_PAGE_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CORBA_CONFIG_PAGE, ECorbaConfigPageClass))
-#define E_IS_CORBA_CONFIG_PAGE(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_CORBA_CONFIG_PAGE))
-#define E_IS_CORBA_CONFIG_PAGE_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_CORBA_CONFIG_PAGE))
+#define E_CORBA_CONFIG_PAGE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CORBA_CONFIG_PAGE, ECorbaConfigPage))
+#define E_CORBA_CONFIG_PAGE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CORBA_CONFIG_PAGE, ECorbaConfigPageClass))
+#define E_IS_CORBA_CONFIG_PAGE(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CORBA_CONFIG_PAGE))
+#define E_IS_CORBA_CONFIG_PAGE_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CORBA_CONFIG_PAGE))
 
 
 typedef struct _ECorbaConfigPage        ECorbaConfigPage;
@@ -56,7 +56,7 @@ struct _ECorbaConfigPageClass {
 };
 
 
-GtkType    e_corba_config_page_get_type         (void);
+GType      e_corba_config_page_get_type         (void);
 GtkWidget *e_corba_config_page_new_from_objref  (GNOME_Evolution_ConfigControl  objref);
 gboolean   e_corba_config_page_construct        (ECorbaConfigPage              *corba_config_page,
 						 GNOME_Evolution_ConfigControl  objref);
diff --git a/shell/e-history.h b/shell/e-history.h
index 8b9be09e82..89bfe674a9 100644
--- a/shell/e-history.h
+++ b/shell/e-history.h
@@ -31,10 +31,10 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define E_TYPE_HISTORY			(e_history_get_type ())
-#define E_HISTORY(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_HISTORY, EHistory))
-#define E_HISTORY_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_HISTORY, EHistoryClass))
-#define E_IS_HISTORY(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_HISTORY))
-#define E_IS_HISTORY_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_HISTORY))
+#define E_HISTORY(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_HISTORY, EHistory))
+#define E_HISTORY_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_HISTORY, EHistoryClass))
+#define E_IS_HISTORY(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_HISTORY))
+#define E_IS_HISTORY_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_HISTORY))
 
 
 typedef struct _EHistory        EHistory;
@@ -55,7 +55,7 @@ struct _EHistoryClass {
 typedef void (* EHistoryItemFreeFunc) (void *data);
 
 
-GtkType    e_history_get_type (void);
+GType      e_history_get_type (void);
 
 void      e_history_construct  (EHistory             *history,
 				EHistoryItemFreeFunc  item_free_function);
diff --git a/shell/e-shell-folder-title-bar.h b/shell/e-shell-folder-title-bar.h
index a459bbfd2d..54d2a92b05 100644
--- a/shell/e-shell-folder-title-bar.h
+++ b/shell/e-shell-folder-title-bar.h
@@ -32,10 +32,10 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define E_TYPE_SHELL_FOLDER_TITLE_BAR			(e_shell_folder_title_bar_get_type ())
-#define E_SHELL_FOLDER_TITLE_BAR(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR, EShellFolderTitleBar))
-#define E_SHELL_FOLDER_TITLE_BAR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_FOLDER_TITLE_BAR, EShellFolderTitleBarClass))
-#define E_IS_SHELL_FOLDER_TITLE_BAR(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR))
-#define E_IS_SHELL_FOLDER_TITLE_BAR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR))
+#define E_SHELL_FOLDER_TITLE_BAR(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR, EShellFolderTitleBar))
+#define E_SHELL_FOLDER_TITLE_BAR_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_FOLDER_TITLE_BAR, EShellFolderTitleBarClass))
+#define E_IS_SHELL_FOLDER_TITLE_BAR(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR))
+#define E_IS_SHELL_FOLDER_TITLE_BAR_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR))
 
 
 typedef struct _EShellFolderTitleBar        EShellFolderTitleBar;
@@ -58,7 +58,7 @@ struct _EShellFolderTitleBarClass {
 };
 
 
-GtkType    e_shell_folder_title_bar_get_type          (void);
+GType      e_shell_folder_title_bar_get_type          (void);
 void       e_shell_folder_title_bar_construct         (EShellFolderTitleBar *folder_title_bar);
 GtkWidget *e_shell_folder_title_bar_new               (void);
 
diff --git a/shell/e-shell-settings-dialog.h b/shell/e-shell-settings-dialog.h
index bc64ef508a..8aed6cb4c8 100644
--- a/shell/e-shell-settings-dialog.h
+++ b/shell/e-shell-settings-dialog.h
@@ -32,10 +32,10 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define E_TYPE_SHELL_SETTINGS_DIALOG			(e_shell_settings_dialog_get_type ())
-#define E_SHELL_SETTINGS_DIALOG(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SHELL_SETTINGS_DIALOG, EShellSettingsDialog))
-#define E_SHELL_SETTINGS_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_SETTINGS_DIALOG, EShellSettingsDialogClass))
-#define E_IS_SHELL_SETTINGS_DIALOG(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SHELL_SETTINGS_DIALOG))
-#define E_IS_SHELL_SETTINGS_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_SETTINGS_DIALOG))
+#define E_SHELL_SETTINGS_DIALOG(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SHELL_SETTINGS_DIALOG, EShellSettingsDialog))
+#define E_SHELL_SETTINGS_DIALOG_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_SETTINGS_DIALOG, EShellSettingsDialogClass))
+#define E_IS_SHELL_SETTINGS_DIALOG(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SHELL_SETTINGS_DIALOG))
+#define E_IS_SHELL_SETTINGS_DIALOG_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_SETTINGS_DIALOG))
 
 
 typedef struct _EShellSettingsDialog        EShellSettingsDialog;
@@ -53,7 +53,7 @@ struct _EShellSettingsDialogClass {
 };
 
 
-GtkType    e_shell_settings_dialog_get_type  (void);
+GType      e_shell_settings_dialog_get_type  (void);
 GtkWidget *e_shell_settings_dialog_new       (void);
 void       e_shell_settings_dialog_show_type (EShellSettingsDialog *dialog,
 					      const char           *type);
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index 5740853d4f..97db781aea 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -40,10 +40,10 @@ typedef struct _EShellViewClass   EShellViewClass;
 #include "Evolution.h"
 
 #define E_TYPE_SHELL_VIEW			(e_shell_view_get_type ())
-#define E_SHELL_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SHELL_VIEW, EShellView))
-#define E_SHELL_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_VIEW, EShellViewClass))
-#define E_IS_SHELL_VIEW(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SHELL_VIEW))
-#define E_IS_SHELL_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_VIEW))
+#define E_SHELL_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SHELL_VIEW, EShellView))
+#define E_SHELL_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_VIEW, EShellViewClass))
+#define E_IS_SHELL_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SHELL_VIEW))
+#define E_IS_SHELL_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_VIEW))
 
 struct _EShellView {
 	BonoboObject parent;
diff --git a/shell/e-shell.h b/shell/e-shell.h
index a255edd573..0b9ce51052 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -42,10 +42,10 @@ typedef struct _EShellClass   EShellClass;
 
 
 #define E_TYPE_SHELL			(e_shell_get_type ())
-#define E_SHELL(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SHELL, EShell))
-#define E_SHELL_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL, EShellClass))
-#define E_IS_SHELL(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SHELL))
-#define E_IS_SHELL_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL))
+#define E_SHELL(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SHELL, EShell))
+#define E_SHELL_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL, EShellClass))
+#define E_IS_SHELL(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SHELL))
+#define E_IS_SHELL_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL))
 
 
 enum _EShellLineStatus {
@@ -93,7 +93,7 @@ enum _EShellConstructResult {
 typedef enum _EShellConstructResult EShellConstructResult;
 
 
-GtkType                e_shell_get_type   (void);
+GType                  e_shell_get_type   (void);
 EShellConstructResult  e_shell_construct  (EShell                *shell,
 					   const char            *iid,
 					   EShellStartupLineMode  startup_line_mode);
diff --git a/shell/e-user-creatable-items-handler.h b/shell/e-user-creatable-items-handler.h
index 7339d08aa6..688fe7a2f1 100644
--- a/shell/e-user-creatable-items-handler.h
+++ b/shell/e-user-creatable-items-handler.h
@@ -33,10 +33,10 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define E_TYPE_USER_CREATABLE_ITEMS_HANDLER		(e_user_creatable_items_handler_get_type ())
-#define E_USER_CREATABLE_ITEMS_HANDLER(obj)		(GTK_CHECK_CAST ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER, EUserCreatableItemsHandler))
-#define E_USER_CREATABLE_ITEMS_HANDLER_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_USER_CREATABLE_ITEMS_HANDLER, EUserCreatableItemsHandlerClass))
-#define E_IS_USER_CREATABLE_ITEMS_HANDLER(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER))
-#define E_IS_USER_CREATABLE_ITEMS_HANDLER_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER))
+#define E_USER_CREATABLE_ITEMS_HANDLER(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER, EUserCreatableItemsHandler))
+#define E_USER_CREATABLE_ITEMS_HANDLER_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_USER_CREATABLE_ITEMS_HANDLER, EUserCreatableItemsHandlerClass))
+#define E_IS_USER_CREATABLE_ITEMS_HANDLER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER))
+#define E_IS_USER_CREATABLE_ITEMS_HANDLER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER))
 
 
 typedef struct _EUserCreatableItemsHandler        EUserCreatableItemsHandler;
diff --git a/shell/evolution-config-control.h b/shell/evolution-config-control.h
index bcaa050fea..b751ae831c 100644
--- a/shell/evolution-config-control.h
+++ b/shell/evolution-config-control.h
@@ -34,10 +34,10 @@ extern "C" {
 #endif /* cplusplus */
 
 #define EVOLUTION_TYPE_CONFIG_CONTROL            (evolution_config_control_get_type ())
-#define EVOLUTION_CONFIG_CONTROL(obj)            (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_CONFIG_CONTROL, EvolutionConfigControl))
-#define EVOLUTION_CONFIG_CONTROL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_CONFIG_CONTROL, EvolutionConfigControlClass))
-#define EVOLUTION_IS_CONFIG_CONTROL(obj)         (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_CONFIG_CONTROL))
-#define EVOLUTION_IS_CONFIG_CONTROL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_CONFIG_CONTROL))
+#define EVOLUTION_CONFIG_CONTROL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EVOLUTION_TYPE_CONFIG_CONTROL, EvolutionConfigControl))
+#define EVOLUTION_CONFIG_CONTROL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_CONFIG_CONTROL, EvolutionConfigControlClass))
+#define EVOLUTION_IS_CONFIG_CONTROL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EVOLUTION_TYPE_CONFIG_CONTROL))
+#define EVOLUTION_IS_CONFIG_CONTROL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_CONFIG_CONTROL))
 
 typedef struct _EvolutionConfigControl        EvolutionConfigControl;
 typedef struct _EvolutionConfigControlPrivate EvolutionConfigControlPrivate;
@@ -56,7 +56,7 @@ struct _EvolutionConfigControlClass {
 };
 
 
-GtkType                 evolution_config_control_get_type   (void);
+GType                   evolution_config_control_get_type   (void);
 EvolutionConfigControl *evolution_config_control_new        (GtkWidget              *widget);
 void                    evolution_config_control_construct  (EvolutionConfigControl *control,
 							     GtkWidget              *widget);