From 8a887feb0a803dfa698fc1b29f65efc887c1d859 Mon Sep 17 00:00:00 2001 From: Keith Preston Date: Tue, 14 Aug 2007 16:22:29 -0500 Subject: [PATCH] clean up for system bus code --- .../geoclue_position_server_manual.h | 2 ++ configure.ac | 2 +- geoclue/Makefile.am | 3 ++- geoclue/find.c | 1 + geoclue/find.h | 1 - geoclue/geoclue.c | 27 +++++++++++++++++++ geoclue/geoclue.h | 14 +++++----- geoclue/geocode.c | 1 + geoclue/geocode.h | 1 - geoclue/map.c | 2 +- geoclue/map.h | 1 - geoclue/position.c | 1 + geoclue/position.h | 2 +- 13 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 geoclue/geoclue.c diff --git a/backend/position_manual/geoclue_position_server_manual.h b/backend/position_manual/geoclue_position_server_manual.h index ed1bd9e..71e6537 100644 --- a/backend/position_manual/geoclue_position_server_manual.h +++ b/backend/position_manual/geoclue_position_server_manual.h @@ -25,6 +25,8 @@ #include #include +#include + #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" diff --git a/configure.ac b/configure.ac index e3a8cde..ce418bc 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_INIT(geoclue/position.c) PACKAGE=geoclue -VERSION=0.7 +VERSION=0.8 AM_INIT_AUTOMAKE($PACKAGE, $VERSION) diff --git a/geoclue/Makefile.am b/geoclue/Makefile.am index 1474523..2faa63b 100644 --- a/geoclue/Makefile.am +++ b/geoclue/Makefile.am @@ -48,7 +48,8 @@ libgeoclue_la_SOURCES = position.c \ map_gtk.c \ map_gtk_layout.c \ map_signal_marshal.c \ - geocode.c + geocode.c \ + geoclue.c libgeoclue_la_CFLAGS = $(DEPS_CFLAGS) -I$(top_srcdir) libgeoclue_la_LIBADD = $(DEPS_LIBS) diff --git a/geoclue/find.c b/geoclue/find.c index 2dab44f..361e525 100644 --- a/geoclue/find.c +++ b/geoclue/find.c @@ -29,6 +29,7 @@ #include #include #include +#include #define GEOCLUE_FIND_DBUS_INTERFACE "org.freedesktop.geoclue.find" diff --git a/geoclue/find.h b/geoclue/find.h index 025b684..9b0a3ef 100644 --- a/geoclue/find.h +++ b/geoclue/find.h @@ -20,7 +20,6 @@ #define __ORG_FREEDESKTOP_GEOCLUE_FIND_GEOCLUE_FIND_H__ #include -#include G_BEGIN_DECLS diff --git a/geoclue/geoclue.c b/geoclue/geoclue.c new file mode 100644 index 0000000..ecd2847 --- /dev/null +++ b/geoclue/geoclue.c @@ -0,0 +1,27 @@ +/* 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 +#include + +DBusBusType +geoclue_get_dbus_bus_type () +{ + return GEOCLUE_DBUS_BUS; +} \ No newline at end of file diff --git a/geoclue/geoclue.h b/geoclue/geoclue.h index 2eb914e..022a905 100644 --- a/geoclue/geoclue.h +++ b/geoclue/geoclue.h @@ -50,13 +50,15 @@ **/ -DBusBusType -geoclue_get_dbus_bus_type () -{ - return GEOCLUE_DBUS_BUS; -} +#include +#include + +G_BEGIN_DECLS +DBusBusType +geoclue_get_dbus_bus_type (); +G_END_DECLS -#endif \ No newline at end of file +#endif /* __ORG_FREEDESKTOP_GEOCLUE_GEOCLUE_H__ */ \ No newline at end of file diff --git a/geoclue/geocode.c b/geoclue/geocode.c index 48a3f9d..500e363 100644 --- a/geoclue/geocode.c +++ b/geoclue/geocode.c @@ -27,6 +27,7 @@ #include #include #include +#include #define GEOCLUE_GEOCODE_DBUS_SERVICE "org.freedesktop.geoclue.geocode.yahoo" #define GEOCLUE_GEOCODE_DBUS_PATH "/org/freedesktop/geoclue/geocode/yahoo" diff --git a/geoclue/geocode.h b/geoclue/geocode.h index 49ae3f3..6fd0e41 100644 --- a/geoclue/geocode.h +++ b/geoclue/geocode.h @@ -20,7 +20,6 @@ #define __ORG_FREEDESKTOP_GEOCLUE_GEOCODE_GEOCLUE_GEOCODE_H__ #include -#include G_BEGIN_DECLS diff --git a/geoclue/map.c b/geoclue/map.c index ae34160..dbe4a91 100644 --- a/geoclue/map.c +++ b/geoclue/map.c @@ -29,7 +29,7 @@ #include #include - +#include #define GEOCLUE_MAP_DBUS_INTERFACE "org.freedesktop.geoclue.map" diff --git a/geoclue/map.h b/geoclue/map.h index bb1a8fb..14a9621 100644 --- a/geoclue/map.h +++ b/geoclue/map.h @@ -20,7 +20,6 @@ #define __ORG_FREEDESKTOP_GEOCLUE_GEOCLUE_MAP_H__ #include -#include G_BEGIN_DECLS diff --git a/geoclue/position.c b/geoclue/position.c index af3cfbd..33b81b9 100644 --- a/geoclue/position.c +++ b/geoclue/position.c @@ -30,6 +30,7 @@ #include #include #include +#include #define GEOCLUE_POSITION_DBUS_INTERFACE "org.freedesktop.geoclue.position" #define GEOCLUE_MASTER_DBUS_SERVICE "org.freedesktop.geoclue.master" diff --git a/geoclue/position.h b/geoclue/position.h index 17770b3..d5ce553 100644 --- a/geoclue/position.h +++ b/geoclue/position.h @@ -20,7 +20,7 @@ #define __ORG_FREEDESKTOP_GEOCLUE_POSITION_GEOCLUE_POSITION_H__ #include -#include + /** \page Position * -- GitLab