JMR-dev/redshift-rebooted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated geoclue 1 location provider

Browse Source
This commit is contained in:
Jon Lund Steffensen
2017-08-16 20:46:53 -07:00
parent ee4ce47d1b
commit 4adb93a448
11 changed files with 61 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.am
+8 -17
View File
@@ -9,15 +9,15 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
bin_PROGRAMS = redshift
redshift_SOURCES = \
redshift.c redshift.h \
signals.c signals.h \
colorramp.c colorramp.h \
config-ini.c config-ini.h \
location-manual.c location-manual.h \
solar.c solar.h \
systemtime.c systemtime.h \
gamma-dummy.c gamma-dummy.h \
hooks.c hooks.h \
gamma-dummy.c gamma-dummy.h
location-manual.c location-manual.h \
redshift.c redshift.h \
signals.c signals.h \
solar.c solar.h \
systemtime.c systemtime.h
EXTRA_redshift_SOURCES = \
gamma-drm.c gamma-drm.h \
@@ -25,7 +25,8 @@ EXTRA_redshift_SOURCES = \
gamma-vidmode.c gamma-vidmode.h \
gamma-quartz.c gamma-quartz.h \
gamma-w32gdi.c gamma-w32gdi.h \
location-geoclue.c location-geoclue.h \
location-geoclue2.c location-geoclue2.h \
location-corelocation.m location-corelocation.h \
windows/appicon.rc \
windows/versioninfo.rc
@@ -69,16 +70,6 @@ redshift_LDADD += -lgdi32
endif
if ENABLE_GEOCLUE
redshift_SOURCES += location-geoclue.c location-geoclue.h
AM_CFLAGS += \
$(GEOCLUE_CFLAGS) $(GEOCLUE_LIBS) \
$(GLIB_CFLAGS) $(GLIB_LIBS)
redshift_LDADD += \
$(GEOCLUE_LIBS) $(GEOCLUE_CFLAGS)
$(GLIB_LIBS) $(GLIB_CFLAGS)
endif
if ENABLE_GEOCLUE2
redshift_SOURCES += location-geoclue2.c location-geoclue2.h
AM_CFLAGS += \
src/location-geoclue.c
-218
View File
@@ -1,218 +0,0 @@
/* location-geoclue.c -- Geoclue location provider source
This file is part of Redshift.
Redshift is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Redshift is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Redshift. If not, see <http://www.gnu.org/licenses/>.
Copyright (c) 2010 Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <geoclue/geoclue-master.h>
#include <geoclue/geoclue-position.h>
#include <glib.h>
#include <glib-object.h>
#include "location-geoclue.h"
#include "redshift.h"
#ifdef ENABLE_NLS
# include <libintl.h>
# define _(s) gettext(s)
#else
# define _(s) s
#endif
#define DEFAULT_PROVIDER "org.freedesktop.Geoclue.Providers.UbuntuGeoIP"
#define DEFAULT_PROVIDER_PATH "/org/freedesktop/Geoclue/Providers/UbuntuGeoIP"
int
location_geoclue_init(location_geoclue_state_t *state)
{
#if !GLIB_CHECK_VERSION(2, 35, 0)
g_type_init();
#endif
state->position = NULL;
state->provider = NULL;
state->provider_path = NULL;
return 0;
}
int
location_geoclue_start(location_geoclue_state_t *state)
{
if (state->provider && state->provider_path) {
state->position = geoclue_position_new(state->provider,
state->provider_path);
} else {
if (getenv("DISPLAY") == NULL || *getenv("DISPLAY") == '\0') {
/* TODO This (hack) should be removed when GeoClue has been patched. */
putenv("DISPLAY=:0");
}
GError *error = NULL;
GeoclueMaster *master = geoclue_master_get_default();
GeoclueMasterClient *client = geoclue_master_create_client(master,
NULL, &error);
g_object_unref(master);
if (client == NULL) {
if (error != NULL) {
g_printerr(_("Unable to obtain master client: %s\n"),
error->message);
g_error_free(error);
} else {
g_printerr(_("Unable to obtain master client\n"));
}
return -1;
}
if (!geoclue_master_client_set_requirements(client,
GEOCLUE_ACCURACY_LEVEL_REGION,
0, FALSE,
GEOCLUE_RESOURCE_NETWORK,
&error)) {
if (error != NULL) {
g_printerr(_("Can't set requirements for master: %s\n"),
error->message);
g_error_free(error);
} else {
g_printerr(_("Can't set requirements for master\n"));
}
g_object_unref(client);
return -1;
}
state->position = geoclue_master_client_create_position(client, NULL);
g_object_unref(client);
}
gchar *name = NULL;
if (geoclue_provider_get_provider_info(GEOCLUE_PROVIDER(state->position),
&name, NULL, NULL)) {
fprintf(stdout, _("Started Geoclue provider `%s'.\n"), name);
g_free(name);
} else {
fputs(_("Could not find a usable Geoclue provider.\n"), stderr);
fputs(_("Try setting name and path to specify which to use.\n"), stderr);
return -1;
}
return 0;
}
void
location_geoclue_free(location_geoclue_state_t *state)
{
if (state->position != NULL) g_object_unref(state->position);
free(state->provider);
free(state->provider_path);
}
void
location_geoclue_print_help(FILE *f)
{
fputs(_("Use the location as discovered by a Geoclue provider.\n"), f);
fputs("\n", f);
/* TRANSLATORS: Geoclue help output
left column must not be translated */
fputs(_(" name=N\tName of Geoclue provider (or `default')\n"
" path=N\tPath of Geoclue provider (or `default')\n"), f);
fputs("\n", f);
fprintf(f, _("NOTE: currently Redshift doesn't recheck %s once started,\n"
"which means it has to be restarted to take notice after travel.\n"),
"GeoClue");
fputs("\n", f);
}
int
location_geoclue_set_option(location_geoclue_state_t *state,
const char *key, const char *value)
{
const char *provider = NULL;
const char *path = NULL;
/* Parse string value */
if (strcasecmp(key, "name") == 0) {
if (strcasecmp(value, "default") == 0) {
provider = DEFAULT_PROVIDER;
} else {
provider = value;
}
state->provider = strdup(provider);
if (state->provider == NULL) {
perror("strdup");
return -1;
}
} else if (strcasecmp(key, "path") == 0) {
if (value != NULL && strcasecmp(value, "default") == 0) {
path = DEFAULT_PROVIDER_PATH;
} else {
path = value;
}
state->provider_path = strdup(path);
if (state->provider_path == NULL) {
perror("strdup");
return -1;
}
} else {
fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key);
return -1;
}
return 0;
}
int
location_geoclue_get_location(location_geoclue_state_t *state,
location_t *location)
{
GeocluePositionFields fields;
GError *error = NULL;
double latitude = 0, longitude = 0;
fields = geoclue_position_get_position(state->position, NULL,
&latitude, &longitude, NULL,
NULL, &error);
if (error) {
g_printerr(_("Could not get location: %s.\n"), error->message);
g_error_free(error);
return -1;
}
if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE &&
fields & GEOCLUE_POSITION_FIELDS_LONGITUDE) {
fprintf(stdout, _("According to the geoclue provider"
" we're at: %.2f, %.2f\n"),
latitude, longitude);
} else {
g_warning(_("Provider does not have a valid location available."));
return -1;
}
location->lat = latitude;
location->lon = longitude;
return 0;
}
src/location-geoclue.h
-46
View File
@@ -1,46 +0,0 @@
/* location-geoclue.h -- Geoclue location provider header
This file is part of Redshift.
Redshift is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Redshift is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Redshift. If not, see <http://www.gnu.org/licenses/>.
Copyright (c) 2010 Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
*/
#ifndef REDSHIFT_LOCATION_GEOCLUE_H
#define REDSHIFT_LOCATION_GEOCLUE_H
#include <stdio.h>
#include <geoclue/geoclue-position.h>
#include "redshift.h"
typedef struct {
GeocluePosition *position; /* main geoclue object */
char *provider; /* name of a geoclue provider */
char *provider_path; /* path of the geoclue provider */
} location_geoclue_state_t;
int location_geoclue_init(location_geoclue_state_t *state);
int location_geoclue_start(location_geoclue_state_t *state);
void location_geoclue_free(location_geoclue_state_t *state);
void location_geoclue_print_help(FILE *f);
int location_geoclue_set_option(location_geoclue_state_t *state,
const char *key, const char *value);
int location_geoclue_get_location(location_geoclue_state_t *state,
location_t *loc);
#endif /* ! REDSHIFT_LOCATION_GEOCLUE_H */
src/redshift.c
-21
View File
@@ -81,10 +81,6 @@
#include "location-manual.h"
#ifdef ENABLE_GEOCLUE
# include "location-geoclue.h"
#endif
#ifdef ENABLE_GEOCLUE2
# include "location-geoclue2.h"
#endif
@@ -195,28 +191,11 @@ static const gamma_method_t gamma_methods[] = {
/* Union of state data for location providers */
typedef union {
location_manual_state_t manual;
#ifdef ENABLE_GEOCLUE
location_geoclue_state_t geoclue;
#endif
} location_state_t;
/* Location provider method structs */
static const location_provider_t location_providers[] = {
#ifdef ENABLE_GEOCLUE
{
"geoclue",
(location_provider_init_func *)location_geoclue_init,
(location_provider_start_func *)location_geoclue_start,
(location_provider_free_func *)location_geoclue_free,
(location_provider_print_help_func *)
location_geoclue_print_help,
(location_provider_set_option_func *)
location_geoclue_set_option,
(location_provider_get_location_func *)
location_geoclue_get_location
},
#endif
#ifdef ENABLE_GEOCLUE2
{
"geoclue2",