Commit 2f1eb688 authored by Jussi Kukkonen's avatar Jussi Kukkonen

Fixed conflict with Keiths last commit

Merge branch 'master' of ssh://git.freedesktop.org/git/geoclue

Conflicts:

	backend/position_manual/geoclue_position_server_manual.h
parents 617360be 8a887feb
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <config.h> #include <config.h>
#endif #endif
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib.h> #include <glib.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
......
...@@ -2,7 +2,7 @@ AC_INIT(geoclue/position.c) ...@@ -2,7 +2,7 @@ AC_INIT(geoclue/position.c)
PACKAGE=geoclue PACKAGE=geoclue
VERSION=0.7 VERSION=0.8
AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
......
...@@ -48,7 +48,8 @@ libgeoclue_la_SOURCES = position.c \ ...@@ -48,7 +48,8 @@ libgeoclue_la_SOURCES = position.c \
map_gtk.c \ map_gtk.c \
map_gtk_layout.c \ map_gtk_layout.c \
map_signal_marshal.c \ map_signal_marshal.c \
geocode.c geocode.c \
geoclue.c
libgeoclue_la_CFLAGS = $(DEPS_CFLAGS) -I$(top_srcdir) libgeoclue_la_CFLAGS = $(DEPS_CFLAGS) -I$(top_srcdir)
libgeoclue_la_LIBADD = $(DEPS_LIBS) libgeoclue_la_LIBADD = $(DEPS_LIBS)
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <find_signal_marshal.h> #include <find_signal_marshal.h>
#include <geoclue_master_client_glue.h> #include <geoclue_master_client_glue.h>
#include <config.h>
#define GEOCLUE_FIND_DBUS_INTERFACE "org.freedesktop.geoclue.find" #define GEOCLUE_FIND_DBUS_INTERFACE "org.freedesktop.geoclue.find"
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#define __ORG_FREEDESKTOP_GEOCLUE_FIND_GEOCLUE_FIND_H__ #define __ORG_FREEDESKTOP_GEOCLUE_FIND_GEOCLUE_FIND_H__
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <config.h>
G_BEGIN_DECLS G_BEGIN_DECLS
......
/* Geoclue - A DBus api and wrapper for geography information
* Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
*
*
* 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.h>
#include <config.h>
DBusBusType
geoclue_get_dbus_bus_type ()
{
return GEOCLUE_DBUS_BUS;
}
\ No newline at end of file
...@@ -50,13 +50,15 @@ ...@@ -50,13 +50,15 @@
**/ **/
DBusBusType
geoclue_get_dbus_bus_type ()
{
return GEOCLUE_DBUS_BUS;
}
#include <glib/gmacros.h>
#include <dbus/dbus-shared.h>
G_BEGIN_DECLS
DBusBusType
geoclue_get_dbus_bus_type ();
G_END_DECLS
#endif #endif /* __ORG_FREEDESKTOP_GEOCLUE_GEOCLUE_H__ */
\ No newline at end of file \ No newline at end of file
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <geocode_client_glue.h> #include <geocode_client_glue.h>
#include <stdio.h> #include <stdio.h>
#include <geoclue_master_client_glue.h> #include <geoclue_master_client_glue.h>
#include <config.h>
#define GEOCLUE_GEOCODE_DBUS_SERVICE "org.freedesktop.geoclue.geocode.yahoo" #define GEOCLUE_GEOCODE_DBUS_SERVICE "org.freedesktop.geoclue.geocode.yahoo"
#define GEOCLUE_GEOCODE_DBUS_PATH "/org/freedesktop/geoclue/geocode/yahoo" #define GEOCLUE_GEOCODE_DBUS_PATH "/org/freedesktop/geoclue/geocode/yahoo"
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#define __ORG_FREEDESKTOP_GEOCLUE_GEOCODE_GEOCLUE_GEOCODE_H__ #define __ORG_FREEDESKTOP_GEOCLUE_GEOCODE_GEOCLUE_GEOCODE_H__
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <config.h>
G_BEGIN_DECLS G_BEGIN_DECLS
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <map_signal_marshal.h> #include <map_signal_marshal.h>
#include <geoclue_master_client_glue.h> #include <geoclue_master_client_glue.h>
#include <config.h>
#define GEOCLUE_MAP_DBUS_INTERFACE "org.freedesktop.geoclue.map" #define GEOCLUE_MAP_DBUS_INTERFACE "org.freedesktop.geoclue.map"
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#define __ORG_FREEDESKTOP_GEOCLUE_GEOCLUE_MAP_H__ #define __ORG_FREEDESKTOP_GEOCLUE_GEOCLUE_MAP_H__
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <config.h>
G_BEGIN_DECLS G_BEGIN_DECLS
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <position_signal_marshal.h> #include <position_signal_marshal.h>
#include <string.h> #include <string.h>
#include <config.h>
#define GEOCLUE_POSITION_DBUS_INTERFACE "org.freedesktop.geoclue.position" #define GEOCLUE_POSITION_DBUS_INTERFACE "org.freedesktop.geoclue.position"
#define GEOCLUE_MASTER_DBUS_SERVICE "org.freedesktop.geoclue.master" #define GEOCLUE_MASTER_DBUS_SERVICE "org.freedesktop.geoclue.master"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define __ORG_FREEDESKTOP_GEOCLUE_POSITION_GEOCLUE_POSITION_H__ #define __ORG_FREEDESKTOP_GEOCLUE_POSITION_GEOCLUE_POSITION_H__
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <config.h>
/** \page Position /** \page Position
* *
......
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