Hiroyuki Ikezoe
ikezo****@users*****
Sat Dec 2 15:37:45 JST 2006
Index: kazehakase/src/kz-navi.c
diff -u kazehakase/src/kz-navi.c:1.4 kazehakase/src/kz-navi.c:1.5
--- kazehakase/src/kz-navi.c:1.4 Thu Sep 7 23:16:25 2006
+++ kazehakase/src/kz-navi.c Sat Dec 2 15:37:45 2006
@@ -3,34 +3,27 @@
#include <string.h>
#include <glib/gi18n.h>
-#include "gobject-utils.h"
#include "kz-navi.h"
#include "kazehakase.h"
#include "bookmarks/kz-bookmark.h"
#include "bookmarks/kz-bookmark-file.h"
-static void kz_navi_class_init (KzNaviClass *klass);
-static void kz_navi_init (KzNavi *navi);
-static void kz_navi_dispose (GObject *object);
+static void dispose (GObject *object);
static void cb_navi_load_completed (KzBookmark *bookmark, gpointer data);
static void cb_navi_load_error (KzBookmark *bookmark, gpointer data);
-static GObjectClass *parent_class = NULL;
-
-KZ_OBJECT_GET_TYPE(kz_navi, "KzNavi", KzNavi,
- kz_navi_class_init, kz_navi_init,
- G_TYPE_OBJECT)
+G_DEFINE_TYPE(KzNavi, kz_navi, G_TYPE_OBJECT)
static void
kz_navi_class_init (KzNaviClass *klass)
{
GObjectClass *object_class;
- parent_class = g_type_class_peek_parent(klass);
+ kz_navi_parent_class = g_type_class_peek_parent(klass);
object_class = (GObjectClass *)klass;
- object_class->dispose = kz_navi_dispose;
+ object_class->dispose = dispose;
}
static void
@@ -61,7 +54,7 @@
}
static void
-kz_navi_dispose (GObject *object)
+dispose (GObject *object)
{
KzNavi *navi = KZ_NAVI(object);
@@ -75,8 +68,8 @@
navi->title = NULL;
navi->type = NULL;
- if (G_OBJECT_CLASS (parent_class)->dispose)
- (*G_OBJECT_CLASS (parent_class)->dispose) (object);
+ if (G_OBJECT_CLASS (kz_navi_parent_class)->dispose)
+ (*G_OBJECT_CLASS (kz_navi_parent_class)->dispose) (object);
}
static void
Index: kazehakase/src/kz-popup-preview.c
diff -u kazehakase/src/kz-popup-preview.c:1.13 kazehakase/src/kz-popup-preview.c:1.14
--- kazehakase/src/kz-popup-preview.c:1.13 Wed Jul 20 15:00:55 2005
+++ kazehakase/src/kz-popup-preview.c Sat Dec 2 15:37:45 2006
@@ -66,9 +66,7 @@
#define DEFAULT_POPUP_RESPONSE_DELAY 100
#define DEFAULT_POPUP_CLOSE_DELAY 100
-static void kz_popup_preview_class_init (KzPopupPreviewClass *klass);
-static void kz_popup_preview_init (KzPopupPreview *popup);
-static void kz_popup_preview_dispose (GObject *object);
+static void dispose (GObject *object);
static gboolean cb_enter_notify_event (GtkWidget *widget,
GdkEventCrossing *event,
@@ -107,22 +105,18 @@
int max_height,
GdkInterpType interp_type);
-static GObjectClass *parent_class = NULL;
static KzPopupPreview *kz_popup_preview_single = NULL;
-KZ_OBJECT_GET_TYPE(kz_popup_preview, "KzPopupPreview", KzPopupPreview,
- kz_popup_preview_class_init, kz_popup_preview_init,
- G_TYPE_OBJECT)
+G_DEFINE_TYPE(KzPopupPreview, kz_popup_preview, G_TYPE_OBJECT)
static void
kz_popup_preview_class_init (KzPopupPreviewClass *klass)
{
GObjectClass *object_class;
- parent_class = g_type_class_peek_parent (klass);
object_class = (GObjectClass *) klass;
- object_class->dispose = kz_popup_preview_dispose;
+ object_class->dispose = dispose;
g_type_class_add_private (klass, sizeof(KzPopupPreviewPriv));
}
@@ -153,7 +147,7 @@
}
static void
-kz_popup_preview_dispose (GObject *object)
+dispose (GObject *object)
{
KzPopupPreview *popup = KZ_POPUP_PREVIEW (object);
KzPopupPreviewPriv *priv = KZ_POPUP_PREVIEW_GET_PRIVATE (popup);
@@ -182,8 +176,8 @@
priv->popup_window = NULL;
}
- if (G_OBJECT_CLASS (parent_class)->dispose)
- G_OBJECT_CLASS (parent_class)->dispose(object);
+ if (G_OBJECT_CLASS (kz_popup_preview_parent_class)->dispose)
+ G_OBJECT_CLASS (kz_popup_preview_parent_class)->dispose(object);
}
KzPopupPreview *
Index: kazehakase/src/kz-popup-tablist.c
diff -u kazehakase/src/kz-popup-tablist.c:1.9 kazehakase/src/kz-popup-tablist.c:1.10
--- kazehakase/src/kz-popup-tablist.c:1.9 Sun Feb 13 22:20:33 2005
+++ kazehakase/src/kz-popup-tablist.c Sat Dec 2 15:37:45 2006
@@ -59,43 +59,37 @@
LAST_SIGNAL
};
-static void kz_popup_tablist_class_init (KzPopupTablistClass *klass);
-static void kz_popup_tablist_init (KzPopupTablist *popup);
-static void kz_popup_tablist_dispose (GObject *object);
-
-static void kz_popup_tablist_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void kz_popup_tablist_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+static void dispose (GObject *object);
+
+static void set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static void cb_thumbnail_activate (KzThumbnailsView *view,
KzBookmark *bookmark,
gint index,
KzPopupTablist *popup);
-static GtkWindowClass *parent_class = NULL;
-
static gint kz_popup_tablist_signals[LAST_SIGNAL] = {0};
-KZ_OBJECT_GET_TYPE(kz_popup_tablist, "KzPopupTablist", KzPopupTablist,
- kz_popup_tablist_class_init, kz_popup_tablist_init,
- GTK_TYPE_WINDOW)
+G_DEFINE_TYPE(KzPopupTablist, kz_popup_tablist, GTK_TYPE_WINDOW)
static void
kz_popup_tablist_class_init (KzPopupTablistClass *klass)
{
GObjectClass *object_class;
- parent_class = g_type_class_peek_parent (klass);
+ kz_popup_tablist_parent_class = g_type_class_peek_parent (klass);
object_class = (GObjectClass *) klass;
- object_class->dispose = kz_popup_tablist_dispose;
- object_class->set_property = kz_popup_tablist_set_property;
- object_class->get_property = kz_popup_tablist_get_property;
+ object_class->dispose = dispose;
+ object_class->set_property = set_property;
+ object_class->get_property = get_property;
g_object_class_install_property
(object_class,
@@ -141,7 +135,7 @@
}
static void
-kz_popup_tablist_dispose (GObject *object)
+dispose (GObject *object)
{
KzPopupTablist *popup = KZ_POPUP_TABLIST (object);
KzPopupTablistPriv *priv = KZ_POPUP_TABLIST_GET_PRIVATE (popup);
@@ -152,16 +146,16 @@
priv->kz = NULL;
}
- if (G_OBJECT_CLASS (parent_class)->dispose)
- G_OBJECT_CLASS (parent_class)->dispose(object);
+ if (G_OBJECT_CLASS (kz_popup_tablist_parent_class)->dispose)
+ G_OBJECT_CLASS (kz_popup_tablist_parent_class)->dispose(object);
}
static void
-kz_popup_tablist_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
KzPopupTablistPriv *priv = KZ_POPUP_TABLIST_GET_PRIVATE(object);
@@ -178,10 +172,10 @@
static void
-kz_popup_tablist_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
KzPopupTablistPriv *priv = KZ_POPUP_TABLIST_GET_PRIVATE(object);
Index: kazehakase/src/kz-prefs-win.c
diff -u kazehakase/src/kz-prefs-win.c:1.31 kazehakase/src/kz-prefs-win.c:1.32
--- kazehakase/src/kz-prefs-win.c:1.31 Wed Aug 10 02:19:45 2005
+++ kazehakase/src/kz-prefs-win.c Sat Dec 2 15:37:45 2006
@@ -67,13 +67,11 @@
} KzPrefsWinPagePriv;
-static void kz_prefs_win_class_init (KzPrefsWinClass *klass);
-static void kz_prefs_win_init (KzPrefsWin *win);
-static void kz_prefs_win_dispose (GObject *object);
-static void kz_prefs_win_response (GtkDialog *dialog,
- gint arg);
-static gboolean kz_prefs_win_delete_event (GtkWidget *widget,
- GdkEventAny *event);
+static void dispose (GObject *object);
+static void response (GtkDialog *dialog,
+ gint arg);
+static gboolean delete_event (GtkWidget *widget,
+ GdkEventAny *event);
static GtkWidget *kz_prefs_win_create_nav_tree (KzPrefsWin *win);
static void kz_prefs_win_reset_nav_tree (KzPrefsWin *win);
@@ -95,7 +93,6 @@
static KzPrefsWin *kz_prefs_win_single = NULL;
-static GtkDialogClass *parent_class = NULL;
static GList *prefs_page_entries = NULL;
@@ -108,10 +105,7 @@
entry); \
}
-
-KZ_OBJECT_GET_TYPE(kz_prefs_win, "KzPrefsWin", KzPrefsWin,
- kz_prefs_win_class_init, kz_prefs_win_init,
- GTK_TYPE_DIALOG)
+G_DEFINE_TYPE(KzPrefsWin, kz_prefs_win, GTK_TYPE_DIALOG)
static void
kz_prefs_win_class_init (KzPrefsWinClass *klass)
@@ -120,16 +114,15 @@
GtkDialogClass *dialog_class;
GtkWidgetClass *widget_class;
- parent_class = g_type_class_peek_parent(klass);
object_class = (GObjectClass *) klass;
dialog_class = (GtkDialogClass *) klass;
widget_class = (GtkWidgetClass *) klass;
- object_class->dispose = kz_prefs_win_dispose;
+ object_class->dispose = dispose;
- dialog_class->response = kz_prefs_win_response;
+ dialog_class->response = response;
- widget_class->delete_event = kz_prefs_win_delete_event;
+ widget_class->delete_event = delete_event;
ADD_PAGE_ENTRY(prefs_general_get_entry);
ADD_PAGE_ENTRY(prefs_lang_get_entry);
@@ -216,7 +209,7 @@
}
static void
-kz_prefs_win_dispose (GObject *object)
+dispose (GObject *object)
{
KzPrefsWin *win = KZ_PREFS_WIN(object);
KzPrefsWinPrivate *priv = KZ_PREFS_WIN_GET_PRIVATE (object);
@@ -235,13 +228,13 @@
if (kz_prefs_win_single && kz_prefs_win_single == win)
kz_prefs_win_single = NULL;
- if (G_OBJECT_CLASS(parent_class)->dispose)
- G_OBJECT_CLASS(parent_class)->dispose(object);
+ if (G_OBJECT_CLASS(kz_prefs_win_parent_class)->dispose)
+ G_OBJECT_CLASS(kz_prefs_win_parent_class)->dispose(object);
}
static void
-kz_prefs_win_response (GtkDialog *dialog, gint arg)
+response (GtkDialog *dialog, gint arg)
{
KzPrefsWinPrivate *priv = KZ_PREFS_WIN_GET_PRIVATE (dialog);
GList *node = priv->page_list;
@@ -275,7 +268,7 @@
}
static gboolean
-kz_prefs_win_delete_event (GtkWidget *widget, GdkEventAny *event)
+delete_event (GtkWidget *widget, GdkEventAny *event)
{
kz_prefs_win_store_state(KZ_PREFS_WIN(widget));
Index: kazehakase/src/kz-profile.c
diff -u kazehakase/src/kz-profile.c:1.22 kazehakase/src/kz-profile.c:1.23
--- kazehakase/src/kz-profile.c:1.22 Mon May 22 08:48:54 2006
+++ kazehakase/src/kz-profile.c Sat Dec 2 15:37:45 2006
@@ -55,31 +55,20 @@
LAST_SIGNAL
};
-
-static void kz_profile_class_init (KzProfileClass *klass);
-static void kz_profile_init (KzProfile *profile);
-static void kz_profile_dispose (GObject *object);
-
-
-static GObjectClass *parent_class = NULL;
+static void dispose (GObject *object);
static gint kz_profile_signals[LAST_SIGNAL] = {0};
-
-KZ_OBJECT_GET_TYPE(kz_profile, "KzProfile", KzProfile,
- kz_profile_class_init, kz_profile_init,
- G_TYPE_OBJECT)
-
+G_DEFINE_TYPE(KzProfile, kz_profile, G_TYPE_OBJECT)
static void
kz_profile_class_init (KzProfileClass *klass)
{
GObjectClass *object_class;
- parent_class = g_type_class_peek_parent (klass);
object_class = (GObjectClass *) klass;
- object_class->dispose = kz_profile_dispose;
+ object_class->dispose = dispose;
klass->section_added = NULL;
klass->section_deleted = NULL;
@@ -153,7 +142,7 @@
static void
-kz_profile_dispose (GObject *object)
+dispose (GObject *object)
{
KzProfile *profile = KZ_PROFILE(object);
KzProfileList *p, *q;
@@ -190,8 +179,8 @@
}
profile->sublist = NULL;
- if (G_OBJECT_CLASS (parent_class)->dispose)
- G_OBJECT_CLASS (parent_class)->dispose(object);
+ if (G_OBJECT_CLASS (kz_profile_parent_class)->dispose)
+ G_OBJECT_CLASS (kz_profile_parent_class)->dispose(object);
}
Index: kazehakase/src/kz-proxy-item.c
diff -u kazehakase/src/kz-proxy-item.c:1.8 kazehakase/src/kz-proxy-item.c:1.9
--- kazehakase/src/kz-proxy-item.c:1.8 Mon Nov 22 10:08:41 2004
+++ kazehakase/src/kz-proxy-item.c Sat Dec 2 15:37:45 2006
@@ -36,38 +36,31 @@
PROP_NO_PROXIES_ON,
};
-static void kz_proxy_item_class_init (KzProxyItemClass *klass);
-static void kz_proxy_item_init (KzProxyItem *proxy_item);
-static void kz_proxy_item_dispose (GObject *object);
-static void kz_proxy_item_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void kz_proxy_item_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+static void dispose (GObject *object);
+static void set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static gchar *no_proxies_on_default = "127.0.0.1, localhost";
static guint proxy_port_default = 0;
-static GObjectClass *parent_class = NULL;
-
-KZ_OBJECT_GET_TYPE(kz_proxy_item, "KzProxyItem", KzProxyItem,
- kz_proxy_item_class_init, kz_proxy_item_init,
- G_TYPE_OBJECT)
+G_DEFINE_TYPE(KzProxyItem, kz_proxy_item, G_TYPE_OBJECT)
static void
kz_proxy_item_class_init (KzProxyItemClass *klass)
{
GObjectClass *gobject_class;
- parent_class = g_type_class_peek_parent (klass);
gobject_class = (GObjectClass *) klass;
- gobject_class->dispose = kz_proxy_item_dispose;
+ gobject_class->dispose = dispose;
- gobject_class->set_property = kz_proxy_item_set_property;
- gobject_class->get_property = kz_proxy_item_get_property;
+ gobject_class->set_property = set_property;
+ gobject_class->get_property = get_property;
g_object_class_install_property(
gobject_class,
@@ -178,7 +171,7 @@
}
static void
-kz_proxy_item_dispose (GObject *object)
+dispose (GObject *object)
{
KzProxyItem *item = KZ_PROXY_ITEM(object);
@@ -189,8 +182,8 @@
if (item->no_proxies_on != no_proxies_on_default)
g_free(item->no_proxies_on);
- if (G_OBJECT_CLASS (parent_class)->dispose)
- G_OBJECT_CLASS (parent_class)->dispose(object);
+ if (G_OBJECT_CLASS (kz_proxy_item_parent_class)->dispose)
+ G_OBJECT_CLASS (kz_proxy_item_parent_class)->dispose(object);
}
@@ -203,10 +196,10 @@
}
static void
-kz_proxy_item_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
KzProxyItem *item = KZ_PROXY_ITEM(object);
@@ -246,10 +239,10 @@
}
static void
-kz_proxy_item_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
KzProxyItem *item = KZ_PROXY_ITEM(object);