diff options
| author | Christophe Fergeau <teuf@gnome.org> | 2005-11-21 21:43:16 +0000 |
|---|---|---|
| committer | Christophe Fergeau <teuf@gnome.org> | 2005-11-21 21:43:16 +0000 |
| commit | 97b2284fd175c48bf0bd933ecedfccc54d82acc9 (patch) | |
| tree | 248bf82d6b67c3d023d91d231ec0abbb6c6bb553 /src/hal-common.c | |
| parent | d823ee0e7e488a4ab3a47bac14f81a914f88bd86 (diff) | |
| download | libgpod-97b2284fd175c48bf0bd933ecedfccc54d82acc9.tar.gz libgpod-97b2284fd175c48bf0bd933ecedfccc54d82acc9.tar.xz libgpod-97b2284fd175c48bf0bd933ecedfccc54d82acc9.zip | |
2005-11-21 Christophe Fergeau <teuf@gnome.org>
* src/hal-common.c:
* src/ipod-device.c: marked some functions as static
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1160 f01d2545-417e-4e96-918e-98f8d0dbbcb6
Diffstat (limited to 'src/hal-common.c')
| -rw-r--r-- | src/hal-common.c | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/src/hal-common.c b/src/hal-common.c index 0e731b6..be37f5f 100644 --- a/src/hal-common.c +++ b/src/hal-common.c @@ -58,36 +58,7 @@ #include "hal-common.h" -#ifdef HAVE_LIBHAL - -#include <dbus/dbus.h> -#include <dbus/dbus-glib.h> -#include <dbus/dbus-glib-lowlevel.h> - -static GMainContext *ipod_device_global_main_context = NULL; - -dbus_bool_t -hal_mainloop_integration(LibHalContext *ctx, DBusError *error) -{ - DBusConnection *dbus_connection; - - dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, error); - - if(dbus_error_is_set(error)) - return FALSE; - - dbus_connection_setup_with_g_main(dbus_connection, - ipod_device_global_main_context); - libhal_ctx_set_dbus_connection(ctx, dbus_connection); - - return TRUE; -} - -void ipod_device_set_global_main_context(GMainContext *ctx) -{ - ipod_device_global_main_context = ctx; -} -#else +#ifndef HAVE_LIBHAL gchar **libhal_manager_find_device_string_match (LibHalContext *hal_ctx, const gchar *type, const gchar *str, |