e-shell-user-creatable-items-handler.c, Changed into a GObject subclass

* e-shell-user-creatable-items-handler.c,
* e-shell-user-creatable-items-handler.c: Changed into a GObject
subclass instead of a GtkObject subclass.

* e-component-registry.c,
* e-component-registri.h: Changed into a GObject subclass instead
of a GtkObject subclass.

* evolution-shell-view.c (impl_ShellView_set_message): Remove
bogus GTK_OBJECT() cast in call to g_signal_emit().
(impl_ShellView_unset_message): Likewise.
(impl_ShellView_change_current_view): Likewise.
(impl_ShellView_set_title): Likewise.

svn path=/trunk/; revision=18769

6 files changed, 28 insertions, 14 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index cef7403ba9..cf7d56d37b 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,19 @@
 2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
 
+	* e-shell-user-creatable-items-handler.c,
+	* e-shell-user-creatable-items-handler.c: Changed into a GObject
+	subclass instead of a GtkObject subclass.
+
+	* e-component-registry.c,
+	* e-component-registri.h: Changed into a GObject subclass instead
+	of a GtkObject subclass.
+
+	* evolution-shell-view.c (impl_ShellView_set_message): Remove
+	bogus GTK_OBJECT() cast in call to g_signal_emit().
+	(impl_ShellView_unset_message): Likewise.
+	(impl_ShellView_change_current_view): Likewise.
+	(impl_ShellView_set_title): Likewise.
+
 	* e-shell-view.c (init): Ref/sink the GtkTooltips.
 
 	* e-uri-schema-registry.c (schema_handler_free): g_object_unref()
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 448103c880..244d2ba7df 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -39,8 +39,8 @@
 #include "evolution-shell-component-client.h"
 
 
-#define PARENT_TYPE GTK_TYPE_OBJECT
-static GtkObjectClass *parent_class = NULL;
+#define PARENT_TYPE G_TYPE_OBJECT
+static GObjectClass *parent_class = NULL;
 
 typedef struct _Component Component;
 
@@ -348,7 +348,7 @@ class_init (EComponentRegistryClass *klass)
 	object_class->dispose  = impl_dispose;
 	object_class->finalize = impl_finalize;
 
-	parent_class = gtk_type_class (gtk_object_get_type ());
+	parent_class = gtk_type_class (PARENT_TYPE);
 }
 
 
diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h
index 84e802bf3b..856a24f093 100644
--- a/shell/e-component-registry.h
+++ b/shell/e-component-registry.h
@@ -45,13 +45,13 @@ typedef struct _EComponentRegistryClass   EComponentRegistryClass;
 #include "evolution-shell-component-client.h"
 
 struct _EComponentRegistry {
-	GtkObject parent;
+	GObject parent;
 
 	EComponentRegistryPrivate *priv;
 };
 
 struct _EComponentRegistryClass {
-	GtkObjectClass parent_class;
+	GObjectClass parent_class;
 };
 
 
diff --git a/shell/e-shell-user-creatable-items-handler.c b/shell/e-shell-user-creatable-items-handler.c
index e7007b3103..5487e185a1 100644
--- a/shell/e-shell-user-creatable-items-handler.c
+++ b/shell/e-shell-user-creatable-items-handler.c
@@ -47,8 +47,8 @@
 #include <string.h>
 
 
-#define PARENT_TYPE gtk_object_get_type ()
-static GtkObjectClass *parent_class = NULL;
+#define PARENT_TYPE G_TYPE_OBJECT
+static GObjectClass *parent_class = NULL;
 
 
 #define VERB_PREFIX "ShellUserCreatableItemVerb"
diff --git a/shell/e-shell-user-creatable-items-handler.h b/shell/e-shell-user-creatable-items-handler.h
index 77a3b6b608..228603573a 100644
--- a/shell/e-shell-user-creatable-items-handler.h
+++ b/shell/e-shell-user-creatable-items-handler.h
@@ -25,7 +25,7 @@
 
 #include "evolution-shell-component-client.h"
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <bonobo/bonobo-ui-component.h>
 
 #ifdef __cplusplus
@@ -47,13 +47,13 @@ typedef struct _EShellUserCreatableItemsHandlerClass   EShellUserCreatableItemsH
 #include "e-shell-view.h"
 
 struct _EShellUserCreatableItemsHandler {
-	GtkObject parent;
+	GObject parent;
 
 	EShellUserCreatableItemsHandlerPrivate *priv;
 };
 
 struct _EShellUserCreatableItemsHandlerClass {
-	GtkObjectClass parent_class;
+	GObjectClass parent_class;
 };
 
 
diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c
index fc77785dd3..b7cdb40bc3 100644
--- a/shell/evolution-shell-view.c
+++ b/shell/evolution-shell-view.c
@@ -82,7 +82,7 @@ impl_ShellView_change_current_view (PortableServer_Servant servant,
 	BonoboObject *bonobo_object;
 
 	bonobo_object = bonobo_object_from_servant (servant);
-	g_signal_emit (GTK_OBJECT (bonobo_object), signals[CHANGE_VIEW], 0, uri);
+	g_signal_emit (bonobo_object, signals[CHANGE_VIEW], 0, uri);
 }
 
 static void
@@ -93,7 +93,7 @@ impl_ShellView_set_title (PortableServer_Servant servant,
 	BonoboObject *bonobo_object;
 
 	bonobo_object = bonobo_object_from_servant (servant);
-	g_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_TITLE], 0, title);
+	g_signal_emit (bonobo_object, signals[SET_TITLE], 0, title);
 }
 
 static void
@@ -104,7 +104,7 @@ impl_ShellView_set_folder_bar_label (PortableServer_Servant servant,
 	BonoboObject *bonobo_object;
 
 	bonobo_object = bonobo_object_from_servant (servant);
-	g_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_FOLDER_BAR_LABEL], 0, text);
+	g_signal_emit (bonobo_object, signals[SET_FOLDER_BAR_LABEL], 0, text);
 }
 
 static void
@@ -114,7 +114,7 @@ impl_ShellView_show_settings (PortableServer_Servant servant,
 	BonoboObject *bonobo_object;
 
 	bonobo_object = bonobo_object_from_servant (servant);
-	g_signal_emit (GTK_OBJECT (bonobo_object), signals[SHOW_SETTINGS], 0);
+	g_signal_emit (bonobo_object, signals[SHOW_SETTINGS], 0);
 }