diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/hal-common.h | 32 | ||||
| -rw-r--r-- | src/ipod-device.c | 2 | ||||
| -rw-r--r-- | src/ipod-device.h | 10 |
4 files changed, 24 insertions, 28 deletions
@@ -1,3 +1,11 @@ +2005-11-21 Christophe Fergeau <teuf@gnome.org> + + * src/hal-common.h: mark hal stubs (for when hal isn't available) as + G_GNUC_INTERNAL to avoid namespace clashes + * src/ipod-device.c: + * src/ipod-device.h: move hal header inclusion in the .c instead of + having it in the .h + 2005-11-19 Jorg Schuler <jcsjcs at users.sourceforge.net> * itdb_playlist.c: simplified API for itdb_spl_update() and diff --git a/src/hal-common.h b/src/hal-common.h index cd78cc4..8cdbe2b 100644 --- a/src/hal-common.h +++ b/src/hal-common.h @@ -73,22 +73,22 @@ void ipod_device_set_global_main_context(GMainContext *ctx); #else typedef void LibHalContext; -gchar **libhal_manager_find_device_string_match (LibHalContext *hal_ctx, - const gchar *dev, - const gchar *str, - gint *vol_count, - void *error); -void libhal_free_string_array (gchar **volumes); -gboolean libhal_device_property_exists (LibHalContext *hal_ctx, - const gchar *vol, - const gchar *prop, - void *error); -gboolean libhal_device_get_property_bool (LibHalContext *hal_ctx, - const gchar *vol, - const gchar *prop, - void *error); -void libhal_ctx_shutdown (LibHalContext *hal_ctx, void *error); -void libhal_ctx_free (LibHalContext *hal_ctx); +G_GNUC_INTERNAL gchar **libhal_manager_find_device_string_match (LibHalContext *hal_ctx, + const gchar *dev, + const gchar *str, + gint *vol_count, + void *error); +G_GNUC_INTERNAL void libhal_free_string_array (gchar **volumes); +G_GNUC_INTERNAL gboolean libhal_device_property_exists (LibHalContext *hal_ctx, + const gchar *vol, + const gchar *prop, + void *error); +G_GNUC_INTERNAL gboolean libhal_device_get_property_bool (LibHalContext *hal_ctx, + const gchar *vol, + const gchar *prop, + void *error); +G_GNUC_INTERNAL void libhal_ctx_shutdown (LibHalContext *hal_ctx, void *error); +G_GNUC_INTERNAL void libhal_ctx_free (LibHalContext *hal_ctx); #endif diff --git a/src/ipod-device.c b/src/ipod-device.c index b616f07..951ddaf 100644 --- a/src/ipod-device.c +++ b/src/ipod-device.c @@ -65,8 +65,6 @@ #define ipod_device_list_devices itdb_device_list_devices #define ipod_device_list_device_udis itdb_device_list_device_udis - - #ifdef HAVE_CONFIG_H # include "config.h" #endif diff --git a/src/ipod-device.h b/src/ipod-device.h index 958d042..416c13e 100644 --- a/src/ipod-device.h +++ b/src/ipod-device.h @@ -77,16 +77,6 @@ #include <glib.h> #include <glib-object.h> -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#if HAVE_LIBHAL -# include <libhal.h> -# include <dbus/dbus.h> -# include <dbus/dbus-glib.h> -#endif - G_BEGIN_DECLS #define TYPE_IPOD_DEVICE (ipod_device_get_type ()) |