Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shell-search-provider: Rework property initialization

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2018-01-28 00:13:15 -02:00
parent 74f353eb33
commit 0bfc6fe291
3 changed files with 93 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-application.c
+1 -3
View File
@@ -476,9 +476,7 @@ gcal_application_init (GcalApplication *self)
g_signal_connect_swapped (self->manager, "source-changed", G_CALLBACK (process_sources), self);
self->weather_service = gcal_weather_service_new ();
self->search_provider = gcal_shell_search_provider_new ();
gcal_shell_search_provider_connect (self->search_provider, self->manager);
self->search_provider = gcal_shell_search_provider_new (self->manager);
}
static void
src/gcal-shell-search-provider.c
+90 -24
View File
@@ -50,6 +50,15 @@ static void gcal_subscriber_interface_init (ECalDataModelSubscriberInterface *
G_DEFINE_TYPE_WITH_CODE (GcalShellSearchProvider, gcal_shell_search_provider, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (E_TYPE_CAL_DATA_MODEL_SUBSCRIBER, gcal_subscriber_interface_init));
enum
{
PROP_0,
PROP_MANAGER,
N_PROPS
};
static GParamSpec* properties[N_PROPS] = { NULL, };
static gint
sort_event_data (GcalEvent *a,
GcalEvent *b,
@@ -324,6 +333,11 @@ out:
return FALSE;
}
/*
* ECalDataModelSubscriber iface
*/
static void
gcal_shell_search_provider_component_changed (ECalDataModelSubscriber *subscriber,
ECalClient *client,
@@ -353,18 +367,6 @@ gcal_shell_search_provider_thaw (ECalDataModelSubscriber *subscriber)
;
}
static void
gcal_shell_search_provider_finalize (GObject *object)
{
GcalShellSearchProvider *self = (GcalShellSearchProvider *) object;
g_hash_table_destroy (self->events);
g_clear_object (&self->skel);
G_OBJECT_CLASS (gcal_shell_search_provider_parent_class)->finalize (object);
}
static void
gcal_subscriber_interface_init (ECalDataModelSubscriberInterface *iface)
{
@@ -375,12 +377,84 @@ gcal_subscriber_interface_init (ECalDataModelSubscriberInterface *iface)
iface->thaw = gcal_shell_search_provider_thaw;
}
/*
* GObject overrides
*/
static void
gcal_shell_search_provider_finalize (GObject *object)
{
GcalShellSearchProvider *self = (GcalShellSearchProvider *) object;
g_hash_table_destroy (self->events);
g_clear_object (&self->manager);
g_clear_object (&self->skel);
G_OBJECT_CLASS (gcal_shell_search_provider_parent_class)->finalize (object);
}
static void
gcal_shell_search_provider_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
GcalShellSearchProvider *self = GCAL_SHELL_SEARCH_PROVIDER (object);
switch (property_id)
{
case PROP_MANAGER:
g_value_set_object (value, self->manager);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
}
static void
gcal_shell_search_provider_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
{
GcalShellSearchProvider *self = GCAL_SHELL_SEARCH_PROVIDER (object);
switch (property_id)
{
case PROP_MANAGER:
if (g_set_object (&self->manager, g_value_get_object (value)))
{
gcal_manager_setup_shell_search (self->manager, E_CAL_DATA_MODEL_SUBSCRIBER (self));
g_signal_connect_swapped (self->manager, "query-completed", G_CALLBACK (query_completed_cb), self);
g_object_notify_by_pspec (object, properties[PROP_MANAGER]);
}
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
}
static void
gcal_shell_search_provider_class_init (GcalShellSearchProviderClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = gcal_shell_search_provider_finalize;
object_class->get_property = gcal_shell_search_provider_get_property;
object_class->set_property = gcal_shell_search_provider_set_property;
properties[PROP_MANAGER] = g_param_spec_object ("manager",
"The manager object",
"The manager object",
GCAL_TYPE_MANAGER,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
g_object_class_install_properties (object_class, N_PROPS, properties);
}
static void
@@ -397,9 +471,11 @@ gcal_shell_search_provider_init (GcalShellSearchProvider *self)
}
GcalShellSearchProvider*
gcal_shell_search_provider_new (void)
gcal_shell_search_provider_new (GcalManager *manager)
{
return g_object_new (GCAL_TYPE_SHELL_SEARCH_PROVIDER, NULL);
return g_object_new (GCAL_TYPE_SHELL_SEARCH_PROVIDER,
"manager", manager,
NULL);
}
gboolean
@@ -419,13 +495,3 @@ gcal_shell_search_provider_dbus_unexport (GcalShellSearchProvider *self,
if (g_dbus_interface_skeleton_has_connection (G_DBUS_INTERFACE_SKELETON (self->skel), connection))
g_dbus_interface_skeleton_unexport_from_connection (G_DBUS_INTERFACE_SKELETON (self->skel), connection);
}
void
gcal_shell_search_provider_connect (GcalShellSearchProvider *self,
GcalManager *manager)
{
self->manager = manager;
gcal_manager_setup_shell_search (manager, E_CAL_DATA_MODEL_SUBSCRIBER (self));
g_signal_connect_swapped (manager, "query-completed", G_CALLBACK (query_completed_cb), self);
}
src/gcal-shell-search-provider.h
+2 -3
View File
@@ -30,17 +30,16 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (GcalShellSearchProvider, gcal_shell_search_provider, GCAL, SHELL_SEARCH_PROVIDER, GObject)
GcalShellSearchProvider *gcal_shell_search_provider_new (void);
GcalShellSearchProvider* gcal_shell_search_provider_new (GcalManager *manager);
gboolean gcal_shell_search_provider_dbus_export (GcalShellSearchProvider *search_provider,
GDBusConnection *connection,
const gchar *object_path,
GError **error);
void gcal_shell_search_provider_dbus_unexport (GcalShellSearchProvider *search_provider,
GDBusConnection *connection,
const gchar *object_path);
void gcal_shell_search_provider_connect (GcalShellSearchProvider *search_provider,
GcalManager *manager);
G_END_DECLS