diff --git a/clutter/clutter/clutter-zoom-action.c b/clutter/clutter/clutter-zoom-action.c index f8bc19fba..fe479c3e2 100644 --- a/clutter/clutter/clutter-zoom-action.c +++ b/clutter/clutter/clutter-zoom-action.c @@ -219,12 +219,6 @@ clutter_zoom_action_gesture_cancel (ClutterGestureAction *action, clutter_actor_set_scale (actor, priv->initial_scale_x, priv->initial_scale_y); } -static void -clutter_zoom_action_dispose (GObject *gobject) -{ - G_OBJECT_CLASS (clutter_zoom_action_parent_class)->dispose (gobject); -} - static void clutter_zoom_action_constructed (GObject *gobject) { @@ -242,7 +236,6 @@ clutter_zoom_action_class_init (ClutterZoomActionClass *klass) GObjectClass *gobject_class = G_OBJECT_CLASS (klass); gobject_class->constructed = clutter_zoom_action_constructed; - gobject_class->dispose = clutter_zoom_action_dispose; gesture_class->gesture_begin = clutter_zoom_action_gesture_begin; gesture_class->gesture_progress = clutter_zoom_action_gesture_progress; diff --git a/src/backends/meta-eis-client.c b/src/backends/meta-eis-client.c index 359801918..16f36a875 100644 --- a/src/backends/meta-eis-client.c +++ b/src/backends/meta-eis-client.c @@ -724,13 +724,6 @@ meta_eis_client_init (MetaEisClient *meta_eis_client) { } -static void -meta_eis_client_constructed (GObject *object) -{ - if (G_OBJECT_CLASS (meta_eis_client_parent_class)->constructed) - G_OBJECT_CLASS (meta_eis_client_parent_class)->constructed (object); -} - static void meta_eis_client_finalize (GObject *object) { @@ -749,6 +742,5 @@ meta_eis_client_class_init (MetaEisClientClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->constructed = meta_eis_client_constructed; object_class->finalize = meta_eis_client_finalize; } diff --git a/src/backends/meta-eis.c b/src/backends/meta-eis.c index d7b5aae5d..9c14c5fff 100644 --- a/src/backends/meta-eis.c +++ b/src/backends/meta-eis.c @@ -297,19 +297,9 @@ meta_eis_new (MetaBackend *backend) static void meta_eis_init (MetaEis *meta_eis) { -} - -static void -meta_eis_constructed (GObject *object) -{ - MetaEis *meta_eis = META_EIS (object); - meta_eis->eis_clients = g_hash_table_new_full (g_direct_hash, g_direct_equal, (GDestroyNotify) eis_client_unref, (GDestroyNotify) g_object_unref); - - if (G_OBJECT_CLASS (meta_eis_parent_class)->constructed) - G_OBJECT_CLASS (meta_eis_parent_class)->constructed (object); } static void @@ -329,6 +319,5 @@ meta_eis_class_init (MetaEisClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->constructed = meta_eis_constructed; object_class->finalize = meta_eis_finalize; } diff --git a/src/backends/native/meta-kms.c b/src/backends/native/meta-kms.c index 31249adde..e282a1046 100644 --- a/src/backends/native/meta-kms.c +++ b/src/backends/native/meta-kms.c @@ -505,11 +505,6 @@ meta_kms_finalize (GObject *object) G_OBJECT_CLASS (meta_kms_parent_class)->finalize (object); } -static void -meta_kms_constructed (GObject *object) -{ -} - static void meta_kms_init (MetaKms *kms) { @@ -523,7 +518,6 @@ meta_kms_class_init (MetaKmsClass *klass) MetaThreadClass *thread_class = META_THREAD_CLASS (klass); object_class->finalize = meta_kms_finalize; - object_class->constructed = meta_kms_constructed; signals[RESOURCES_CHANGED] = g_signal_new ("resources-changed", diff --git a/src/compositor/meta-module.c b/src/compositor/meta-module.c index ca7ea05b8..fc18635bc 100644 --- a/src/compositor/meta-module.c +++ b/src/compositor/meta-module.c @@ -97,12 +97,6 @@ meta_module_unload (GTypeModule *gmodule) priv->plugin_type = 0; } -static void -meta_module_dispose (GObject *object) -{ - G_OBJECT_CLASS (meta_module_parent_class)->dispose (object); -} - static void meta_module_finalize (GObject *object) { @@ -160,7 +154,6 @@ meta_module_class_init (MetaModuleClass *klass) GTypeModuleClass *gmodule_class = G_TYPE_MODULE_CLASS (klass); gobject_class->finalize = meta_module_finalize; - gobject_class->dispose = meta_module_dispose; gobject_class->set_property = meta_module_set_property; gobject_class->get_property = meta_module_get_property; diff --git a/src/compositor/meta-window-actor-x11.c b/src/compositor/meta-window-actor-x11.c index c6cce0ce9..c1ac7dafd 100644 --- a/src/compositor/meta-window-actor-x11.c +++ b/src/compositor/meta-window-actor-x11.c @@ -1562,12 +1562,6 @@ meta_window_actor_x11_dispose (GObject *object) G_OBJECT_CLASS (meta_window_actor_x11_parent_class)->dispose (object); } -static void -meta_window_actor_x11_finalize (GObject *object) -{ - G_OBJECT_CLASS (meta_window_actor_x11_parent_class)->finalize (object); -} - static void meta_window_actor_x11_class_init (MetaWindowActorX11Class *klass) { @@ -1596,7 +1590,6 @@ meta_window_actor_x11_class_init (MetaWindowActorX11Class *klass) object_class->set_property = meta_window_actor_x11_set_property; object_class->get_property = meta_window_actor_x11_get_property; object_class->dispose = meta_window_actor_x11_dispose; - object_class->finalize = meta_window_actor_x11_finalize; pspec = g_param_spec_enum ("shadow-mode", NULL, NULL, META_TYPE_SHADOW_MODE, diff --git a/src/compositor/plugins/default.c b/src/compositor/plugins/default.c index 9ff255070..5d68c2d26 100644 --- a/src/compositor/plugins/default.c +++ b/src/compositor/plugins/default.c @@ -153,59 +153,11 @@ typedef struct _DisplayTilePreview MetaRectangle tile_rect; } DisplayTilePreview; -static void -meta_default_plugin_dispose (GObject *object) -{ - /* MetaDefaultPluginPrivate *priv = META_DEFAULT_PLUGIN (object)->priv; - */ - G_OBJECT_CLASS (meta_default_plugin_parent_class)->dispose (object); -} - -static void -meta_default_plugin_finalize (GObject *object) -{ - G_OBJECT_CLASS (meta_default_plugin_parent_class)->finalize (object); -} - -static void -meta_default_plugin_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -meta_default_plugin_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - static void meta_default_plugin_class_init (MetaDefaultPluginClass *klass) { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); MetaPluginClass *plugin_class = META_PLUGIN_CLASS (klass); - gobject_class->finalize = meta_default_plugin_finalize; - gobject_class->dispose = meta_default_plugin_dispose; - gobject_class->set_property = meta_default_plugin_set_property; - gobject_class->get_property = meta_default_plugin_get_property; - plugin_class->start = start; plugin_class->map = map; plugin_class->minimize = minimize; diff --git a/src/core/meta-launch-context.c b/src/core/meta-launch-context.c index 549ade28b..3028f5364 100644 --- a/src/core/meta-launch-context.c +++ b/src/core/meta-launch-context.c @@ -100,12 +100,6 @@ meta_launch_context_get_property (GObject *object, } } -static void -meta_launch_context_finalize (GObject *object) -{ - G_OBJECT_CLASS (meta_launch_context_parent_class)->finalize (object); -} - static void meta_launch_context_constructed (GObject *object) { @@ -215,7 +209,6 @@ meta_launch_context_class_init (MetaLaunchContextClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GAppLaunchContextClass *ctx_class = G_APP_LAUNCH_CONTEXT_CLASS (klass); - object_class->finalize = meta_launch_context_finalize; object_class->constructed = meta_launch_context_constructed; object_class->set_property = meta_launch_context_set_property; object_class->get_property = meta_launch_context_get_property; diff --git a/src/core/meta-workspace-manager.c b/src/core/meta-workspace-manager.c index d805e51d3..e16e1cd91 100644 --- a/src/core/meta-workspace-manager.c +++ b/src/core/meta-workspace-manager.c @@ -87,20 +87,6 @@ meta_workspace_manager_get_property (GObject *object, } } -static void -meta_workspace_manager_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - static void meta_workspace_manager_finalize (GObject *object) { @@ -117,7 +103,6 @@ meta_workspace_manager_class_init (MetaWorkspaceManagerClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->get_property = meta_workspace_manager_get_property; - object_class->set_property = meta_workspace_manager_set_property; object_class->finalize = meta_workspace_manager_finalize; diff --git a/src/core/startup-notification.c b/src/core/startup-notification.c index 69b059d06..2a9796dc4 100644 --- a/src/core/startup-notification.c +++ b/src/core/startup-notification.c @@ -641,6 +641,8 @@ meta_startup_notification_lookup_sequence (MetaStartupNotification *sn, static void meta_startup_notification_init (MetaStartupNotification *sn) { + sn->startup_sequences = NULL; + sn->startup_sequence_timeout_id = 0; } static void @@ -695,23 +697,11 @@ meta_startup_notification_get_property (GObject *object, } } -static void -meta_startup_notification_constructed (GObject *object) -{ - MetaStartupNotification *sn = META_STARTUP_NOTIFICATION (object); - - g_assert (sn->display != NULL); - - sn->startup_sequences = NULL; - sn->startup_sequence_timeout_id = 0; -} - static void meta_startup_notification_class_init (MetaStartupNotificationClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->constructed = meta_startup_notification_constructed; object_class->finalize = meta_startup_notification_finalize; object_class->set_property = meta_startup_notification_set_property; object_class->get_property = meta_startup_notification_get_property; diff --git a/src/core/workspace.c b/src/core/workspace.c index 65706fca0..4edfc3db3 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -141,27 +141,6 @@ meta_workspace_clear_logical_monitor_data (MetaWorkspace *workspace) g_clear_pointer (&workspace->logical_monitor_data, g_hash_table_destroy); } -static void -meta_workspace_finalize (GObject *object) -{ - /* Actual freeing done in meta_workspace_remove() for now */ - G_OBJECT_CLASS (meta_workspace_parent_class)->finalize (object); -} - -static void -meta_workspace_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - static void meta_workspace_get_property (GObject *object, guint prop_id, @@ -195,9 +174,7 @@ static void meta_workspace_class_init (MetaWorkspaceClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->finalize = meta_workspace_finalize; object_class->get_property = meta_workspace_get_property; - object_class->set_property = meta_workspace_set_property; signals[WINDOW_ADDED] = g_signal_new ("window-added", G_TYPE_FROM_CLASS (klass),