Hiroyuki Ikezoe
ikezo****@users*****
Thu Nov 30 19:58:08 JST 2006
Index: kazehakase/src/kz-xml.c
diff -u kazehakase/src/kz-xml.c:1.25 kazehakase/src/kz-xml.c:1.26
--- kazehakase/src/kz-xml.c:1.25 Mon May 9 10:20:12 2005
+++ kazehakase/src/kz-xml.c Thu Nov 30 19:58:07 2006
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: kz-xml.c,v 1.25 2005/05/09 01:20:12 ikezoe Exp $
+ * $Id: kz-xml.c,v 1.26 2006/11/30 10:58:07 ikezoe Exp $
*/
#include "kz-xml.h"
@@ -25,7 +25,6 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-#include "gobject-utils.h"
typedef struct _KzXMLPrivate KzXMLPrivate;
struct _KzXMLPrivate
@@ -34,26 +33,18 @@
};
#define KZ_XML_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_XML, KzXMLPrivate))
-static void kz_xml_class_init (KzXMLClass *klass);
-static void kz_xml_init (KzXML *xml);
static void kz_xml_dispose (GObject *object);
static void kz_xml_attr_free (KzXMLAttr *attr);
-static GObjectClass *parent_class = NULL;
-
-
-KZ_OBJECT_GET_TYPE(kz_xml, "KzXML", KzXML,
- kz_xml_class_init, kz_xml_init,
- G_TYPE_OBJECT)
+G_DEFINE_TYPE(KzXML, kz_xml, G_TYPE_OBJECT)
static void
kz_xml_class_init (KzXMLClass *klass)
{
GObjectClass *object_class;
- parent_class = g_type_class_peek_parent (klass);
object_class = (GObjectClass *) klass;
object_class->dispose = kz_xml_dispose;
@@ -92,8 +83,8 @@
kz_xml_node_unref(xml->root);
xml->root = NULL;
- if (G_OBJECT_CLASS (parent_class)->dispose)
- G_OBJECT_CLASS (parent_class)->dispose(object);
+ if (G_OBJECT_CLASS (kz_xml_parent_class)->dispose)
+ G_OBJECT_CLASS (kz_xml_parent_class)->dispose(object);
}
Index: kazehakase/src/kz-tab-label.c
diff -u kazehakase/src/kz-tab-label.c:1.76 kazehakase/src/kz-tab-label.c:1.77
--- kazehakase/src/kz-tab-label.c:1.76 Fri Sep 23 21:16:08 2005
+++ kazehakase/src/kz-tab-label.c Thu Nov 30 19:58:08 2006
@@ -58,8 +58,6 @@
#define DEFAULT_AUTO_REFRESH_INTERVAL_SEC 300
/* object class */
-static void kz_tab_label_class_init (KzTabLabelClass *klass);
-static void kz_tab_label_init (KzTabLabel *kztab);
static GObject *kz_tab_label_constructor (GType type,
guint n_props,
GObjectConstructParam *props);
@@ -126,8 +124,6 @@
static void make_progress_circle (GtkWidget *widget);
-static GtkHBoxClass *parent_class = NULL;
-
enum {
TARGET_KAZEHAKASE_TAB,
TARGET_NETSCAPE_URL,
@@ -148,9 +144,7 @@
static GdkColor red = { 0, 0xffff, 0x0000, 0x0000 };
-KZ_OBJECT_GET_TYPE(kz_tab_label, "KzTabLabel", KzTabLabel,
- kz_tab_label_class_init, kz_tab_label_init,
- GTK_TYPE_HBOX)
+G_DEFINE_TYPE(KzTabLabel, kz_tab_label, GTK_TYPE_HBOX)
static void
kz_tab_label_class_init (KzTabLabelClass *klass)
@@ -158,8 +152,6 @@
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
- parent_class = g_type_class_peek_parent (klass);
-
gobject_class = (GObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;
@@ -322,7 +314,7 @@
{
KzTabLabel *kztab;
GObject *object;
- GObjectClass *klass = G_OBJECT_CLASS(parent_class);
+ GObjectClass *klass = G_OBJECT_CLASS(kz_tab_label_parent_class);
gchar *title;
object = klass->constructor(type, n_props, props);
@@ -431,8 +423,8 @@
kztab->mask = NULL;
}
- if (G_OBJECT_CLASS (parent_class)->dispose)
- G_OBJECT_CLASS (parent_class)->dispose(object);
+ if (G_OBJECT_CLASS (kz_tab_label_parent_class)->dispose)
+ G_OBJECT_CLASS (kz_tab_label_parent_class)->dispose(object);
}
@@ -606,8 +598,8 @@
{
KzTabLabel *kztab = KZ_TAB_LABEL(widget);
- if (GTK_WIDGET_CLASS (parent_class)->realize)
- GTK_WIDGET_CLASS (parent_class)->realize(widget);
+ if (GTK_WIDGET_CLASS (kz_tab_label_parent_class)->realize)
+ GTK_WIDGET_CLASS (kz_tab_label_parent_class)->realize(widget);
widget->window = gtk_widget_get_parent_window (widget);
g_object_ref (widget->window);
@@ -621,8 +613,8 @@
static void
kz_tab_label_unrealize (GtkWidget *widget)
{
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- return GTK_WIDGET_CLASS (parent_class)->unrealize(widget);
+ if (GTK_WIDGET_CLASS (kz_tab_label_parent_class)->unrealize)
+ return GTK_WIDGET_CLASS (kz_tab_label_parent_class)->unrealize(widget);
}
#endif
static gboolean
@@ -654,8 +646,8 @@
KZ_EMBED_RELOAD_BYPASS_PROXY_AND_CACHE :
KZ_EMBED_RELOAD_NORMAL);
}
- if (GTK_WIDGET_CLASS(parent_class)->button_press_event)
- GTK_WIDGET_CLASS(parent_class)->button_press_event(widget, event);
+ if (GTK_WIDGET_CLASS(kz_tab_label_parent_class)->button_press_event)
+ GTK_WIDGET_CLASS(kz_tab_label_parent_class)->button_press_event(widget, event);
return FALSE;
}
@@ -671,8 +663,8 @@
priv->moved = TRUE;
}
- if (GTK_WIDGET_CLASS(parent_class)->motion_notify_event)
- return GTK_WIDGET_CLASS(parent_class)->motion_notify_event(widget, event);
+ if (GTK_WIDGET_CLASS(kz_tab_label_parent_class)->motion_notify_event)
+ return GTK_WIDGET_CLASS(kz_tab_label_parent_class)->motion_notify_event(widget, event);
return FALSE;
}
@@ -699,8 +691,8 @@
priv->start_y = 0;
priv->moved = FALSE;
- if (GTK_WIDGET_CLASS(parent_class)->button_release_event)
- return GTK_WIDGET_CLASS(parent_class)->button_release_event(widget, event);
+ if (GTK_WIDGET_CLASS(kz_tab_label_parent_class)->button_release_event)
+ return GTK_WIDGET_CLASS(kz_tab_label_parent_class)->button_release_event(widget, event);
return FALSE;
}
@@ -732,8 +724,8 @@
break;
}
- if (GTK_WIDGET_CLASS(parent_class)->scroll_event)
- return GTK_WIDGET_CLASS(parent_class)->scroll_event(widget, event)
+ if (GTK_WIDGET_CLASS(kz_tab_label_parent_class)->scroll_event)
+ return GTK_WIDGET_CLASS(kz_tab_label_parent_class)->scroll_event(widget, event)
|| retval;
return retval;
}
Index: kazehakase/src/kz-thumbnails-view.c
diff -u kazehakase/src/kz-thumbnails-view.c:1.24 kazehakase/src/kz-thumbnails-view.c:1.25
--- kazehakase/src/kz-thumbnails-view.c:1.24 Mon Sep 25 13:19:40 2006
+++ kazehakase/src/kz-thumbnails-view.c Thu Nov 30 19:58:08 2006
@@ -44,8 +44,6 @@
#define KZ_THUMBNAIL_BOOKMARK_KEY "KzThumbnail::Bookmark"
-static void kz_thumbnails_view_class_init (KzThumbnailsViewClass *klass);
-static void kz_thumbnails_view_init (KzThumbnailsView *view);
static void kz_thumbnails_view_dispose (GObject *object);
static void kz_thumbnails_view_size_allocate (GtkWidget *widget,
@@ -71,13 +69,9 @@
static gboolean cb_thumbnail_leave_notify (GtkWidget *widget,
GdkEventCrossing *event);
-static GtkTableClass *parent_class = NULL;
-
static gint kz_thumbnails_view_signals[LAST_SIGNAL] = {0};
-KZ_OBJECT_GET_TYPE(kz_thumbnails_view, "KzThumbnailsView", KzThumbnailsView,
- kz_thumbnails_view_class_init, kz_thumbnails_view_init,
- GTK_TYPE_TABLE)
+G_DEFINE_TYPE(KzThumbnailsView, kz_thumbnails_view, GTK_TYPE_TABLE)
static void
kz_thumbnails_view_class_init (KzThumbnailsViewClass *klass)
@@ -85,8 +79,6 @@
GObjectClass *object_class;
GtkWidgetClass *widget_class;
- parent_class = g_type_class_peek_parent (klass);
-
object_class = (GObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;
@@ -134,8 +126,8 @@
view->folder = NULL;
}
- if (G_OBJECT_CLASS(parent_class)->dispose)
- G_OBJECT_CLASS (parent_class)->dispose(object);
+ if (G_OBJECT_CLASS(kz_thumbnails_view_parent_class)->dispose)
+ G_OBJECT_CLASS (kz_thumbnails_view_parent_class)->dispose(object);
}
@@ -153,7 +145,7 @@
old_allocation = widget->allocation;
old_width = old_allocation.width;
- GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
+ GTK_WIDGET_CLASS(kz_thumbnails_view_parent_class)->size_allocate (widget, allocation);
if (priv->mode == KZ_THUMBNAILS_VIEW_PLANE &&
old_width != allocation->width)