From c18cf51868958ac9d7b564e0d4fd6e75a37c747c Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Sat, 23 Nov 2019 14:44:01 +0100 Subject: avoid redundant redeclarations --- eel/eel-canvas.c | 14 +++++++------- eel/eel-editable-label.c | 19 ++++++++----------- 2 files changed, 15 insertions(+), 18 deletions(-) (limited to 'eel') diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c index 7efa67f8..e72cc7ce 100644 --- a/eel/eel-canvas.c +++ b/eel/eel-canvas.c @@ -3977,13 +3977,6 @@ eel_canvas_item_accessible_factory_create_accessible (GObject *obj) return accessible; } -static void -eel_canvas_item_accessible_factory_class_init (AtkObjectFactoryClass *klass) -{ - klass->create_accessible = eel_canvas_item_accessible_factory_create_accessible; - klass->get_accessible_type = eel_canvas_item_accessible_factory_get_accessible_type; -} - static GType eel_canvas_item_accessible_factory_get_type (void); typedef AtkObjectFactory EelCanvasItemAccessibleFactory; @@ -3991,6 +3984,13 @@ typedef AtkObjectFactoryClass EelCanvasItemAccessibleFactoryClass; G_DEFINE_TYPE (EelCanvasItemAccessibleFactory, eel_canvas_item_accessible_factory, ATK_TYPE_OBJECT_FACTORY) +static void +eel_canvas_item_accessible_factory_class_init (AtkObjectFactoryClass *klass) +{ + klass->create_accessible = eel_canvas_item_accessible_factory_create_accessible; + klass->get_accessible_type = eel_canvas_item_accessible_factory_get_accessible_type; +} + static void eel_canvas_item_accessible_factory_init (EelCanvasItemAccessibleFactory *accessible) { diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c index 800552e8..0b2cef59 100644 --- a/eel/eel-editable-label.c +++ b/eel/eel-editable-label.c @@ -67,8 +67,6 @@ enum static guint signals[LAST_SIGNAL] = { 0 }; static void eel_editable_label_editable_init (GtkEditableInterface *iface); -static void eel_editable_label_class_init (EelEditableLabelClass *klass); -static void eel_editable_label_init (EelEditableLabel *label); static void eel_editable_label_set_property (GObject *object, guint prop_id, const GValue *value, @@ -4229,6 +4227,14 @@ eel_editable_label_accessible_finalize (GObject *object) G_OBJECT_CLASS (a11y_parent_class)->finalize (object); } +G_DEFINE_TYPE_WITH_CODE (EelEditableLabelAccessible, + eel_editable_label_accessible, + GTK_TYPE_WIDGET_ACCESSIBLE, + G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, + atk_editable_text_interface_init) + G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, + atk_text_interface_init)); + static void eel_editable_label_accessible_class_init (EelEditableLabelAccessibleClass *klass) { @@ -4247,12 +4253,3 @@ static void eel_editable_label_accessible_init (EelEditableLabelAccessible *accessible) { } - -G_DEFINE_TYPE_WITH_CODE (EelEditableLabelAccessible, - eel_editable_label_accessible, - GTK_TYPE_WIDGET_ACCESSIBLE, - G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, - atk_editable_text_interface_init) - G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, - atk_text_interface_init)); - -- cgit v1.2.1