Commit 27c9eaf2 authored by Keith Preston's avatar Keith Preston

:Added hostip.info and yahoo geocoding. Working on dynamic registration for...

:Added hostip.info and yahoo geocoding.   Working on dynamic registration for master as it is now hard coded.
parent 7ebbbf74
SUBDIRS = map_yahoo position_manual
SUBDIRS = map_yahoo position_manual geocode_yahoo position_hostip
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_files = $(service_in_files:.service.in=.service)
# D-Bus service descriptor installation
servicedir = $(DBUS_SERVICES_DIR)
service_DATA = $(service_files)
execdir = @bindir@
$(service_DATA): $(service_in_files) Makefile
for f in $(service_in_files) ; do \
sed -e 's;@execdir@;$(execdir);' $< > $@ ;\
done
AM_CPPFLAGS = $(YAHOO_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS)
EXTRA_DIST = \
$(service_in_files)
BUILT_SOURCES = \
geoclue_geocode_server_glue.h \
$(service_files)
CLEANFILES = \
geoclue_geocode_server_glue.h \
$(service_files)
geoclue_geocode_server_glue.h:../../geoclue/geocode_glue.xml
$(DBUS_BINDING_TOOL) --prefix=geoclue_geocode --mode=glib-server $< | sed 's;\data = user_data;\data = (DBusGAsyncData\*)user_data;g' > $@
This diff is collapsed.
/* Geomap - A DBus api and wrapper for getting geography pictures
* Copyright (C) 2006 Garmin
*
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License version 2 as published by the Free Software Foundation;
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GEOCLUE_GEOCODE_SERVER_H__
#define __GEOCLUE_GEOCODE_SERVER_H__
#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus-glib.h>
#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"
G_BEGIN_DECLS
//Let's create a geoclue_map object that has one method of geoclue_map
typedef struct GeoclueGeocode GeoclueGeocode;
typedef struct GeoclueGeocodeClass GeoclueGeocodeClass;
GType geoclue_map_get_type (void);
struct GeoclueGeocode
{
GObject parent;
};
struct GeoclueGeocodeClass
{
GObjectClass parent;
DBusGConnection *connection;
};
#define TYPE_GEOCLUE_GEOCODE (geoclue_geocode_get_type ())
#define GEOCLUE_GEOCODE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TYPE_GEOCLUE_GEOCODE, GeoclueGeocode))
#define GEOCLUE_GEOCODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GEOCLUE_GEOCODE, GeoclueGeocodeClass))
#define IS_GEOCLUE_GEOCODE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TYPE_GEOCLUE_GEOCODE))
#define IS_GEOCLUE_GEOCODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GEOCLUE_GEOCODE))
#define GEOCLUE_GEOCODE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GEOCLUE_GEOCODE, GeoclueGeocodeClass))
gboolean geoclue_geocode_version (GeoclueGeocode *obj, gint* OUT_major, gint* OUT_minor, gint* OUT_micro, GError **error);
gboolean geoclue_geocode_service_provider(GeoclueGeocode *obj, char** name, GError **error);
gboolean geoclue_geocode_to_lat_lon (GeoclueGeocode *obj, const char * IN_street, const char * IN_city, const char * IN_state, const char * IN_zip, gdouble* OUT_latitude, gdouble* OUT_longitude, gint* OUT_return_code, GError **error );
gboolean geoclue_geocode_free_text_to_lat_lon (GeoclueGeocode *obj, const char * IN_free_text, gdouble* OUT_latitude, gdouble* OUT_longitude, gint* OUT_return_code, GError **error );
gboolean geoclue_geocode_lat_lon_to_address(GeoclueGeocode *obj, gdouble IN_latitude, gdouble IN_longitude, char ** OUT_street, char ** OUT_city, char ** OUT_state, char ** OUT_zip, gint* OUT_return_code, GError **error );
G_END_DECLS
#endif
[D-BUS Service]
Name=org.foinse_project.geoclue.geocode.yahoo
Exec=@execdir@/geoclue-geocode-server-yahoo
......@@ -3,21 +3,38 @@ 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_files = $(service_in_files:.service.in=.service)
# D-Bus service descriptor installation
servicedir = $(DBUS_SERVICES_DIR)
service_DATA = $(service_files)
execdir = @bindir@
$(service_DATA): $(service_in_files) Makefile
for f in $(service_in_files) ; do \
sed -e 's;@execdir@;$(execdir);' $< > $@ ;\
done
AM_CPPFLAGS = $(YAHOO_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS)
EXTRA_DIST = \
$(service_in_files)
BUILT_SOURCES = \
geoclue_map_signal_marshal.c \
geoclue_map_signal_marshal.h \
geoclue_map_server_glue.h
geoclue_map_server_glue.h \
$(service_files)
CLEANFILES = \
geoclue_map_signal_marshal.c \
geoclue_map_signal_marshal.h \
geoclue_map_server_glue.h
geoclue_map_server_glue.h \
$(service_files)
geoclue_map_server_glue.h:../../geoclue/map_glue.xml
$(DBUS_BINDING_TOOL) --prefix=geoclue_map --mode=glib-server $< | sed 's;\data = user_data;\data = (DBusGAsyncData\*)user_data;g' > $@
......
[D-BUS Service]
Name=org.foinse_project.geoclue.map.yahoo
Exec=@execdir@/geoclue-map-server-yahoo
bin_PROGRAMS = geoclue-position-server-hostip
geoclue_position_server_hostip_SOURCES = geoclue_position_server_hostip.c \
geoclue_position_signal_marshal.c
service_in_files = org.foinse_project.geoclue.position.hostip.service.in
service_files = $(service_in_files:.service.in=.service)
# D-Bus service descriptor installation
servicedir = $(DBUS_SERVICES_DIR)
service_DATA = $(service_files)
execdir = @bindir@
$(service_DATA): $(service_in_files) Makefile
for f in $(service_in_files) ; do \
sed -e 's;@execdir@;$(execdir);' $< > $@ ;\
done
AM_CPPFLAGS = $(YAHOO_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS) ../../geoclue/libgeoclue.la
EXTRA_DIST = \
$(service_in_files)
BUILT_SOURCES = \
geoclue_position_signal_marshal.c \
geoclue_position_signal_marshal.h \
geoclue_position_server_glue.h \
$(service_files)
CLEANFILES = \
geoclue_position_signal_marshal.c \
geoclue_position_signal_marshal.h \
geoclue_position_server_glue.h \
$(service_files)
geoclue_position_server_glue.h:../../geoclue/position_glue.xml
$(DBUS_BINDING_TOOL) --prefix=geoclue_position --mode=glib-server $< | sed 's;\data = user_data;\data = (DBusGAsyncData\*)user_data;g' > $@
geoclue_position_signal_marshal.h:../../geoclue/position_signal_marshal.list
glib-genmarshal --prefix _geoclue_position --header $< > $@
geoclue_position_signal_marshal.c:../../geoclue/position_signal_marshal.list
glib-genmarshal --prefix _geoclue_position --body $< > $@
/* Geoclue - A DBus api and wrapper for geography information
* Copyright (C) 2006 Garmin
*
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License version 2 as published by the Free Software Foundation;
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include <geoclue_position_server_hostip.h>
#include <geoclue_position_server_glue.h>
#include <geoclue_position_signal_marshal.h>
#include <dbus/dbus-glib-bindings.h>
#include <libxml/xmlreader.h>
#include <libsoup/soup.h>
#include <fcntl.h>
#include <stdlib.h>
#include <math.h>
#define PROGRAM_HEIGHT 640
#define PROGRAM_WIDTH 480
#define DEFAULT_LAT 38.857
#define DEFAULT_LON -94.8
#define DEFAULT_ZOOM 8
#define DEFAULT_LAT_STRING "38.857"
#define DEFAULT_LON_STRING "-94.8"
#define DEFAULT_ZOOM_STRING "8"
G_DEFINE_TYPE(GeocluePosition, geoclue_position, G_TYPE_OBJECT)
enum {
CURRENT_POSITION_CHANGED,
LAST_SIGNAL
};
static guint signals[LAST_SIGNAL];
//Default handler
void geoclue_position_current_position_changed(GeocluePosition* obj, gdouble lat, gdouble lon)
{
g_print("Current Position Changed\n");
}
static void
geoclue_position_init (GeocluePosition *obj)
{
GError *error = NULL;
DBusGProxy *driver_proxy;
GeocluePositionClass *klass = GEOCLUE_POSITION_GET_CLASS(obj);
guint request_ret;
dbus_g_connection_register_g_object (klass->connection,
GEOCLUE_POSITION_DBUS_PATH ,
G_OBJECT (obj));
driver_proxy = dbus_g_proxy_new_for_name (klass->connection,
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
if(!org_freedesktop_DBus_request_name (driver_proxy,
GEOCLUE_POSITION_DBUS_SERVICE,
0, &request_ret,
&error))
{
g_printerr("Unable to register geoclue service: %s", error->message);
g_error_free (error);
}
}
static void
geoclue_position_class_init (GeocluePositionClass *klass)
{
GError *error = NULL;
klass->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
signals[CURRENT_POSITION_CHANGED] =
g_signal_new ("current_position_changed",
TYPE_GEOCLUE_POSITION,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GeocluePositionClass, current_position_changed),
NULL,
NULL,
_geoclue_position_VOID__DOUBLE_DOUBLE,
G_TYPE_NONE, 2 ,G_TYPE_DOUBLE, G_TYPE_DOUBLE);
klass->current_position_changed = geoclue_position_current_position_changed;
if (klass->connection == NULL)
{
g_printerr("Unable to connect to dbus: %s", error->message);
g_error_free (error);
return;
}
dbus_g_object_type_install_info (TYPE_GEOCLUE_POSITION, &dbus_glib_geoclue_position_object_info);
}
gboolean geoclue_position_version (GeocluePosition *obj, gint* OUT_major, gint* OUT_minor, gint* OUT_micro, GError **error)
{
*OUT_major = 1;
*OUT_minor = 0;
*OUT_micro = 0;
return TRUE;
}
gboolean geoclue_position_service_provider(GeocluePosition *obj, char** name, GError **error)
{
*name = "www.hostip.info";
return TRUE;
}
gboolean geoclue_position_current_position(GeocluePosition *obj, gdouble* OUT_latitude, gdouble* OUT_longitude, GError **error )
{
SoupSession *session;
SoupMessage *msg;
const char *cafile = NULL;
SoupUri *proxy = NULL;
int fd;
char* proxy_env;
proxy_env = getenv ("http_proxy");
printf("found proxy %s:end\n", proxy_env);
if (proxy_env != NULL) {
printf("added proxy %s\n", proxy_env);
proxy = soup_uri_new (proxy_env);
session = soup_session_sync_new_with_options (
SOUP_SESSION_SSL_CA_FILE, cafile,
SOUP_SESSION_PROXY_URI, proxy,
NULL);
}
else
{
session = soup_session_sync_new ();
}
char url[5000];
snprintf(url, 5000,"http://api.hostip.info/");
g_print(url);
msg = soup_message_new ("GET", url);
soup_session_send_message(session, msg);
char *name, *value;
xmlTextReaderPtr reader;
int ret;
char* pngurl;
reader = xmlReaderForMemory (msg->response.body,
msg->response.length,
NULL,
NULL,
0);
ret = xmlTextReaderRead(reader);
//FIXME: super hack because I don't know how to use the XML libraries. This just works for now
while (ret == 1) {
name = (char*)xmlTextReaderConstName(reader);
printf("%s\n", name);
if (!strcmp(name,"gml:coordinates"))
{
//read next and grab text value.
ret = xmlTextReaderRead(reader);
name = (char*)xmlTextReaderConstName(reader);
value = (char*)xmlTextReaderConstValue(reader);
printf("matched latitude %s %s\n", name, value);
char junk;
sscanf(value, "%lf%c%lf",OUT_longitude , &junk, OUT_latitude);
//printf(" got char :%c: \n", junk);
//skip closing tag
ret = xmlTextReaderRead(reader);
name = (char*)xmlTextReaderConstName(reader);
}
ret = xmlTextReaderRead(reader);
}
xmlFreeTextReader(reader);
return TRUE;
}
gboolean geoclue_position_current_position_error(GeocluePosition *obj, gdouble* OUT_latitude_error, gdouble* OUT_longitude_error, GError **error )
{
return FALSE;
}
gboolean geoclue_position_current_altitude(GeocluePosition *obj, gdouble* OUT_altitude, GError **error )
{
return FALSE;
}
gboolean geoclue_position_current_velocity(GeocluePosition *obj, gdouble* OUT_north_velocity, gdouble* OUT_east_velocity, GError **error )
{
return FALSE;
}
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 )
{
return FALSE;
}
gboolean geoclue_position_satellites_in_view(GeocluePosition *obj, GArray** OUT_prn_numbers, GError **error )
{
return FALSE;
}
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 )
{
return FALSE;
}
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 )
{
return FALSE;
}
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 )
{
return FALSE;
}
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 )
{
return FALSE;
}
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 )
{
return FALSE;
}
int main(int argc, char **argv)
{
guint request_name_result;
g_type_init ();
g_thread_init (NULL);
GMainLoop* loop = g_main_loop_new(NULL,TRUE);
/*
* this initialize the library and check potential ABI mismatches
* between the version it was compiled for and the actual shared
* library used.
*/
LIBXML_TEST_VERSION
GeocluePosition* obj = NULL;
obj = GEOCLUE_POSITION(g_type_create_instance (geoclue_position_get_type()));
g_main_loop_run(loop);
g_object_unref(obj);
g_main_loop_unref(loop);
return(0);
}
/* Geoclue - A DBus api and wrapper for geography information
* Copyright (C) 2006 Garmin
*
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License version 2 as published by the Free Software Foundation;
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GEOCLUE_POSITION_SERVER_H__
#define __GEOCLUE_POSITION_SERVER_H__
#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus-glib.h>
#include <glib.h>
#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"
G_BEGIN_DECLS
//Let's create a geoclue_position object that has one method of geoclue_position
typedef struct GeocluePosition GeocluePosition;
typedef struct GeocluePositionClass GeocluePositionClass;
GType geoclue_position_get_type (void);
struct GeocluePosition
{
GObject parent;
};
struct GeocluePositionClass
{
GObjectClass parent;
DBusGConnection *connection;
/* Signals */
void (*current_position_changed) (GeocluePosition*, gdouble, gdouble );
};
#define TYPE_GEOCLUE_POSITION (geoclue_position_get_type ())
#define GEOCLUE_POSITION(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TYPE_GEOCLUE_POSITION, GeocluePosition))
#define GEOCLUE_POSITION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GEOCLUE_POSITION, GeocluePositionClass))
#define IS_GEOCLUE_POSITION(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TYPE_GEOCLUE_POSITION))
#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 );
G_END_DECLS
#endif
[D-BUS Service]
Name=org.foinse_project.geoclue.position.hostip
Exec=@execdir@/geoclue-position-server-hostip
bin_PROGRAMS = geoclue-position-server-yahoo
bin_PROGRAMS = geoclue-position-server-manual
geoclue_position_server_yahoo_SOURCES = geoclue_position_server_yahoo.c \
geoclue_position_server_manual_SOURCES = geoclue_position_server_manual.c \
geoclue_position_signal_marshal.c
......@@ -8,15 +8,36 @@ 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_files = $(service_in_files:.service.in=.service)
# D-Bus service descriptor installation
servicedir = $(DBUS_SERVICES_DIR)
service_DATA = $(service_files)
execdir = @bindir@
$(service_DATA): $(service_in_files) Makefile
for f in $(service_in_files) ; do \
sed -e 's;@execdir@;$(execdir);' $< > $@ ;\
done
EXTRA_DIST = \
$(service_in_files)
BUILT_SOURCES = \
geoclue_position_signal_marshal.c \
geoclue_position_signal_marshal.h \
geoclue_position_server_glue.h
geoclue_position_server_glue.h \
$(service_files)
CLEANFILES = \
geoclue_position_signal_marshal.c \
geoclue_position_signal_marshal.h \
geoclue_position_server_glue.h
geoclue_position_server_glue.h \
$(service_files)
geoclue_position_server_glue.h:../../geoclue/position_glue.xml
......
......@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
#include <geoclue_position_server_yahoo.h>
#include <geoclue_position_server_manual.h>
#include <geoclue_position_server_glue.h>
#include <geoclue_position_signal_marshal.h>
#include <dbus/dbus-glib-bindings.h>
......@@ -136,7 +136,7 @@ gboolean geoclue_position_version (GeocluePosition *obj, gint* OUT_major, gint*
gboolean geoclue_position_service_provider(GeocluePosition *obj, char** name, GError **error)
{
*name = "Yahoo and NMEA";
*name = "Manual user set";
return TRUE;
}
......