Commit fff2ce33 authored by Iain Holmes's avatar Iain Holmes

Fix some compile mistakes

parent 33774882
...@@ -15,8 +15,22 @@ AC_PROG_MAKE_SET ...@@ -15,8 +15,22 @@ AC_PROG_MAKE_SET
AC_PROG_GCC_TRADITIONAL AC_PROG_GCC_TRADITIONAL
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
AC_ARG_ENABLE(system-bus,
[AC_HELP_STRING([--enable-system-bus],
[Use the system bus instead of session bus])],
enable_system_bus="$enableval",
enable_system_bus=no)
AM_CONDITIONAL(USE_SYSTEM_BUS, test x$enable_system_bus = xyes)
if test x$enable_system_bus = xyes; then
AC_DEFINE(GEOCLUE_DBUS_BUS, DBUS_BUS_SYSTEM, Use the system bus)
else
AC_DEFINE(GEOCLUE_DBUS_BUS, DBUS_BUS_SESSION, Use the session bus)
fi
PKG_CHECK_MODULES(GEOCLUE, [ PKG_CHECK_MODULES(GEOCLUE, [
glib-2.0 glib-2.0
gobject-2.0
dbus-glib-1 >= 0.60 dbus-glib-1 >= 0.60
]) ])
AC_SUBST(GEOCLUE_LIBS) AC_SUBST(GEOCLUE_LIBS)
......
...@@ -12,9 +12,12 @@ BUILT_SOURCES = \ ...@@ -12,9 +12,12 @@ BUILT_SOURCES = \
libgeoclue_backend_la_SOURCES = \ libgeoclue_backend_la_SOURCES = \
$(BUILT_SOURCES) \ $(BUILT_SOURCES) \
gc-backend.c \
gc-iface-address.c \ gc-iface-address.c \
gc-iface-geoclue.c \ gc-iface-geoclue.c \
gc-iface-geocode.c \
gc-iface-position.c \ gc-iface-position.c \
gc-iface-reverse-geocode.c \
gc-iface-velocity.c gc-iface-velocity.c
libgeoclue_backend_la_CFLAGS = \ libgeoclue_backend_la_CFLAGS = \
......
...@@ -70,7 +70,7 @@ gc_iface_geocode_address_to_position (GcIfaceGeocode *gc, ...@@ -70,7 +70,7 @@ gc_iface_geocode_address_to_position (GcIfaceGeocode *gc,
double *vertical_accuracy, double *vertical_accuracy,
GError **error) GError **error)
{ {
return GC_IFACE_ADDRESS_GET_CLASS (gc)->position_to_address return GC_IFACE_GEOCODE_GET_CLASS (gc)->address_to_position
(gc, address, (GeocluePositionFields *) fields, (gc, address, (GeocluePositionFields *) fields,
latitude, longitude, altitude, latitude, longitude, altitude,
(GeoclueAccuracy *) accuracy_level, (GeoclueAccuracy *) accuracy_level,
......
...@@ -28,10 +28,10 @@ struct _GcIfaceGeocodeClass { ...@@ -28,10 +28,10 @@ struct _GcIfaceGeocodeClass {
/* vtable */ /* vtable */
gboolean (*address_to_position) (GcIfaceGeocode *gc, gboolean (*address_to_position) (GcIfaceGeocode *gc,
GHashTable *address, GHashTable *address,
GeocodePositionFields *fields, GeocluePositionFields *fields,
double *latitude, double *latitude,
double *longitude, double *longitude,
double *altitude double *altitude,
GeoclueAccuracy *accuracy_level, GeoclueAccuracy *accuracy_level,
double *horizontal_accuracy, double *horizontal_accuracy,
double *vertical_accuracy, double *vertical_accuracy,
......
...@@ -19,13 +19,6 @@ G_BEGIN_DECLS ...@@ -19,13 +19,6 @@ G_BEGIN_DECLS
#define GC_IS_IFACE_POSITION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GC_TYPE_IFACE_POSITION)) #define GC_IS_IFACE_POSITION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GC_TYPE_IFACE_POSITION))
#define GC_IFACE_POSITION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GC_TYPE_IFACE_POSITION, GcIfacePositionClass)) #define GC_IFACE_POSITION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GC_TYPE_IFACE_POSITION, GcIfacePositionClass))
typedef enum {
GEOCLUE_POSITION_FIELDS_NONE = 0,
GEOCLUE_POSITION_FIELDS_LATITUDE = 1 << 0,
GEOCLUE_POSITION_FIELDS_LONGITUDE = 1 << 1,
GEOCLUE_POSITION_FIELDS_ALTITUDE = 1 << 2
} GeocluePositionFields;
typedef struct _GcIfacePosition GcIfacePosition; /* Dummy typedef */ typedef struct _GcIfacePosition GcIfacePosition; /* Dummy typedef */
typedef struct _GcIfacePositionClass GcIfacePositionClass; typedef struct _GcIfacePositionClass GcIfacePositionClass;
......
...@@ -66,7 +66,7 @@ gc_iface_reverse_geocode_position_to_address (GcIfaceReverseGeocode *gc, ...@@ -66,7 +66,7 @@ gc_iface_reverse_geocode_position_to_address (GcIfaceReverseGeocode *gc,
double *vertical_accuracy, double *vertical_accuracy,
GError **error) GError **error)
{ {
return GC_IFACE_ADDRESS_GET_CLASS (gc)->position_to_address return GC_IFACE_REVERSE_GEOCODE_GET_CLASS (gc)->position_to_address
(gc, latitude, longitude, address, (gc, latitude, longitude, address,
(GeoclueAccuracy *) accuracy_level, (GeoclueAccuracy *) accuracy_level,
horizontal_accuracy, vertical_accuracy, error); horizontal_accuracy, vertical_accuracy, error);
......
...@@ -12,4 +12,11 @@ typedef enum { ...@@ -12,4 +12,11 @@ typedef enum {
GEOCLUE_ACCURACY_DETAILED, GEOCLUE_ACCURACY_DETAILED,
} GeoclueAccuracy; } GeoclueAccuracy;
typedef enum {
GEOCLUE_POSITION_FIELDS_NONE = 0,
GEOCLUE_POSITION_FIELDS_LATITUDE = 1 << 0,
GEOCLUE_POSITION_FIELDS_LONGITUDE = 1 << 1,
GEOCLUE_POSITION_FIELDS_ALTITUDE = 1 << 2
} GeocluePositionFields;
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment