Commit 766fd548 authored by Keith Preston's avatar Keith Preston

World's largest Change..... Updated Position API to hopefully useful and...

World's largest Change.....  Updated Position API to hopefully useful and stable point.   All the backends have gotten upgraded to the new api.   Still need to do some work with geoclue master forwarding request, but currently you must manually specify the backend AKA look at geoclue-position-example hostip
parent 2c371ecb
Keith Preston <keithpre@gmail.com>
Jussi Kukkonen
SUBDIRS = geoclue example data @EXTRA_SUBDIRS@
SUBDIRS = geoclue example data doxygen @EXTRA_SUBDIRS@
EXTRA_DIST = geoclue.pc.in
DISTCLEANFILES = geoclue.pc
......
#! /bin/sh
LIBTOOLIZE=libtoolize
AUTOMAKE=automake-1.8
ACLOCAL=aclocal-1.8
AUTOMAKE=automake
ACLOCAL=aclocal
AUTOCONF=autoconf
AUTOHEADER=autoheader
......
/* Geomap - A DBus api and wrapper for getting geography pictures
* Copyright (C) 2006 Garmin
* Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
*
*
* This library is free software; you can redistribute it and/or
......
/* Geomap - A DBus api and wrapper for getting geography pictures
* Copyright (C) 2006 Garmin
* Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
*
*
* This library is free software; you can redistribute it and/or
......@@ -28,9 +28,9 @@
#include <string.h>
#define GEOCLUE_MAP_DBUS_SERVICE "org.foinse_project.geoclue.map"
#define GEOCLUE_MAP_DBUS_PATH "/org/foinse_project/geoclue/map"
#define GEOCLUE_MAP_DBUS_INTERFACE "org.foinse_project.geoclue.map"
#define GEOCLUE_MAP_DBUS_SERVICE "org.freedesktop.geoclue.map"
#define GEOCLUE_MAP_DBUS_PATH "/org/freedesktop/geoclue/map"
#define GEOCLUE_MAP_DBUS_INTERFACE "org.freedesktop.geoclue.map"
......
/* Geomap - A DBus api and wrapper for getting geography pictures
* Copyright (C) 2006 Garmin
* Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
*
*
* This library is free software; you can redistribute it and/or
......
/* Geomap - A DBus api and wrapper for getting geography pictures
* Copyright (C) 2006 Garmin
* Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
*
*
* This library is free software; you can redistribute it and/or
......
/* Geomap - A DBus api and wrapper for getting geography pictures
* Copyright (C) 2006 Garmin
* Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
*
*
* This library is free software; you can redistribute it and/or
......@@ -27,8 +27,8 @@
#include <stdio.h>
#include <string.h>
#define GEOCLUE_POSITION_DBUS_SERVICE "org.foinse_project.geoclue.position"
#define GEOCLUE_POSITION_DBUS_PATH "/org/foinse_project/geoclue/position"
#define GEOCLUE_POSITION_DBUS_SERVICE "org.freedesktop.geoclue.position"
#define GEOCLUE_POSITION_DBUS_PATH "/org/freedesktop/geoclue/position"
......
......@@ -18,5 +18,16 @@ typedef enum
} GeocluePositionError;
typedef enum position_status
{
GEOCLUE_POSITION_NO_SERVICE_AVAILABLE = 0,
GEOCLUE_POSITION_ACQUIRING_ALTITUDE = 1,
GEOCLUE_POSITION_ACQUIRING_LONGITUDE = 2,
GEOCLUE_POSITION_ACQUIRING_LATITUDE = 4,
GEOCLUE_POSITION_ALTITUDE_AVAILABLE = 8,
GEOCLUE_POSITION_LONGITUDE_AVAILABLE = 16,
GEOCLUE_POSITION_LATITUDE_AVAILABLE = 32
} position_status;
#endif /* __GEOCLUE_POSITION_ERROR_H__ */
......@@ -2,7 +2,7 @@ bin_PROGRAMS = geoclue-geocode-server-yahoo
geoclue_geocode_server_yahoo_SOURCES = geoclue_geocode_server_yahoo.c
service_in_files = org.foinse_project.geoclue.geocode.yahoo.service.in
service_in_files = org.freedesktop.geoclue.geocode.yahoo.service.in
service_files = $(service_in_files:.service.in=.service)
......
/* Geoclue - A DBus api and wrapper for geography information
* Copyright (C) 2006 Garmin
* Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
*
*
* This library is free software; you can redistribute it and/or
......
/* Geoclue - A DBus api and wrapper for geography information
* Copyright (C) 2006 Garmin
* Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
*
*
* This library is free software; you can redistribute it and/or
......@@ -26,9 +26,9 @@
#include <glib.h>
#include <stdio.h>
#include <string.h>
#define GEOCLUE_GEOCODE_DBUS_SERVICE "org.foinse_project.geoclue.geocode.yahoo"
#define GEOCLUE_GEOCODE_DBUS_PATH "/org/foinse_project/geoclue/geocode/yahoo"
#define GEOCLUE_GEOCODE_DBUS_INTERFACE "org.foinse_project.geoclue.geocode"
#define GEOCLUE_GEOCODE_DBUS_SERVICE "org.freedesktop.geoclue.geocode.yahoo"
#define GEOCLUE_GEOCODE_DBUS_PATH "/org/freedesktop/geoclue/geocode/yahoo"
#define GEOCLUE_GEOCODE_DBUS_INTERFACE "org.freedesktop.geoclue.geocode"
......
org.foinse_project.geoclue.geocode.yahoo
/org/foinse_project/geoclue/geocode/yahoo
org.foinse_project.geoclue.geocode
org.freedesktop.geoclue.geocode.yahoo
/org/freedesktop/geoclue/geocode/yahoo
org.freedesktop.geoclue.geocode
Yahoo Geocoding API
\ No newline at end of file
[D-BUS Service]
Name=org.foinse_project.geoclue.geocode.yahoo
Name=org.freedesktop.geoclue.geocode.yahoo
Exec=@execdir@/geoclue-geocode-server-yahoo
......@@ -3,7 +3,7 @@ bin_PROGRAMS = geoclue-map-server-yahoo
geoclue_map_server_yahoo_SOURCES = geoclue_map_server_yahoo.c \
geoclue_map_signal_marshal.c
service_in_files = org.foinse_project.geoclue.map.yahoo.service.in
service_in_files = org.freedesktop.geoclue.map.yahoo.service.in
service_files = $(service_in_files:.service.in=.service)
......
/* Geoclue - A DBus api and wrapper for geography information
* Copyright (C) 2006 Garmin
* Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
*
*
* This library is free software; you can redistribute it and/or
......
/* Geoclue - A DBus api and wrapper for geography information
* Copyright (C) 2006 Garmin
* Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
*
*
* This library is free software; you can redistribute it and/or
......@@ -26,9 +26,9 @@
#include <glib.h>
#include <stdio.h>
#include <string.h>
#define GEOCLUE_MAP_DBUS_SERVICE "org.foinse_project.geoclue.map.yahoo"
#define GEOCLUE_MAP_DBUS_PATH "/org/foinse_project/geoclue/map/yahoo"
#define GEOCLUE_MAP_DBUS_INTERFACE "org.foinse_project.geoclue.map"
#define GEOCLUE_MAP_DBUS_SERVICE "org.freedesktop.geoclue.map.yahoo"
#define GEOCLUE_MAP_DBUS_PATH "/org/freedesktop/geoclue/map/yahoo"
#define GEOCLUE_MAP_DBUS_INTERFACE "org.freedesktop.geoclue.map"
......
org.foinse_project.geoclue.map.yahoo
/org/foinse_project/geoclue/map/yahoo
org.foinse_project.geoclue.map
org.freedesktop.geoclue.map.yahoo
/org/freedesktop/geoclue/map/yahoo
org.freedesktop.geoclue.map
Yahoo Maps API
\ No newline at end of file
[D-BUS Service]
Name=org.foinse_project.geoclue.map.yahoo
Name=org.freedesktop.geoclue.map.yahoo
Exec=@execdir@/geoclue-map-server-yahoo
......@@ -5,7 +5,7 @@ geoclue_position_server_gpsd_SOURCES = geoclue_position_server_gpsd.c \
../geoclue_position_error.c
service_in_files = org.foinse_project.geoclue.position.gpsd.service.in
service_in_files = org.freedesktop.geoclue.position.gpsd.service.in
service_files = $(service_in_files:.service.in=.service)
......
/* Geoclue - A DBus api and wrapper for geography information
* Copyright (C) 2006 Garmin
* Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
*
*
* This library is free software; you can redistribute it and/or
......@@ -25,9 +25,9 @@
#include <dbus/dbus-glib.h>
#include <glib.h>
#define GEOCLUE_POSITION_DBUS_SERVICE "org.foinse_project.geoclue.position.gpsd"
#define GEOCLUE_POSITION_DBUS_PATH "/org/foinse_project/geoclue/position/gpsd"
#define GEOCLUE_POSITION_DBUS_INTERFACE "org.foinse_project.geoclue.position"
#define GEOCLUE_POSITION_DBUS_SERVICE "org.freedesktop.geoclue.position.gpsd"
#define GEOCLUE_POSITION_DBUS_PATH "/org/freedesktop/geoclue/position/gpsd"
#define GEOCLUE_POSITION_DBUS_INTERFACE "org.freedesktop.geoclue.position"
#include "gps.h"
......@@ -51,8 +51,29 @@ struct GeocluePositionClass
GObjectClass parent;
DBusGConnection *connection;
/* Signals */
void (*current_position_changed) (GeocluePosition*, gdouble, gdouble );
/* Signals */
void (*current_position_changed) ( GeocluePosition* server,
gint timestamp,
gdouble lat,
gdouble lon,
gdouble altitude );
void (*civic_location_changed) ( GeocluePosition* server,
char* country,
char* region,
char* locality,
char* area,
char* postalcode,
char* street,
char* building,
char* floor,
char* room,
char* description,
char* text );
void (*service_status_changed) ( GeocluePosition* server,
gint status,
char* user_message );
};
#define TYPE_GEOCLUE_POSITION (geoclue_position_get_type ())
......@@ -62,49 +83,79 @@ struct GeocluePositionClass
#define IS_GEOCLUE_POSITION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GEOCLUE_POSITION))
#define GEOCLUE_POSITION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GEOCLUE_POSITION, GeocluePositionClass))
gboolean geoclue_position_version (GeocluePosition *obj, gint* OUT_major, gint* OUT_minor, gint* OUT_micro, GError **error);
gboolean geoclue_position_service_provider(GeocluePosition *obj, char** name, GError **error);
gboolean geoclue_position_current_position(GeocluePosition *obj, gdouble* OUT_latitude, gdouble* OUT_longitude, GError **error );
gboolean geoclue_position_current_position_error(GeocluePosition *obj, gdouble* OUT_latitude_error, gdouble* OUT_longitude_error, GError **error );
gboolean geoclue_position_current_altitude(GeocluePosition *obj, gdouble* OUT_altitude, GError **error );
gboolean geoclue_position_current_velocity(GeocluePosition *obj, gdouble* OUT_north_velocity, gdouble* OUT_east_velocity, GError **error );
gboolean geoclue_position_current_time(GeocluePosition *obj, gint* OUT_year, gint* OUT_month, gint* OUT_day, gint* OUT_hours, gint* OUT_minutes, gint* OUT_seconds, GError **error );
gboolean geoclue_position_satellites_in_view(GeocluePosition *obj, GArray** OUT_prn_numbers, GError **error );
gboolean geoclue_position_satellites_data(GeocluePosition *obj, const gint IN_prn_number, gdouble* OUT_elevation, gdouble* OUT_azimuth, gdouble* OUT_signal_noise_ratio, GError **error );
gboolean geoclue_position_sun_rise(GeocluePosition *obj, const gdouble IN_latitude, const gdouble IN_longitude, const gint IN_year, const gint IN_month, const gint IN_day, gint* OUT_hours, gint* OUT_minutes, gint* OUT_seconds, GError **error );
gboolean geoclue_position_sun_set(GeocluePosition *obj, const gdouble IN_latitude, const gdouble IN_longitude, const gint IN_year, const gint IN_month, const gint IN_day, gint* OUT_hours, gint* OUT_minutes, gint* OUT_seconds, GError **error );
gboolean geoclue_position_moon_rise(GeocluePosition *obj, const gdouble IN_latitude, const gdouble IN_longitude, const gint IN_year, const gint IN_month, const gint IN_day, gint* OUT_hours, gint* OUT_minutes, gint* OUT_seconds, GError **error );
gboolean geoclue_position_moon_set(GeocluePosition *obj, const gdouble IN_latitude, const gdouble IN_longitude, const gint IN_year, const gint IN_month, const gint IN_day, gint* OUT_hours, gint* OUT_minutes, gint* OUT_seconds, GError **error );
gboolean geoclue_position_civic_location (GeocluePosition* obj,
char** OUT_country,
char** OUT_region,
char** OUT_locality,
char** OUT_area,
char** OUT_postalcode,
char** OUT_street,
char** OUT_building,
char** OUT_floor,
char** OUT_room,
char** OUT_text,
GError** error);
gboolean geoclue_position_civic_location_supports (GeocluePosition* obj,
gboolean* OUT_country,
gboolean* OUT_region,
gboolean* OUT_locality,
gboolean* OUT_area,
gboolean* OUT_postalcode,
gboolean* OUT_street,
gboolean* OUT_building,
gboolean* OUT_floor,
gboolean* OUT_room,
gboolean* OUT_text,
GError** error);
gboolean geoclue_position_service_available(GeocluePosition *obj, gboolean* OUT_available, char** OUT_reason, GError** error);
gboolean geoclue_position_shutdown(GeocluePosition *obj, GError** error);
gboolean geoclue_position_version( GeocluePosition* server,
int* major,
int* minor,
int* micro,
GError **error);
gboolean geoclue_position_service_name( GeocluePosition* server,
char** name,
GError **error);
gboolean geoclue_position_current_position ( GeocluePosition* server,
gint* OUT_timestamp,
gdouble* OUT_latitude,
gdouble* OUT_longitude,
gdouble* OUT_altitude,
GError **error);
gboolean geoclue_position_current_position_error( GeocluePosition* server,
gdouble* OUT_latitude_error,
gdouble* OUT_longitude_error,
gdouble* OUT_altitude_error,
GError **error);
gboolean geoclue_position_service_status ( GeocluePosition* server,
gint* OUT_status,
char** OUT_string,
GError **error);
gboolean geoclue_position_current_velocity ( GeocluePosition* server,
gint* OUT_timestamp,
gdouble* OUT_north_velocity,
gdouble* OUT_east_velocity,
gdouble* OUT_altitude_velocity,
GError **error);
gboolean geoclue_position_satellites_in_view ( GeocluePosition* server,
GArray** OUT_prn_numbers,
GError **error);
gboolean geoclue_position_satellites_data ( GeocluePosition* server,
const gint IN_prn_number,
gdouble* OUT_elevation,
gdouble* OUT_azimuth,
gdouble* OUT_signal_noise_ratio,
gboolean* OUT_differential,
gboolean* OUT_ephemeris,
GError **error);
gboolean geoclue_position_civic_location ( GeocluePosition* server,
char** OUT_country,
char** OUT_region,
char** OUT_locality,
char** OUT_area,
char** OUT_postalcode,
char** OUT_street,
char** OUT_building,
char** OUT_floor,
char** OUT_description,
char** OUT_room,
char** OUT_text,
GError **error);
gboolean geoclue_position_shutdown( GeocluePosition *obj,
GError** error);
......
[D-BUS Service]
Name=org.foinse_project.geoclue.position.gpsd
Name=org.freedesktop.geoclue.position.gpsd
Exec=@execdir@/geoclue-position-server-gpsd
org.foinse_project.geoclue.position.gpsd
/org/foinse_project/geoclue/position/gpsd
org.foinse_project.geoclue.position
org.freedesktop.geoclue.position.gpsd
/org/freedesktop/geoclue/position/gpsd
org.freedesktop.geoclue.position
gpsd position API
\ No newline at end of file
......@@ -4,7 +4,7 @@ geoclue_position_server_hostip_SOURCES = geoclue_position_server_hostip.c \
geoclue_position_signal_marshal.c \
../geoclue_position_error.c
service_in_files = org.foinse_project.geoclue.position.hostip.service.in
service_in_files = org.freedesktop.geoclue.position.hostip.service.in
service_files = $(service_in_files:.service.in=.service)
......
/* Geoclue - A DBus api and wrapper for geography information
* Copyright (C) 2006 Garmin
* Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
*
*
* This library is free software; you can redistribute it and/or
......@@ -34,9 +34,9 @@
#include <conicconnection.h>
#endif
#define GEOCLUE_POSITION_DBUS_SERVICE "org.foinse_project.geoclue.position.hostip"
#define GEOCLUE_POSITION_DBUS_PATH "/org/foinse_project/geoclue/position/hostip"
#define GEOCLUE_POSITION_DBUS_INTERFACE "org.foinse_project.geoclue.position"
#define GEOCLUE_POSITION_DBUS_SERVICE "org.freedesktop.geoclue.position.hostip"
#define GEOCLUE_POSITION_DBUS_PATH "/org/freedesktop/geoclue/position/hostip"
#define GEOCLUE_POSITION_DBUS_INTERFACE "org.freedesktop.geoclue.position"
G_BEGIN_DECLS
......@@ -78,9 +78,29 @@ struct GeocluePositionClass
GObjectClass parent;
DBusGConnection *connection;
/* Signals */
void (*current_position_changed) (GeocluePosition*, gdouble, gdouble );
void (*civic_location_changed) (GeocluePosition*, gchar*, gchar*, gchar*, gchar*, gchar*, gchar*, gchar*, gchar*, gchar*, gchar*, gchar*);
/* Signals */
void (*current_position_changed) ( GeocluePosition* server,
gint timestamp,
gdouble lat,
gdouble lon,
gdouble altitude );
void (*civic_location_changed) ( GeocluePosition* server,
char* country,
char* region,
char* locality,
char* area,
char* postalcode,
char* street,
char* building,
char* floor,
char* room,
char* description,
char* text );
void (*service_status_changed) ( GeocluePosition* server,
gint status,
char* user_message );
};
#define TYPE_GEOCLUE_POSITION (geoclue_position_get_type ())
......@@ -90,51 +110,80 @@ struct GeocluePositionClass
#define IS_GEOCLUE_POSITION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GEOCLUE_POSITION))
#define GEOCLUE_POSITION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GEOCLUE_POSITION, GeocluePositionClass))
gboolean geoclue_position_version (GeocluePosition *obj, gint* OUT_major, gint* OUT_minor, gint* OUT_micro, GError **error);
gboolean geoclue_position_service_provider(GeocluePosition *obj, char** name, GError **error);
gboolean geoclue_position_current_position(GeocluePosition *obj, gdouble* OUT_latitude, gdouble* OUT_longitude, GError **error );
gboolean geoclue_position_current_position_error(GeocluePosition *obj, gdouble* OUT_latitude_error, gdouble* OUT_longitude_error, GError **error );
gboolean geoclue_position_current_altitude(GeocluePosition *obj, gdouble* OUT_altitude, GError **error );
gboolean geoclue_position_current_velocity(GeocluePosition *obj, gdouble* OUT_north_velocity, gdouble* OUT_east_velocity, GError **error );
gboolean geoclue_position_current_time(GeocluePosition *obj, gint* OUT_year, gint* OUT_month, gint* OUT_day, gint* OUT_hours, gint* OUT_minutes, gint* OUT_seconds, GError **error );
gboolean geoclue_position_satellites_in_view(GeocluePosition *obj, GArray** OUT_prn_numbers, GError **error );
gboolean geoclue_position_satellites_data(GeocluePosition *obj, const gint IN_prn_number, gdouble* OUT_elevation, gdouble* OUT_azimuth, gdouble* OUT_signal_noise_ratio, GError **error );
gboolean geoclue_position_sun_rise(GeocluePosition *obj, const gdouble IN_latitude, const gdouble IN_longitude, const gint IN_year, const gint IN_month, const gint IN_day, gint* OUT_hours, gint* OUT_minutes, gint* OUT_seconds, GError **error );
gboolean geoclue_position_sun_set(GeocluePosition *obj, const gdouble IN_latitude, const gdouble IN_longitude, const gint IN_year, const gint IN_month, const gint IN_day, gint* OUT_hours, gint* OUT_minutes, gint* OUT_seconds, GError **error );
gboolean geoclue_position_moon_rise(GeocluePosition *obj, const gdouble IN_latitude, const gdouble IN_longitude, const gint IN_year, const gint IN_month, const gint IN_day, gint* OUT_hours, gint* OUT_minutes, gint* OUT_seconds, GError **error );
gboolean geoclue_position_moon_set(GeocluePosition *obj, const gdouble IN_latitude, const gdouble IN_longitude, const gint IN_year, const gint IN_month, const gint IN_day, gint* OUT_hours, gint* OUT_minutes, gint* OUT_seconds, GError **error );
gboolean geoclue_position_civic_location (GeocluePosition* obj,
char** OUT_country,
char** OUT_region,
char** OUT_locality,
char** OUT_area,
char** OUT_postalcode,
char** OUT_street,
char** OUT_building,
char** OUT_floor,
char** OUT_room,
char** OUT_description,
char** OUT_text,
GError** error);
gboolean geoclue_position_civic_location_supports (GeocluePosition* obj,
gboolean* OUT_country,
gboolean* OUT_region,
gboolean* OUT_locality,
gboolean* OUT_area,
gboolean* OUT_postalcode,
gboolean* OUT_street,
gboolean* OUT_building,
gboolean* OUT_floor,
gboolean* OUT_room,
gboolean* OUT_description,
gboolean* OUT_text,
GError** error);
gboolean geoclue_position_service_available(GeocluePosition *obj, gboolean* OUT_available, char** OUT_reason, GError** error);
gboolean geoclue_position_shutdown(GeocluePosition *obj, GError** error);
gboolean geoclue_position_version( GeocluePosition* server,
int* major,
int* minor,
int* micro,
GError **error);
gboolean geoclue_position_service_name( GeocluePosition* server,
char** name,
GError **error);
gboolean geoclue_position_current_position ( GeocluePosition* server,
gint* OUT_timestamp,
gdouble* OUT_latitude,
gdouble* OUT_longitude,
gdouble* OUT_altitude,
GError **error);
gboolean geoclue_position_current_position_error( GeocluePosition* server,
gdouble* OUT_latitude_error,
gdouble* OUT_longitude_error,
gdouble* OUT_altitude_error,
GError **error);
gboolean geoclue_position_service_status ( GeocluePosition* server,
gint* OUT_status,
char** OUT_string,
GError **error);
gboolean geoclue_position_current_velocity ( GeocluePosition* server,
gint* OUT_timestamp,
gdouble* OUT_north_velocity,
gdouble* OUT_east_velocity,
gdouble* OUT_altitude_velocity,
GError **error);
gboolean geoclue_position_satellites_in_view ( GeocluePosition* server,
GArray** OUT_prn_numbers,
GError **error);
gboolean geoclue_position_satellites_data ( GeocluePosition* server,
const gint IN_prn_number,
gdouble* OUT_elevation,
gdouble* OUT_azimuth,
gdouble* OUT_signal_noise_ratio,
gboolean* OUT_differential,
gboolean* OUT_ephemeris,
GError **error);
gboolean geoclue_position_civic_location ( GeocluePosition* server,
char** OUT_country,
char** OUT_region,
char** OUT_locality,
char** OUT_area,
char** OUT_postalcode,
char** OUT_street,
char** OUT_building,
char** OUT_floor,
char** OUT_description,
char** OUT_room,
char** OUT_text,
GError **error);
gboolean geoclue_position_shutdown( GeocluePosition *obj,
GError** error);
......
[D-BUS Service]
Name=org.foinse_project.geoclue.position.hostip
Name=org.freedesktop.geoclue.position.hostip
Exec=@execdir@/geoclue-position-server-hostip
org.foinse_project.geoclue.position.hostip
/org/foinse_project/geoclue/position/hostip
org.foinse_project.geoclue.position
org.freedesktop.geoclue.position.hostip
/org/freedesktop/geoclue/position/hostip
org.freedesktop.geoclue.position
www.hostip.info position API
\ No newline at end of file
......@@ -8,7 +8,7 @@ AM_CPPFLAGS = $(YAHOO_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS) ../../geoclue/libgeoclue.la
service_in_files = org.foinse_project.geoclue.position.manual.service.in
service_in_files = org.freedesktop.geoclue.position.manual.service.in
service_files = $(service_in_files:.service.in=.service)
......
/* Geoclue - A DBus api and wrapper for geography information
* Copyright (C) 2006 Garmin
* Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
*
*
* This library is free software; you can redistribute it and/or
......@@ -25,9 +25,9 @@
#include <dbus/dbus-glib.h>
#include <glib.h>
#define GEOCLUE_POSITION_DBUS_SERVICE "org.foinse_project.geoclue.position.manual"
#define GEOCLUE_POSITION_DBUS_PATH "/org/foinse_project/geoclue/position/manual"
#define GEOCLUE_POSITION_DBUS_INTERFACE "org.foinse_project.geoclue.position"
#define GEOCLUE_POSITION_DBUS_SERVICE "org.freedesktop.geoclue.position.manual"
#define GEOCLUE_POSITION_DBUS_PATH "/org/freedesktop/geoclue/position/manual"
#define GEOCLUE_POSITION_DBUS_INTERFACE "org.freedesktop.geoclue.position"
G_BEGIN_DECLS
......@@ -47,8 +47,30 @@ struct GeocluePositionClass
GObjectClass parent;
DBusGConnection *connection;
/* Signals */
void (*current_position_changed) (GeocluePosition*, gdouble, gdouble );
/* Signals */
void (*current_position_changed) ( GeocluePosition* server,
gint timestamp,
gdouble lat,
gdouble lon,
gdouble altitude );
void (*civic_location_changed) ( GeocluePosition* server,
char* country,
char* region,
char* locality,
char* area,
char* postalcode,
char* street,
char* building,
char* floor,
char* room,
char* description,
char* text );
void (*service_status_changed) ( GeocluePosition* server,
gint status,
char* user_message );
};
#define TYPE_GEOCLUE_POSITION (geoclue_position_get_type ())
......@@ -58,49 +80,79 @@ struct GeocluePositionClass
#define IS_GEOCLUE_POSITION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GEOCLUE_POSITION))
#define GEOCLUE_POSITION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GEOCLUE_POSITION, GeocluePositionClass))
gboolean geoclue_position_version (GeocluePosition *obj, gint* OUT_major, gint* OUT_minor, gint* OUT_micro, GError **error);
gboolean geoclue_position_service_provider(GeocluePosition *obj, char** name, GError **error);
gboolean geoclue_position_current_position(GeocluePosition *obj, gdouble* OUT_latitude, gdouble* OUT_longitude, GError **error );
gboolean geoclue_position_current_position_error(GeocluePosition *obj, gdouble* OUT_latitude_error, gdouble* OUT_longitude_error, GError **error );
gboolean geoclue_position_current_altitude(GeocluePosition *obj, gdouble* OUT_altitude, GError **error );
gboolean geoclue_position_current_velocity(GeocluePosition *obj, gdouble* OUT_north_velocity, gdouble* OUT_east_velocity, GError **error );
gboolean geoclue_position_current_time(GeocluePosition *obj, gint* OUT_year, gint* OUT_month, gint* OUT_day, gint* OUT_hours, gint* OUT_minutes, gint* OUT_seconds, GError **error );
gboolean geoclue_position_satellites_in_view(GeocluePosition *obj, GArray** OUT_prn_numbers, GError **error );
gboolean geoclue_position_satellites_data(GeocluePosition *obj, const gint IN_prn_number, gdouble* OUT_elevation, gdouble* OUT_azimuth, gdouble* OUT_signal_noise_ratio, GError **error );
gboolean geoclue_position_sun_rise(GeocluePosition *obj, const gdouble IN_latitude, const gdouble IN_longitude, const gint IN_year, const gint IN_month, const gint IN_day, gint* OUT_hours, gint* OUT_minutes, gint<