1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
diff --git a/configure b/configure
index 3a9699a..045264f 100755
--- a/configure
+++ b/configure
@@ -17691,7 +17691,6 @@ POLKIT_REQUIRED_VERSION=0.103
UPOWER_REQUIRED_VERSION=0.99.0
GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION=3.19.3
GEOCODE_GLIB_REQUIRED_VERSION=3.10.0
-GEOCLUE_REQUIRED_VERSION=2.3.1
NM_REQUIRED_VERSION=1.0
@@ -20529,12 +20528,12 @@ if test -n "$DATETIME_CFLAGS"; then
pkg_cv_DATETIME_CFLAGS="$DATETIME_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgeoclue-2.0 >= \$GEOCLUE_REQUIRED_VERSION
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
geocode-glib-1.0 >= \$GEOCODE_GLIB_REQUIRED_VERSION
gweather-3.0 >= \$LIBGWEATHER_REQUIRED_VERSION
polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION
\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+ ($PKG_CONFIG --exists --print-errors "
geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
@@ -20542,7 +20541,7 @@ if test -n "$DATETIME_CFLAGS"; then
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_DATETIME_CFLAGS=`$PKG_CONFIG --cflags "libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+ pkg_cv_DATETIME_CFLAGS=`$PKG_CONFIG --cflags "
geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
@@ -20558,12 +20557,12 @@ if test -n "$DATETIME_LIBS"; then
pkg_cv_DATETIME_LIBS="$DATETIME_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgeoclue-2.0 >= \$GEOCLUE_REQUIRED_VERSION
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
geocode-glib-1.0 >= \$GEOCODE_GLIB_REQUIRED_VERSION
gweather-3.0 >= \$LIBGWEATHER_REQUIRED_VERSION
polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION
\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+ ($PKG_CONFIG --exists --print-errors "
geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
@@ -20571,7 +20570,7 @@ if test -n "$DATETIME_LIBS"; then
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_DATETIME_LIBS=`$PKG_CONFIG --libs "libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+ pkg_cv_DATETIME_LIBS=`$PKG_CONFIG --libs "
geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
@@ -20596,13 +20595,13 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DATETIME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+ DATETIME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
" 2>&1`
else
- DATETIME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+ DATETIME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
@@ -20611,7 +20610,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$DATETIME_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+ as_fn_error $? "Package requirements (
geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
diff --git a/configure.ac b/configure.ac
index e239a76..3427700 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,6 @@ POLKIT_REQUIRED_VERSION=0.103
UPOWER_REQUIRED_VERSION=0.99.0
GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION=3.19.3
GEOCODE_GLIB_REQUIRED_VERSION=3.10.0
-GEOCLUE_REQUIRED_VERSION=2.3.1
NM_REQUIRED_VERSION=1.0
EXTRA_COMPILE_WARNINGS(yes)
@@ -264,7 +263,6 @@ AC_CHECK_LIBM
AC_SUBST(LIBM)
PKG_CHECK_MODULES(DATETIME,
- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
diff --git a/plugins/datetime/gsd-timezone-monitor.c b/plugins/datetime/gsd-timezone-monitor.c
index 2ac8648..534f815 100644
--- a/plugins/datetime/gsd-timezone-monitor.c
+++ b/plugins/datetime/gsd-timezone-monitor.c
@@ -25,7 +25,6 @@
#include "tz.h"
#include "weather-tz.h"
-#include <geoclue.h>
#include <geocode-glib/geocode-glib.h>
#include <polkit/polkit.h>
@@ -43,8 +42,6 @@ typedef struct
{
GCancellable *cancellable;
GPermission *permission;
- GClueClient *geoclue_client;
- GClueSimple *geoclue_simple;
Timedate1 *dtm;
TzDB *tzdb;
@@ -265,65 +262,6 @@ start_reverse_geocoding (GsdTimezoneMonitor *self,
g_object_unref (reverse);
}
-static void
-on_location_notify (GClueSimple *simple,
- GParamSpec *pspec,
- gpointer user_data)
-{
- GsdTimezoneMonitor *self = user_data;
- GClueLocation *location;
- gdouble latitude, longitude;
-
- location = gclue_simple_get_location (simple);
-
- latitude = gclue_location_get_latitude (location);
- longitude = gclue_location_get_longitude (location);
-
- start_reverse_geocoding (self, latitude, longitude);
-}
-
-static void
-on_geoclue_simple_ready (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data)
-{
- GError *error = NULL;
- GsdTimezoneMonitorPrivate *priv;
- GClueSimple *geoclue_simple;
-
- geoclue_simple = gclue_simple_new_finish (res, &error);
- if (geoclue_simple == NULL) {
- if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
- g_warning ("Failed to connect to GeoClue2 service: %s", error->message);
- g_error_free (error);
- return;
- }
-
- priv = gsd_timezone_monitor_get_instance_private (user_data);
- priv->geoclue_simple = geoclue_simple;
- priv->geoclue_client = gclue_simple_get_client (priv->geoclue_simple);
- gclue_client_set_distance_threshold (priv->geoclue_client,
- GEOCODE_LOCATION_ACCURACY_CITY);
-
- g_signal_connect (priv->geoclue_simple, "notify::location",
- G_CALLBACK (on_location_notify), user_data);
-
- on_location_notify (priv->geoclue_simple, NULL, user_data);
-}
-
-static void
-register_geoclue (GsdTimezoneMonitor *self)
-{
- GsdTimezoneMonitorPrivate *priv = gsd_timezone_monitor_get_instance_private (self);
-
- gclue_simple_new (DESKTOP_ID,
- GCLUE_ACCURACY_LEVEL_CITY,
- priv->cancellable,
- on_geoclue_simple_ready,
- self);
-
-}
-
GsdTimezoneMonitor *
gsd_timezone_monitor_new (void)
{
@@ -343,11 +281,7 @@ gsd_timezone_monitor_finalize (GObject *obj)
g_clear_object (&priv->cancellable);
}
- if (priv->geoclue_client)
- gclue_client_call_stop (priv->geoclue_client, NULL, NULL, NULL);
-
g_clear_object (&priv->dtm);
- g_clear_object (&priv->geoclue_simple);
g_clear_object (&priv->permission);
g_clear_pointer (&priv->current_timezone, g_free);
g_clear_pointer (&priv->tzdb, tz_db_free);
@@ -413,6 +347,4 @@ gsd_timezone_monitor_init (GsdTimezoneMonitor *self)
priv->current_timezone = timedate1_dup_timezone (priv->dtm);
priv->tzdb = tz_load_db ();
priv->weather_tzdb = weather_tz_db_new ();
-
- register_geoclue (self);
}
|
