Drop gnome-online-accounts dependency
We don't need it anymore.
This commit is contained in:
@@ -38,19 +38,6 @@
|
|||||||
"*.a"
|
"*.a"
|
||||||
],
|
],
|
||||||
"modules" : [
|
"modules" : [
|
||||||
{
|
|
||||||
"name" : "gnome-online-accounts",
|
|
||||||
"buildsystem" : "meson",
|
|
||||||
"config-opts" : [
|
|
||||||
"-Dgoabackend=false"
|
|
||||||
],
|
|
||||||
"sources" : [
|
|
||||||
{
|
|
||||||
"type" : "git",
|
|
||||||
"url" : "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name" : "geocode-glib",
|
"name" : "geocode-glib",
|
||||||
"buildsystem" : "meson",
|
"buildsystem" : "meson",
|
||||||
@@ -119,6 +106,7 @@
|
|||||||
"buildsystem" : "cmake-ninja",
|
"buildsystem" : "cmake-ninja",
|
||||||
"config-opts" : [
|
"config-opts" : [
|
||||||
"-DENABLE_CANBERRA=OFF",
|
"-DENABLE_CANBERRA=OFF",
|
||||||
|
"-DENABLE_GOA=OFF",
|
||||||
"-DENABLE_DOT_LOCKING=OFF",
|
"-DENABLE_DOT_LOCKING=OFF",
|
||||||
"-DENABLE_FILE_LOCKING=fcntl",
|
"-DENABLE_FILE_LOCKING=fcntl",
|
||||||
"-DENABLE_GTK=ON",
|
"-DENABLE_GTK=ON",
|
||||||
|
|||||||
@@ -131,7 +131,6 @@ common_flags = [
|
|||||||
'-DPACKAGE_DATA_DIR="@0@"'.format(calendar_pkgdatadir),
|
'-DPACKAGE_DATA_DIR="@0@"'.format(calendar_pkgdatadir),
|
||||||
'-DUI_DATA_DIR="@0@"'.format(join_paths(calendar_datadir), 'style'),
|
'-DUI_DATA_DIR="@0@"'.format(join_paths(calendar_datadir), 'style'),
|
||||||
'-DEDS_DISABLE_DEPRECATED',
|
'-DEDS_DISABLE_DEPRECATED',
|
||||||
'-DGOA_API_IS_SUBJECT_TO_CHANGE',
|
|
||||||
'-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE'
|
'-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE'
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -169,7 +168,6 @@ libhandy_dep = dependency('libhandy-1', version: '>= 1.0.0')
|
|||||||
glib_dep = dependency('glib-2.0', version: '>= 2.67.5')
|
glib_dep = dependency('glib-2.0', version: '>= 2.67.5')
|
||||||
gtk_dep = dependency('gtk+-3.0', version: '>= 3.22.20')
|
gtk_dep = dependency('gtk+-3.0', version: '>= 3.22.20')
|
||||||
gio_dep = dependency('gio-2.0', version: '>= 2.58.0')
|
gio_dep = dependency('gio-2.0', version: '>= 2.58.0')
|
||||||
goa_dep = dependency('goa-1.0', version: '>= 3.2.0')
|
|
||||||
gweather_dep = dependency('gweather-3.0', version: '>= 40.0')
|
gweather_dep = dependency('gweather-3.0', version: '>= 40.0')
|
||||||
geoclue_dep = dependency('libgeoclue-2.0', version: '>=2.4')
|
geoclue_dep = dependency('libgeoclue-2.0', version: '>=2.4')
|
||||||
geocode_dep = dependency('geocode-glib-1.0', version: '>=3.23')
|
geocode_dep = dependency('geocode-glib-1.0', version: '>=3.23')
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ struct _GcalContext
|
|||||||
GSettings *desktop_settings;
|
GSettings *desktop_settings;
|
||||||
|
|
||||||
GcalClock *clock;
|
GcalClock *clock;
|
||||||
GoaClient *goa_client;
|
|
||||||
GcalManager *manager;
|
GcalManager *manager;
|
||||||
GcalSearchEngine *search_engine;
|
GcalSearchEngine *search_engine;
|
||||||
GSettings *settings;
|
GSettings *settings;
|
||||||
@@ -48,7 +47,6 @@ enum
|
|||||||
{
|
{
|
||||||
PROP_0,
|
PROP_0,
|
||||||
PROP_CLOCK,
|
PROP_CLOCK,
|
||||||
PROP_GOA_CLIENT,
|
|
||||||
PROP_MANAGER,
|
PROP_MANAGER,
|
||||||
PROP_SEARCH_ENGINE,
|
PROP_SEARCH_ENGINE,
|
||||||
PROP_SETTINGS,
|
PROP_SETTINGS,
|
||||||
@@ -122,7 +120,6 @@ gcal_context_finalize (GObject *object)
|
|||||||
|
|
||||||
g_clear_object (&self->clock);
|
g_clear_object (&self->clock);
|
||||||
g_clear_object (&self->desktop_settings);
|
g_clear_object (&self->desktop_settings);
|
||||||
g_clear_object (&self->goa_client);
|
|
||||||
g_clear_object (&self->manager);
|
g_clear_object (&self->manager);
|
||||||
g_clear_object (&self->night_light_monitor);
|
g_clear_object (&self->night_light_monitor);
|
||||||
g_clear_object (&self->timezone_monitor);
|
g_clear_object (&self->timezone_monitor);
|
||||||
@@ -145,10 +142,6 @@ gcal_context_get_property (GObject *object,
|
|||||||
g_value_set_object (value, self->clock);
|
g_value_set_object (value, self->clock);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_GOA_CLIENT:
|
|
||||||
g_value_set_object (value, self->goa_client);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_MANAGER:
|
case PROP_MANAGER:
|
||||||
g_value_set_object (value, self->manager);
|
g_value_set_object (value, self->manager);
|
||||||
break;
|
break;
|
||||||
@@ -187,7 +180,6 @@ gcal_context_set_property (GObject *object,
|
|||||||
switch (prop_id)
|
switch (prop_id)
|
||||||
{
|
{
|
||||||
case PROP_CLOCK:
|
case PROP_CLOCK:
|
||||||
case PROP_GOA_CLIENT:
|
|
||||||
case PROP_MANAGER:
|
case PROP_MANAGER:
|
||||||
case PROP_SEARCH_ENGINE:
|
case PROP_SEARCH_ENGINE:
|
||||||
case PROP_SETTINGS:
|
case PROP_SETTINGS:
|
||||||
@@ -215,12 +207,6 @@ gcal_context_class_init (GcalContextClass *klass)
|
|||||||
GCAL_TYPE_CLOCK,
|
GCAL_TYPE_CLOCK,
|
||||||
G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
|
G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
|
||||||
|
|
||||||
properties[PROP_GOA_CLIENT] = g_param_spec_object ("goa-client",
|
|
||||||
"Online Accounts client",
|
|
||||||
"Online Accounts client",
|
|
||||||
GOA_TYPE_CLIENT,
|
|
||||||
G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
|
|
||||||
|
|
||||||
properties[PROP_MANAGER] = g_param_spec_object ("manager",
|
properties[PROP_MANAGER] = g_param_spec_object ("manager",
|
||||||
"Data manager",
|
"Data manager",
|
||||||
"Data manager of the application",
|
"Data manager of the application",
|
||||||
@@ -265,7 +251,6 @@ static void
|
|||||||
gcal_context_init (GcalContext *self)
|
gcal_context_init (GcalContext *self)
|
||||||
{
|
{
|
||||||
self->clock = gcal_clock_new ();
|
self->clock = gcal_clock_new ();
|
||||||
self->goa_client = goa_client_new_sync (NULL, NULL);
|
|
||||||
self->settings = g_settings_new ("org.gnome.calendar");
|
self->settings = g_settings_new ("org.gnome.calendar");
|
||||||
self->weather_service = gcal_weather_service_new ();
|
self->weather_service = gcal_weather_service_new ();
|
||||||
|
|
||||||
@@ -315,21 +300,6 @@ gcal_context_get_clock (GcalContext *self)
|
|||||||
return self->clock;
|
return self->clock;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* gcal_context_get_goa_client:
|
|
||||||
*
|
|
||||||
* Retrieves the #GoaClient from @self.
|
|
||||||
*
|
|
||||||
* Returns: (transfer none): a #GoaClient
|
|
||||||
*/
|
|
||||||
GoaClient*
|
|
||||||
gcal_context_get_goa_client (GcalContext *self)
|
|
||||||
{
|
|
||||||
g_return_val_if_fail (GCAL_IS_CONTEXT (self), NULL);
|
|
||||||
|
|
||||||
return self->goa_client;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gcal_context_get_manager:
|
* gcal_context_get_manager:
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -27,7 +27,6 @@
|
|||||||
#include "weather/gcal-weather-service.h"
|
#include "weather/gcal-weather-service.h"
|
||||||
|
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
#include <goa/goa.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
@@ -38,8 +37,6 @@ GcalContext* gcal_context_new (void);
|
|||||||
|
|
||||||
GcalClock* gcal_context_get_clock (GcalContext *self);
|
GcalClock* gcal_context_get_clock (GcalContext *self);
|
||||||
|
|
||||||
GoaClient* gcal_context_get_goa_client (GcalContext *self);
|
|
||||||
|
|
||||||
GcalManager* gcal_context_get_manager (GcalContext *self);
|
GcalManager* gcal_context_get_manager (GcalContext *self);
|
||||||
|
|
||||||
GcalSearchEngine* gcal_context_get_search_engine (GcalContext *self);
|
GcalSearchEngine* gcal_context_get_search_engine (GcalContext *self);
|
||||||
|
|||||||
@@ -28,7 +28,6 @@
|
|||||||
#include "gcal-utils.h"
|
#include "gcal-utils.h"
|
||||||
|
|
||||||
#include <glib/gi18n.h>
|
#include <glib/gi18n.h>
|
||||||
#include <goa/goa.h>
|
|
||||||
#include <libedataserverui/libedataserverui.h>
|
#include <libedataserverui/libedataserverui.h>
|
||||||
#include <libsoup/soup.h>
|
#include <libsoup/soup.h>
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ gcal_deps = [
|
|||||||
glib_dep,
|
glib_dep,
|
||||||
gtk_dep,
|
gtk_dep,
|
||||||
gio_dep,
|
gio_dep,
|
||||||
goa_dep,
|
|
||||||
gweather_dep,
|
gweather_dep,
|
||||||
geoclue_dep,
|
geoclue_dep,
|
||||||
geocode_dep,
|
geocode_dep,
|
||||||
|
|||||||
Reference in New Issue
Block a user