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

night-light-monitor: Receive a context

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2019-04-25 16:30:53 -03:00
parent b98801a621
commit 14c6544b95
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-application.c
+1 -1
View File
@@ -296,7 +296,7 @@ gcal_application_activate (GApplication *application)
} }
if (!self->night_light_monitor) if (!self->night_light_monitor)
self->night_light_monitor = gcal_night_light_monitor_new (manager); self->night_light_monitor = gcal_night_light_monitor_new (self->context);
if (!self->window) if (!self->window)
{ {
src/gcal-night-light-monitor.c
+17 -15
View File
@@ -25,7 +25,7 @@ struct _GcalNightLightMonitor
{ {
GObject parent; GObject parent;
GcalManager *manager; GcalContext *context;
GDBusProxy *night_light_proxy; GDBusProxy *night_light_proxy;
}; };
@@ -35,7 +35,7 @@ G_DEFINE_TYPE (GcalNightLightMonitor, gcal_night_light_monitor, G_TYPE_OBJECT)
enum enum
{ {
PROP_0, PROP_0,
PROP_MANAGER, PROP_CONTEXT,
N_PROPS N_PROPS
}; };
@@ -52,12 +52,14 @@ on_night_light_proxy_properties_changed_cb (GcalNightLightMonitor *self,
const gchar * const *invalidated, const gchar * const *invalidated,
GDBusProxy *proxy) GDBusProxy *proxy)
{ {
GcalManager *manager;
GSettings *settings; GSettings *settings;
g_assert (GCAL_IS_NIGHT_LIGHT_MONITOR (self)); g_assert (GCAL_IS_NIGHT_LIGHT_MONITOR (self));
g_assert (G_IS_DBUS_PROXY (proxy)); g_assert (G_IS_DBUS_PROXY (proxy));
settings = gcal_manager_get_settings (self->manager); manager = gcal_context_get_manager (self->context);
settings = gcal_manager_get_settings (manager);
if (g_settings_get_boolean (settings, "follow-night-light")) if (g_settings_get_boolean (settings, "follow-night-light"))
{ {
@@ -84,7 +86,7 @@ gcal_night_light_monitor_finalize (GObject *object)
{ {
GcalNightLightMonitor *self = (GcalNightLightMonitor *)object; GcalNightLightMonitor *self = (GcalNightLightMonitor *)object;
g_clear_object (&self->manager); g_clear_object (&self->context);
g_clear_object (&self->night_light_proxy); g_clear_object (&self->night_light_proxy);
G_OBJECT_CLASS (gcal_night_light_monitor_parent_class)->finalize (object); G_OBJECT_CLASS (gcal_night_light_monitor_parent_class)->finalize (object);
@@ -143,8 +145,8 @@ gcal_night_light_monitor_get_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_MANAGER: case PROP_CONTEXT:
g_value_set_object (value, self->manager); g_value_set_object (value, self->context);
break; break;
default: default:
@@ -162,9 +164,9 @@ gcal_night_light_monitor_set_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_MANAGER: case PROP_CONTEXT:
g_assert (self->manager == NULL); g_assert (self->context == NULL);
self->manager = g_value_dup_object (value); self->context = g_value_dup_object (value);
g_object_notify_by_pspec (object, pspec); g_object_notify_by_pspec (object, pspec);
break; break;
@@ -183,10 +185,10 @@ gcal_night_light_monitor_class_init (GcalNightLightMonitorClass *klass)
object_class->get_property = gcal_night_light_monitor_get_property; object_class->get_property = gcal_night_light_monitor_get_property;
object_class->set_property = gcal_night_light_monitor_set_property; object_class->set_property = gcal_night_light_monitor_set_property;
properties[PROP_MANAGER] = g_param_spec_object ("manager", properties[PROP_CONTEXT] = g_param_spec_object ("context",
"Manager", "Context",
"Manager", "Context",
GCAL_TYPE_MANAGER, GCAL_TYPE_CONTEXT,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
g_object_class_install_properties (object_class, N_PROPS, properties); g_object_class_install_properties (object_class, N_PROPS, properties);
@@ -198,9 +200,9 @@ gcal_night_light_monitor_init (GcalNightLightMonitor *self)
} }
GcalNightLightMonitor* GcalNightLightMonitor*
gcal_night_light_monitor_new (GcalManager *manager) gcal_night_light_monitor_new (GcalContext *context)
{ {
return g_object_new (GCAL_TYPE_NIGHT_LIGHT_MONITOR, return g_object_new (GCAL_TYPE_NIGHT_LIGHT_MONITOR,
"manager", manager, "context", context,
NULL); NULL);
} }
src/gcal-night-light-monitor.h
+2 -2
View File
@@ -20,7 +20,7 @@
#pragma once #pragma once
#include "gcal-manager.h" #include "gcal-context.h"
#include "gcal-window.h" #include "gcal-window.h"
G_BEGIN_DECLS G_BEGIN_DECLS
@@ -29,6 +29,6 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (GcalNightLightMonitor, gcal_night_light_monitor, GCAL, NIGHT_LIGHT_MONITOR, GObject) G_DECLARE_FINAL_TYPE (GcalNightLightMonitor, gcal_night_light_monitor, GCAL, NIGHT_LIGHT_MONITOR, GObject)
GcalNightLightMonitor* gcal_night_light_monitor_new (GcalManager *manager); GcalNightLightMonitor* gcal_night_light_monitor_new (GcalContext *context);
G_END_DECLS G_END_DECLS