aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2002-11-13 17:44:11 +0800
committerMichael Zucci <zucchi@src.gnome.org>2002-11-13 17:44:11 +0800
commit836029eadc5ee33f809e25fca030d172497c81fc (patch)
tree2650b31be4c3619087ddc785492ecf89364268b1 /shell
parentd9b4457fa6b9cf6cee8a2d59da3548492b7c1f6e (diff)
downloadgsoc2013-evolution-836029eadc5ee33f809e25fca030d172497c81fc.tar
gsoc2013-evolution-836029eadc5ee33f809e25fca030d172497c81fc.tar.gz
gsoc2013-evolution-836029eadc5ee33f809e25fca030d172497c81fc.tar.bz2
gsoc2013-evolution-836029eadc5ee33f809e25fca030d172497c81fc.tar.lz
gsoc2013-evolution-836029eadc5ee33f809e25fca030d172497c81fc.tar.xz
gsoc2013-evolution-836029eadc5ee33f809e25fca030d172497c81fc.tar.zst
gsoc2013-evolution-836029eadc5ee33f809e25fca030d172497c81fc.zip
remove GTK_OBJECT cast and other GTK stuff.
2002-11-13 Not Zed <NotZed@Ximian.com> * evolution-storage.c: remove GTK_OBJECT cast and other GTK stuff. * evolution-storage.h: this is a gobject not a gtkobject, fix cast macros, and get_type call. svn path=/trunk/; revision=18735
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/evolution-storage.c20
-rw-r--r--shell/evolution-storage.h12
3 files changed, 23 insertions, 16 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 75530ea2dd..37c4d83acb 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-13 Not Zed <NotZed@Ximian.com>
+
+ * evolution-storage.c: remove GTK_OBJECT cast and other GTK stuff.
+
+ * evolution-storage.h: this is a gobject not a gtkobject, fix cast
+ macros, and get_type call.
+
2002-11-11 Chris Toshok <toshok@ximian.com>
* e-task-widget.c (impl_finalize): need to assign priv here, fixes
diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
index 7bbe0e62b8..fc5bb05fcd 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -390,7 +390,7 @@ impl_Storage_asyncRemoveFolder (PortableServer_Servant servant,
storage = EVOLUTION_STORAGE (bonobo_object);
obj_dup = CORBA_Object_duplicate (listener, ev);
- g_signal_emit (GTK_OBJECT (storage), signals[REMOVE_FOLDER], 0,
+ g_signal_emit (storage, signals[REMOVE_FOLDER], 0,
obj_dup, path, physical_uri);
}
@@ -410,7 +410,7 @@ impl_Storage_asyncXferFolder (PortableServer_Servant servant,
storage = EVOLUTION_STORAGE (bonobo_object);
obj_dup = CORBA_Object_duplicate (listener, ev);
- g_signal_emit (GTK_OBJECT (storage), signals[XFER_FOLDER], 0,
+ g_signal_emit (storage, signals[XFER_FOLDER], 0,
obj_dup, source_path, destination_path, remove_source);
}
@@ -428,7 +428,7 @@ impl_Storage_updateFolder (PortableServer_Servant servant,
bonobo_object = bonobo_object_from_servant (servant);
storage = EVOLUTION_STORAGE (bonobo_object);
- g_signal_emit (GTK_OBJECT (storage), signals[UPDATE_FOLDER], 0,
+ g_signal_emit (storage, signals[UPDATE_FOLDER], 0,
path, unread_count);
priv = storage->priv;
@@ -461,7 +461,7 @@ impl_Storage_asyncOpenFolder (PortableServer_Servant servant,
bonobo_object = bonobo_object_from_servant (servant);
storage = EVOLUTION_STORAGE (bonobo_object);
- g_signal_emit (GTK_OBJECT (storage), signals[OPEN_FOLDER], 0,
+ g_signal_emit (storage, signals[OPEN_FOLDER], 0,
path);
}
@@ -480,7 +480,7 @@ impl_Storage_asyncDiscoverSharedFolder (PortableServer_Servant servant,
storage = EVOLUTION_STORAGE (bonobo_object);
obj_dup = CORBA_Object_duplicate (listener, ev);
- g_signal_emit (GTK_OBJECT (storage), signals[DISCOVER_SHARED_FOLDER], 0,
+ g_signal_emit (storage, signals[DISCOVER_SHARED_FOLDER], 0,
obj_dup, user, folder_name);
}
@@ -496,7 +496,7 @@ impl_Storage_cancelDiscoverSharedFolder (PortableServer_Servant servant,
bonobo_object = bonobo_object_from_servant (servant);
storage = EVOLUTION_STORAGE (bonobo_object);
- g_signal_emit (GTK_OBJECT (storage), signals[CANCEL_DISCOVER_SHARED_FOLDER], 0,
+ g_signal_emit (storage, signals[CANCEL_DISCOVER_SHARED_FOLDER], 0,
user, folder_name);
}
@@ -514,7 +514,7 @@ impl_Storage_asyncRemoveSharedFolder (PortableServer_Servant servant,
storage = EVOLUTION_STORAGE (bonobo_object);
obj_dup = CORBA_Object_duplicate (listener, ev);
- g_signal_emit (GTK_OBJECT (storage), signals[REMOVE_SHARED_FOLDER], 0,
+ g_signal_emit (storage, signals[REMOVE_SHARED_FOLDER], 0,
obj_dup, path);
}
@@ -558,7 +558,7 @@ impl_Storage_showFolderProperties (PortableServer_Servant servant,
EvolutionStorage *storage;
storage = EVOLUTION_STORAGE (bonobo_object_from_servant (servant));
- g_signal_emit (GTK_OBJECT (storage), signals[SHOW_FOLDER_PROPERTIES], 0,
+ g_signal_emit (storage, signals[SHOW_FOLDER_PROPERTIES], 0,
path, item_number, parent_window_id);
}
@@ -1128,7 +1128,7 @@ evolution_storage_update_folder (EvolutionStorage *evolution_storage,
priv = evolution_storage->priv;
- g_signal_emit (GTK_OBJECT (evolution_storage), signals[UPDATE_FOLDER], 0,
+ g_signal_emit (evolution_storage, signals[UPDATE_FOLDER], 0,
path, unread_count);
if (priv->corba_storage_listeners == NULL)
@@ -1335,4 +1335,4 @@ evolution_storage_add_property_item (EvolutionStorage *evolution_storage,
E_MAKE_X_TYPE (evolution_storage, "EvolutionStorage", EvolutionStorage,
class_init, init, PARENT_TYPE,
POA_GNOME_Evolution_Storage__init,
- GTK_STRUCT_OFFSET (EvolutionStorageClass, epv))
+ G_STRUCT_OFFSET (EvolutionStorageClass, epv))
diff --git a/shell/evolution-storage.h b/shell/evolution-storage.h
index 027b85b7ae..ce09544e32 100644
--- a/shell/evolution-storage.h
+++ b/shell/evolution-storage.h
@@ -26,9 +26,9 @@
#include "Evolution.h"
#include <glib.h>
+#include <glib-object.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtktypeutils.h>
#include <bonobo/bonobo-xobject.h>
@@ -38,10 +38,10 @@ extern "C" {
#endif /* __cplusplus */
#define EVOLUTION_TYPE_STORAGE (evolution_storage_get_type ())
-#define EVOLUTION_STORAGE(obj) (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_STORAGE, EvolutionStorage))
-#define EVOLUTION_STORAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_STORAGE, EvolutionStorageClass))
-#define EVOLUTION_IS_STORAGE(obj) (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_STORAGE))
-#define EVOLUTION_IS_STORAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_STORAGE))
+#define EVOLUTION_STORAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EVOLUTION_TYPE_STORAGE, EvolutionStorage))
+#define EVOLUTION_STORAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_STORAGE, EvolutionStorageClass))
+#define EVOLUTION_IS_STORAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EVOLUTION_TYPE_STORAGE))
+#define EVOLUTION_IS_STORAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_STORAGE))
typedef struct _EvolutionStorage EvolutionStorage;
@@ -132,7 +132,7 @@ struct _EvolutionStorageClass {
};
-GtkType evolution_storage_get_type (void);
+GType evolution_storage_get_type (void);
void evolution_storage_construct (EvolutionStorage *storage,
const char *name,
gboolean has_shared_folders);