aboutsummaryrefslogtreecommitdiffstats
path: root/src/redshift.c
diff options
context:
space:
mode:
authorJon Lund Steffensen <jonlst@gmail.com>2014-12-15 01:53:59 -0500
committerJon Lund Steffensen <jonlst@gmail.com>2014-12-15 01:53:59 -0500
commitdc78015f323f5ed3c3b7a9f2e6d9c1edcd9f77e2 (patch)
tree0e3eaac5fabbf426845423da85eda27c5297323b /src/redshift.c
parentsystemtime: Use gettimeofday if POSIX timers not available (diff)
parentcontrib: Update RPM spec to use GeoClue2 (diff)
downloadredshift-ng-dc78015f323f5ed3c3b7a9f2e6d9c1edcd9f77e2.tar.gz
redshift-ng-dc78015f323f5ed3c3b7a9f2e6d9c1edcd9f77e2.tar.bz2
redshift-ng-dc78015f323f5ed3c3b7a9f2e6d9c1edcd9f77e2.tar.xz
Merge branch 'geoclue2-provider'
Add GeoClue2 location provider
Diffstat (limited to 'src/redshift.c')
-rw-r--r--src/redshift.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/redshift.c b/src/redshift.c
index 3f22f56..0c9a6bd 100644
--- a/src/redshift.c
+++ b/src/redshift.c
@@ -14,7 +14,7 @@
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) 2013 Jon Lund Steffensen <jonlst@gmail.com>
+ Copyright (c) 2009-2014 Jon Lund Steffensen <jonlst@gmail.com>
*/
#ifdef HAVE_CONFIG_H
@@ -76,6 +76,10 @@
# include "location-geoclue.h"
#endif
+#ifdef ENABLE_GEOCLUE2
+# include "location-geoclue2.h"
+#endif
+
/* Union of state data for gamma adjustment methods */
typedef union {
@@ -183,6 +187,20 @@ static const location_provider_t location_providers[] = {
location_geoclue_get_location
},
#endif
+#ifdef ENABLE_GEOCLUE2
+ {
+ "geoclue2",
+ (location_provider_init_func *)location_geoclue2_init,
+ (location_provider_start_func *)location_geoclue2_start,
+ (location_provider_free_func *)location_geoclue2_free,
+ (location_provider_print_help_func *)
+ location_geoclue2_print_help,
+ (location_provider_set_option_func *)
+ location_geoclue2_set_option,
+ (location_provider_get_location_func *)
+ location_geoclue2_get_location
+ },
+#endif
{
"manual",
(location_provider_init_func *)location_manual_init,