Hiroyuki Ikezoe
ikezo****@users*****
Sat Dec 2 21:40:08 JST 2006
Index: kazehakase/src/mozilla/kz-mozdownloader.cpp
diff -u kazehakase/src/mozilla/kz-mozdownloader.cpp:1.7 kazehakase/src/mozilla/kz-mozdownloader.cpp:1.8
--- kazehakase/src/mozilla/kz-mozdownloader.cpp:1.7 Tue May 10 12:42:21 2005
+++ kazehakase/src/mozilla/kz-mozdownloader.cpp Sat Dec 2 21:40:08 2006
@@ -22,7 +22,6 @@
#include <glib/gi18n.h>
#include "kazehakase.h"
-#include "gobject-utils.h"
#include "kz-mozprogresslistener.h"
typedef struct _KzMozDownloaderPrivate KzMozDownloaderPrivate;
@@ -32,19 +31,12 @@
};
#define KZ_MOZ_DOWNLOADER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_MOZ_DOWNLOADER, KzMozDownloaderPrivate))
-static void kz_moz_downloader_class_init (KzMozDownloaderClass *klass);
-static void kz_moz_downloader_init (KzMozDownloader *kzdl);
-static void kz_moz_downloader_dispose (GObject *object);
+static void dispose (GObject *object);
static gint kz_moz_downloader_get_percent (KzDownloader *downloader);
static void kz_moz_downloader_cancel (KzDownloader *downloader);
-static KzDownloaderClass *parent_class = NULL;
-
-KZ_OBJECT_GET_TYPE(kz_moz_downloader, "KzMozDownloader", KzMozDownloader,
- kz_moz_downloader_class_init, kz_moz_downloader_init,
- KZ_TYPE_DOWNLOADER)
-
+G_DEFINE_TYPE(KzMozDownloader, kz_moz_downloader, KZ_TYPE_DOWNLOADER)
static void
kz_moz_downloader_class_init (KzMozDownloaderClass *klass)
@@ -52,13 +44,11 @@
GObjectClass *object_class;
KzDownloaderClass *dl_class;
- parent_class = (KzDownloaderClass *) g_type_class_peek_parent (klass);
-
object_class = (GObjectClass *) klass;
dl_class = (KzDownloaderClass *) klass;
// GObject
- object_class->dispose = kz_moz_downloader_dispose;
+ object_class->dispose = dispose;
dl_class->kz_downloader_get_percent = kz_moz_downloader_get_percent;
dl_class->kz_downloader_cancel = kz_moz_downloader_cancel;
@@ -92,14 +82,14 @@
}
static void
-kz_moz_downloader_dispose (GObject *object)
+dispose (GObject *object)
{
KzMozDownloader *kzdl = KZ_MOZ_DOWNLOADER(object);
KzMozDownloaderPrivate *priv = KZ_MOZ_DOWNLOADER_GET_PRIVATE (kzdl);
priv->mProgress = NULL;
- if (G_OBJECT_CLASS (parent_class)->dispose)
- G_OBJECT_CLASS (parent_class)->dispose(object);
+ if (G_OBJECT_CLASS (kz_moz_downloader_parent_class)->dispose)
+ G_OBJECT_CLASS (kz_moz_downloader_parent_class)->dispose(object);
}
Index: kazehakase/src/mozilla/kz-mozprogresslistener.cpp
diff -u kazehakase/src/mozilla/kz-mozprogresslistener.cpp:1.24 kazehakase/src/mozilla/kz-mozprogresslistener.cpp:1.25
--- kazehakase/src/mozilla/kz-mozprogresslistener.cpp:1.24 Fri Jul 22 05:34:27 2005
+++ kazehakase/src/mozilla/kz-mozprogresslistener.cpp Sat Dec 2 21:40:08 2006
@@ -19,7 +19,6 @@
*/
#include "kz-mozprogresslistener.h"
-#include "gobject-utils.h"
#include "kz-downloader-group.h"
#include "kz-mozdownloader.h"
Index: kazehakase/src/mozilla/kz-mozthumbnailcreator.cpp
diff -u kazehakase/src/mozilla/kz-mozthumbnailcreator.cpp:1.17 kazehakase/src/mozilla/kz-mozthumbnailcreator.cpp:1.18
--- kazehakase/src/mozilla/kz-mozthumbnailcreator.cpp:1.17 Tue Sep 20 16:02:08 2005
+++ kazehakase/src/mozilla/kz-mozthumbnailcreator.cpp Sat Dec 2 21:40:08 2006
@@ -26,7 +26,6 @@
#include <glib/gi18n.h>
#include "kz-mozthumbnailprogress.h"
-#include "gobject-utils.h"
#include "mozilla.h"
#include "utils.h"
#include "egg-pixbuf-thumbnail.h"
@@ -69,8 +68,6 @@
};
#define KZ_MOZ_THUMBNAIL_CREATOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_MOZ_THUMBNAIL_CREATOR, KzMozThumbnailCreatorPrivate))
-static void kz_moz_thumbnail_creator_class_init (KzMozThumbnailCreatorClass *klass);
-static void kz_moz_thumbnail_creator_init (KzMozThumbnailCreator *creator);
static void kz_moz_thumbnail_creator_destroy (GtkObject *object);
static void kz_moz_thumbnail_creator_realize (GtkWidget *widget);
static void kz_moz_thumbnail_creator_unrealize (GtkWidget *widget);
@@ -80,12 +77,7 @@
static KzMozThumbnailCreator *creator_single = NULL;
-static GtkMozEmbedClass *parent_class = NULL;
-
-KZ_OBJECT_GET_TYPE(kz_moz_thumbnail_creator, "KzMozThumbnailCreator", KzMozThumbnailCreator,
- kz_moz_thumbnail_creator_class_init, kz_moz_thumbnail_creator_init,
- GTK_TYPE_MOZ_EMBED)
-
+G_DEFINE_TYPE(KzMozThumbnailCreator, kz_moz_thumbnail_creator, GTK_TYPE_MOZ_EMBED)
static void
kz_moz_thumbnail_creator_class_init (KzMozThumbnailCreatorClass *klass)
@@ -95,8 +87,6 @@
GtkWidgetClass *widget_class;
GtkMozEmbedClass *moz_embed_class;
- parent_class = (GtkMozEmbedClass *) g_type_class_peek_parent (klass);
-
gobject_class = (GObjectClass *) klass;
object_class = (GtkObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;
@@ -144,8 +134,8 @@
static void
kz_moz_thumbnail_creator_destroy (GtkObject *object)
{
- if (GTK_OBJECT_CLASS(parent_class)->destroy)
- GTK_OBJECT_CLASS(parent_class)->destroy(object);
+ if (GTK_OBJECT_CLASS(kz_moz_thumbnail_creator_parent_class)->destroy)
+ GTK_OBJECT_CLASS(kz_moz_thumbnail_creator_parent_class)->destroy(object);
}
@@ -153,8 +143,8 @@
kz_moz_thumbnail_creator_realize (GtkWidget *widget)
{
KzMozThumbnailCreator *creator = KZ_MOZ_THUMBNAIL_CREATOR(widget);
- if (GTK_WIDGET_CLASS(parent_class)->realize)
- GTK_WIDGET_CLASS(parent_class)->realize(widget);
+ if (GTK_WIDGET_CLASS(kz_moz_thumbnail_creator_parent_class)->realize)
+ GTK_WIDGET_CLASS(kz_moz_thumbnail_creator_parent_class)->realize(widget);
KzMozThumbnailCreatorPrivate *priv = KZ_MOZ_THUMBNAIL_CREATOR_GET_PRIVATE (creator);
gtk_moz_embed_get_nsIWebBrowser(GTK_MOZ_EMBED(widget),
@@ -172,8 +162,8 @@
{
KzMozThumbnailCreator *creator = KZ_MOZ_THUMBNAIL_CREATOR(widget);
- if (GTK_WIDGET_CLASS(parent_class)->unrealize)
- GTK_WIDGET_CLASS(parent_class)->unrealize(widget);
+ if (GTK_WIDGET_CLASS(kz_moz_thumbnail_creator_parent_class)->unrealize)
+ GTK_WIDGET_CLASS(kz_moz_thumbnail_creator_parent_class)->unrealize(widget);
}
@@ -270,8 +260,8 @@
g_return_if_fail(KZ_IS_MOZ_THUMBNAIL_CREATOR(creator));
- if (parent_class->net_stop)
- parent_class->net_stop(embed);
+ if (((GtkMozEmbedClass *)kz_moz_thumbnail_creator_parent_class)->net_stop)
+ ((GtkMozEmbedClass *)kz_moz_thumbnail_creator_parent_class)->net_stop(embed);
net_stop_proccess(creator);
}