manager: overwrite constructed vfunc is not needed
Since GcalManager does not have any properties or use in way GObject's initialization system there's no need of having initialization code split between vfunc _init and vfunc _contructed.
This commit is contained in:
+5
-62
@@ -514,55 +514,9 @@ remove_source (GcalManager *manager,
|
|||||||
static void
|
static void
|
||||||
gcal_manager_class_init (GcalManagerClass *klass)
|
gcal_manager_class_init (GcalManagerClass *klass)
|
||||||
{
|
{
|
||||||
G_OBJECT_CLASS (klass)->constructed = gcal_manager_constructed;
|
|
||||||
G_OBJECT_CLASS (klass)->finalize = gcal_manager_finalize;
|
G_OBJECT_CLASS (klass)->finalize = gcal_manager_finalize;
|
||||||
|
|
||||||
/**
|
/* FIXME: check if this is really needed */
|
||||||
* GcalManager::objects-added:
|
|
||||||
*
|
|
||||||
* The list passed to the signalis composed of #GcalEventData
|
|
||||||
* structures keeping a volatile pointer to the source of the event
|
|
||||||
* and an owned copy of an #EcalComponent
|
|
||||||
*
|
|
||||||
* @manager: the #GcalManager instance which emitted the signal
|
|
||||||
* @objects: (type GSList) (transfer none) (element-type long):
|
|
||||||
*/
|
|
||||||
signals[EVENTS_ADDED] =
|
|
||||||
g_signal_new ("events-added",
|
|
||||||
GCAL_TYPE_MANAGER,
|
|
||||||
G_SIGNAL_RUN_FIRST,
|
|
||||||
G_STRUCT_OFFSET (GcalManagerClass,
|
|
||||||
events_added),
|
|
||||||
NULL, NULL,
|
|
||||||
g_cclosure_marshal_VOID__POINTER,
|
|
||||||
G_TYPE_NONE,
|
|
||||||
1,
|
|
||||||
G_TYPE_POINTER);
|
|
||||||
|
|
||||||
signals[EVENTS_MODIFIED] =
|
|
||||||
g_signal_new ("events-modified",
|
|
||||||
GCAL_TYPE_MANAGER,
|
|
||||||
G_SIGNAL_RUN_FIRST,
|
|
||||||
G_STRUCT_OFFSET (GcalManagerClass,
|
|
||||||
events_modified),
|
|
||||||
NULL, NULL,
|
|
||||||
g_cclosure_marshal_VOID__POINTER,
|
|
||||||
G_TYPE_NONE,
|
|
||||||
1,
|
|
||||||
G_TYPE_POINTER);
|
|
||||||
|
|
||||||
signals[EVENTS_REMOVED] =
|
|
||||||
g_signal_new ("events-removed",
|
|
||||||
GCAL_TYPE_MANAGER,
|
|
||||||
G_SIGNAL_RUN_FIRST,
|
|
||||||
G_STRUCT_OFFSET (GcalManagerClass,
|
|
||||||
events_removed),
|
|
||||||
NULL, NULL,
|
|
||||||
g_cclosure_marshal_VOID__POINTER,
|
|
||||||
G_TYPE_NONE,
|
|
||||||
1,
|
|
||||||
G_TYPE_POINTER);
|
|
||||||
|
|
||||||
signals[EVENT_CREATED] =
|
signals[EVENT_CREATED] =
|
||||||
g_signal_new ("event-created",
|
g_signal_new ("event-created",
|
||||||
GCAL_TYPE_MANAGER,
|
GCAL_TYPE_MANAGER,
|
||||||
@@ -581,6 +535,10 @@ gcal_manager_init (GcalManager *self)
|
|||||||
{
|
{
|
||||||
GcalManagerPrivate *priv;
|
GcalManagerPrivate *priv;
|
||||||
|
|
||||||
|
GError *error;
|
||||||
|
GList *sources;
|
||||||
|
GList *l;
|
||||||
|
|
||||||
priv = gcal_manager_get_instance_private (self);
|
priv = gcal_manager_get_instance_private (self);
|
||||||
|
|
||||||
priv->system_timezone = e_cal_util_get_system_timezone ();
|
priv->system_timezone = e_cal_util_get_system_timezone ();
|
||||||
@@ -599,21 +557,6 @@ gcal_manager_init (GcalManager *self)
|
|||||||
(GEqualFunc) e_source_equal,
|
(GEqualFunc) e_source_equal,
|
||||||
NULL,
|
NULL,
|
||||||
free_manager_unit_data);
|
free_manager_unit_data);
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
gcal_manager_constructed (GObject *object)
|
|
||||||
{
|
|
||||||
GcalManagerPrivate *priv;
|
|
||||||
|
|
||||||
GError *error;
|
|
||||||
GList *sources;
|
|
||||||
GList *l;
|
|
||||||
|
|
||||||
if (G_OBJECT_CLASS (gcal_manager_parent_class)->constructed != NULL)
|
|
||||||
G_OBJECT_CLASS (gcal_manager_parent_class)->constructed (object);
|
|
||||||
|
|
||||||
priv = gcal_manager_get_instance_private (GCAL_MANAGER (object));
|
|
||||||
|
|
||||||
error = NULL;
|
error = NULL;
|
||||||
priv->source_registry = e_source_registry_new_sync (NULL, &error);
|
priv->source_registry = e_source_registry_new_sync (NULL, &error);
|
||||||
|
|||||||
Reference in New Issue
Block a user