Hiroyuki Ikezoe
ikezo****@users*****
Sat Dec 2 15:23:06 JST 2006
Index: kazehakase/src/kz-statusbar.c
diff -u kazehakase/src/kz-statusbar.c:1.4 kazehakase/src/kz-statusbar.c:1.5
--- kazehakase/src/kz-statusbar.c:1.4 Fri Dec 1 12:57:06 2006
+++ kazehakase/src/kz-statusbar.c Sat Dec 2 15:23:06 2006
@@ -60,19 +60,19 @@
#define STATUS_GESTURE "INTERNAL_GESTURE"
#define STATUS_SEARCH "INTERNAL_SEARCH"
-static GObject *kz_statusbar_constructor (GType type,
- guint n_props,
- GObjectConstructParam *props);
-
-static void kz_statusbar_dispose (GObject *object);
-static void kz_statusbar_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void kz_statusbar_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+static GObject *constructor (GType type,
+ guint n_props,
+ GObjectConstructParam *props);
+
+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_find_keyword (GtkWidget *widget,
KzStatusbar *bar);
@@ -96,10 +96,10 @@
widget_class = (GtkWidgetClass *)klass;
/* GtkObject signals */
- gobject_class->constructor = kz_statusbar_constructor;
- gobject_class->dispose = kz_statusbar_dispose;
- gobject_class->set_property = kz_statusbar_set_property;
- gobject_class->get_property = kz_statusbar_get_property;
+ gobject_class->constructor = constructor;
+ gobject_class->dispose = dispose;
+ gobject_class->set_property = set_property;
+ gobject_class->get_property = get_property;
g_object_class_install_property
(gobject_class,
@@ -207,9 +207,9 @@
static GObject*
-kz_statusbar_constructor (GType type,
- guint n_props,
- GObjectConstructParam *props)
+constructor (GType type,
+ guint n_props,
+ GObjectConstructParam *props)
{
KzStatusbar *bar;
GObject *object;
@@ -236,8 +236,8 @@
static void
-kz_statusbar_set_property (GObject *object, guint prop_id,
- const GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+ const GValue *value, GParamSpec *pspec)
{
KzStatusbar *bar = KZ_STATUSBAR(object);
@@ -253,8 +253,8 @@
}
static void
-kz_statusbar_get_property (GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+ GValue *value, GParamSpec *pspec)
{
KzStatusbar *bar = KZ_STATUSBAR(object);
@@ -283,7 +283,7 @@
}
static void
-kz_statusbar_dispose (GObject *object)
+dispose (GObject *object)
{
KzStatusbar *bar = KZ_STATUSBAR(object);
KzStatusbarPrivate *priv = KZ_STATUSBAR_GET_PRIVATE (bar);
Index: kazehakase/src/kz-tab-label.c
diff -u kazehakase/src/kz-tab-label.c:1.77 kazehakase/src/kz-tab-label.c:1.78
--- kazehakase/src/kz-tab-label.c:1.77 Thu Nov 30 19:58:08 2006
+++ kazehakase/src/kz-tab-label.c Sat Dec 2 15:23:06 2006
@@ -58,47 +58,46 @@
#define DEFAULT_AUTO_REFRESH_INTERVAL_SEC 300
/* object class */
-static GObject *kz_tab_label_constructor (GType type,
- guint n_props,
- GObjectConstructParam *props);
-static void kz_tab_label_dispose (GObject *object);
-static void kz_tab_label_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void kz_tab_label_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-
+static GObject *constructor (GType type,
+ guint n_props,
+ GObjectConstructParam *props);
+
+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);
/* widget class */
-static void kz_tab_label_realize (GtkWidget *widget);
-#if 0
-static void kz_tab_label_unrealize (GtkWidget *widget);
-#endif
-static gboolean kz_tab_label_button_press (GtkWidget *widget,
- GdkEventButton *event);
-static gboolean kz_tab_label_motion_notify (GtkWidget *widget,
- GdkEventMotion *event);
-static gboolean kz_tab_label_button_release (GtkWidget *widget,
- GdkEventButton *event);
-static gboolean kz_tab_label_scroll_event (GtkWidget *widget,
- GdkEventScroll *event);
-static gboolean kz_tab_label_drag_motion (GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x, gint y,
- guint time);
-static void kz_tab_label_drag_data_get (GtkWidget *widget,
- GdkDragContext *context,
- GtkSelectionData *seldata,
- guint info,
- guint time);
-static void kz_tab_label_drag_data_received (GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x, gint y,
- GtkSelectionData *data,
- guint info,
- guint time);
+static void realize (GtkWidget *widget);
+static gboolean button_press (GtkWidget *widget,
+ GdkEventButton *event);
+static gboolean motion_notify (GtkWidget *widget,
+ GdkEventMotion *event);
+static gboolean button_release (GtkWidget *widget,
+ GdkEventButton *event);
+static gboolean scroll_event (GtkWidget *widget,
+ GdkEventScroll *event);
+static gboolean drag_motion (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ guint time);
+static void drag_data_get (GtkWidget *widget,
+ GdkDragContext *context,
+ GtkSelectionData *seldata,
+ guint info,
+ guint time);
+static void drag_data_received (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint time);
static void kz_tab_label_sync_to_profile (KzTabLabel *kztab);
static void kz_tab_label_move_page (KzTabLabel *kztab,
@@ -156,23 +155,20 @@
widget_class = (GtkWidgetClass *) klass;
/* GtkObject signals */
- gobject_class->constructor = kz_tab_label_constructor;
- gobject_class->dispose = kz_tab_label_dispose;
- gobject_class->set_property = kz_tab_label_set_property;
- gobject_class->get_property = kz_tab_label_get_property;
+ gobject_class->constructor = constructor;
+ gobject_class->dispose = dispose;
+ gobject_class->set_property = set_property;
+ gobject_class->get_property = get_property;
/* GtkWidget signales */
- widget_class->realize = kz_tab_label_realize;
-#if 0
- widget_class->unrealize = kz_tab_label_unrealize;
-#endif
- widget_class->button_press_event = kz_tab_label_button_press;
- widget_class->scroll_event = kz_tab_label_scroll_event;
- widget_class->motion_notify_event = kz_tab_label_motion_notify;
- widget_class->button_release_event = kz_tab_label_button_release;
- widget_class->drag_motion = kz_tab_label_drag_motion;
- widget_class->drag_data_get = kz_tab_label_drag_data_get;
- widget_class->drag_data_received = kz_tab_label_drag_data_received;
+ widget_class->realize = realize;
+ widget_class->button_press_event = button_press;
+ widget_class->button_release_event = button_release;
+ widget_class->scroll_event = scroll_event;
+ widget_class->motion_notify_event = motion_notify;
+ widget_class->drag_motion = drag_motion;
+ widget_class->drag_data_get = drag_data_get;
+ widget_class->drag_data_received = drag_data_received;
g_object_class_install_property
(gobject_class,
@@ -308,9 +304,9 @@
static GObject*
-kz_tab_label_constructor (GType type,
- guint n_props,
- GObjectConstructParam *props)
+constructor (GType type,
+ guint n_props,
+ GObjectConstructParam *props)
{
KzTabLabel *kztab;
GObject *object;
@@ -343,7 +339,7 @@
static void
-kz_tab_label_dispose (GObject *object)
+dispose (GObject *object)
{
KzTabLabel *kztab;
KzTabLabelPrivate *priv;
@@ -429,10 +425,10 @@
static void
-kz_tab_label_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
KzTabLabel *tablabel = KZ_TAB_LABEL(object);
@@ -452,10 +448,10 @@
static void
-kz_tab_label_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
KzTabLabel *tablabel = KZ_TAB_LABEL(object);
@@ -594,7 +590,7 @@
static void
-kz_tab_label_realize (GtkWidget *widget)
+realize (GtkWidget *widget)
{
KzTabLabel *kztab = KZ_TAB_LABEL(widget);
@@ -609,16 +605,9 @@
if (kz_embed_is_loading(kztab->kzembed))
kz_tab_label_set_state (kztab, KZ_TAB_LABEL_STATE_LOADING);
}
-#if 0
-static void
-kz_tab_label_unrealize (GtkWidget *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
-kz_tab_label_button_press (GtkWidget *widget, GdkEventButton *event)
+button_press (GtkWidget *widget, GdkEventButton *event)
{
KzTabLabel *kztab = KZ_TAB_LABEL(widget);
KzTabLabelPrivate *priv = KZ_TAB_LABEL_GET_PRIVATE (widget);
@@ -652,7 +641,7 @@
}
static gboolean
-kz_tab_label_motion_notify (GtkWidget *widget, GdkEventMotion *event)
+motion_notify (GtkWidget *widget, GdkEventMotion *event)
{
KzTabLabel *kztab = KZ_TAB_LABEL(widget);
KzTabLabelPrivate *priv = KZ_TAB_LABEL_GET_PRIVATE (kztab);
@@ -669,7 +658,7 @@
}
static gboolean
-kz_tab_label_button_release (GtkWidget *widget, GdkEventButton *event)
+button_release (GtkWidget *widget, GdkEventButton *event)
{
KzTabLabel *kztab = KZ_TAB_LABEL(widget);
KzTabLabelPrivate *priv = KZ_TAB_LABEL_GET_PRIVATE (kztab);
@@ -698,7 +687,7 @@
static gboolean
-kz_tab_label_scroll_event (GtkWidget *widget, GdkEventScroll *event)
+scroll_event (GtkWidget *widget, GdkEventScroll *event)
{
KzWindow *kz;
gboolean retval = FALSE;
@@ -732,10 +721,10 @@
static gboolean
-kz_tab_label_drag_motion (GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x, gint y,
- guint time)
+drag_motion (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x, gint y,
+ guint time)
{
KzTabLabel *kztab;
KzEmbed *current_kzembed;
@@ -758,11 +747,11 @@
}
static void
-kz_tab_label_drag_data_get (GtkWidget *widget,
- GdkDragContext *context,
- GtkSelectionData *data,
- guint info,
- guint time)
+drag_data_get (GtkWidget *widget,
+ GdkDragContext *context,
+ GtkSelectionData *data,
+ guint info,
+ guint time)
{
KzTabLabel *kztab;
const gchar *uri, *title;
@@ -833,12 +822,12 @@
}
static void
-kz_tab_label_drag_data_received (GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x, gint y,
- GtkSelectionData *data,
- guint info,
- guint time)
+drag_data_received (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x, gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint time)
{
KzTabLabel *kztab;
@@ -1384,3 +1373,6 @@
kz_bookmark_set_last_visited(bookmark, now.tv_sec);
}
+/*
+vim:ts=8:nowrap:ai:expandtab
+*/
Index: kazehakase/src/kz-thumbnails-view.c
diff -u kazehakase/src/kz-thumbnails-view.c:1.25 kazehakase/src/kz-thumbnails-view.c:1.26
--- kazehakase/src/kz-thumbnails-view.c:1.25 Thu Nov 30 19:58:08 2006
+++ kazehakase/src/kz-thumbnails-view.c Sat Dec 2 15:23:06 2006
@@ -44,10 +44,10 @@
#define KZ_THUMBNAIL_BOOKMARK_KEY "KzThumbnail::Bookmark"
-static void kz_thumbnails_view_dispose (GObject *object);
+static void dispose (GObject *object);
-static void kz_thumbnails_view_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
+static void size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
static void kz_thumbnails_view_redraw (KzThumbnailsView *view);
@@ -82,9 +82,9 @@
object_class = (GObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;
- object_class->dispose = kz_thumbnails_view_dispose;
+ object_class->dispose = dispose;
- widget_class->size_allocate = kz_thumbnails_view_size_allocate;
+ widget_class->size_allocate = size_allocate;
klass->activate = NULL;
@@ -115,7 +115,7 @@
static void
-kz_thumbnails_view_dispose (GObject *object)
+dispose (GObject *object)
{
KzThumbnailsView *view = KZ_THUMBNAILS_VIEW(object);
@@ -132,8 +132,8 @@
static void
-kz_thumbnails_view_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
+size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
{
GtkAllocation old_allocation;
gint old_width;
Index: kazehakase/src/kz-window.c
diff -u kazehakase/src/kz-window.c:1.275 kazehakase/src/kz-window.c:1.276
--- kazehakase/src/kz-window.c:1.275 Thu Nov 30 18:45:28 2006
+++ kazehakase/src/kz-window.c Sat Dec 2 15:23:06 2006
@@ -135,11 +135,11 @@
static gboolean key_theme_is_emacs = FALSE;
-static gboolean kz_window_delete_event (GtkWidget *widget,
- GdkEventAny *event);
-static gboolean kz_window_key_press_event(GtkWidget *widget,
- GdkEventKey *event);
-static void kz_window_destroy (GtkObject *object);
+static gboolean delete_event (GtkWidget *widget,
+ GdkEventAny *event);
+static gboolean key_press_event(GtkWidget *widget,
+ GdkEventKey *event);
+static void destroy (GtkObject *object);
static void kz_window_append_tab (KzWindow *kz,
GtkWidget *widget,
@@ -345,11 +345,11 @@
GTK_TYPE_WIDGET, G_TYPE_INT);
/* GtkObject signals */
- object_class->destroy = kz_window_destroy;
+ object_class->destroy = destroy;
/* GtkWidget signals */
- widget_class->delete_event = kz_window_delete_event;
- widget_class->key_press_event = kz_window_key_press_event;
+ widget_class->delete_event = delete_event;
+ widget_class->key_press_event = key_press_event;
/* KzWindow signals */
klass->append_tab = kz_window_append_tab;
@@ -1310,7 +1310,7 @@
static gboolean
-kz_window_delete_event (GtkWidget *widget, GdkEventAny *event)
+delete_event (GtkWidget *widget, GdkEventAny *event)
{
KzWindow *kz;
@@ -1346,7 +1346,7 @@
}
static gboolean
-kz_window_key_press_event(GtkWidget *widget, GdkEventKey *event)
+key_press_event(GtkWidget *widget, GdkEventKey *event)
{
KzWindow *kz;
@@ -1446,7 +1446,7 @@
static void
-kz_window_destroy (GtkObject *object)
+destroy (GtkObject *object)
{
KzWindow *kz = KZ_WINDOW(object);
KzWindowPrivate *priv = KZ_WINDOW_GET_PRIVATE (kz);
Index: kazehakase/src/kz-xml.c
diff -u kazehakase/src/kz-xml.c:1.26 kazehakase/src/kz-xml.c:1.27
--- kazehakase/src/kz-xml.c:1.26 Thu Nov 30 19:58:07 2006
+++ kazehakase/src/kz-xml.c Sat Dec 2 15:23:06 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.26 2006/11/30 10:58:07 ikezoe Exp $
+ * $Id: kz-xml.c,v 1.27 2006/12/02 06:23:06 ikezoe Exp $
*/
#include "kz-xml.h"
@@ -33,7 +33,7 @@
};
#define KZ_XML_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_XML, KzXMLPrivate))
-static void kz_xml_dispose (GObject *object);
+static void dispose (GObject *object);
static void kz_xml_attr_free (KzXMLAttr *attr);
@@ -47,7 +47,7 @@
object_class = (GObjectClass *) klass;
- object_class->dispose = kz_xml_dispose;
+ object_class->dispose = dispose;
g_type_class_add_private (object_class, sizeof(KzXMLPrivate));
}
@@ -66,7 +66,7 @@
static void
-kz_xml_dispose (GObject *object)
+dispose (GObject *object)
{
KzXML *xml = KZ_XML(object);