e: Remove Hal backend from e_fm

Since Hal is deprecated since 2008 it's a bad idea wasting time porting
it to edbus.

Patch by: José Roberto de Souza  <zehortigoza@profusion.mobi>



SVN revision: 81984

configure.ac

@@ -326,10 +326,7 @@ if test "x$e_cv_want_device_udev" != "xno";then
     [
       device_backend=eeze
       AC_DEFINE_UNQUOTED([HAVE_EEZE],[1],[enable udev support])
-    ],
-    [device_backend=ehal])
-else
-  device_backend=ehal
+    ])
 fi
 
 AC_MSG_CHECKING([which device backend to use])
@@ -341,26 +338,7 @@ test "x${device_backend}" = "xeeze" || AC_DEFINE_UNQUOTED([HAVE_HAL],[1],[enable
 
 DBUS_MOUNT_CONFIG=1
 dbus_mount="dbus-1"
-hal_mount="ehal >= $efl_version, edbus >= $efl_version"
 udisks_mount="eukit >= $efl_version"
-AC_ARG_ENABLE([mount-hal],
-  AS_HELP_STRING([--enable-mount-hal],[enable hal mounting support @<:@default=enabled@:>@]),
-  [e_cv_want_mount_hal=$enableval],
-  [e_cv_want_mount_hal=yes])
-
-AC_MSG_CHECKING([whether the HAL mounting support is enabled])
-AC_MSG_RESULT([${e_cv_want_mount_hal}])
-
-if test "x$e_cv_want_mount_hal" != "xno";then
-  PKG_CHECK_EXISTS([ehal >= ${efl_version}],
-    [],[
-      hal_mount=
-      AC_MSG_NOTICE([HAL mounting disabled])
-    ])
-else
-  hal_mount=
-  AC_MSG_NOTICE([HAL mounting disabled])
-fi
 
 AC_ARG_ENABLE([mount-udisks],
   AS_HELP_STRING([--enable-mount-udisks],[enable udisks mounting support @<:@default=enabled@:>@]),
@@ -479,6 +457,7 @@ ecore-file >= $efl_version \
 ecore-ipc >= $efl_version \
 eet >= $efl_version \
 efreet >= $efl_version \
+edbus >= $efl_version \
 edbus2 >= $efl_version \
 eina >= $efl_version"
 efm_requires="$efm_requires $eeze_mount $dbus_mount $hal_mount $udisks_mount"

src/bin/e_fm/Makefile.am

@@ -19,14 +19,6 @@ internal_bindir = $(libdir)/enlightenment/utils
 internal_bin_PROGRAMS = \
 enlightenment_fm 
 
-if HAVE_HAL_MOUNT
-hal_s = \
-e_fm_main_hal.h \
-e_fm_main_hal.c
-else
-hal_s =
-endif
-
 if HAVE_UDISKS_MOUNT
 udisks_s = \
 e_fm_main_udisks.h \
@@ -51,7 +43,6 @@ e_fm_main.h \
 e_fm_ipc.h \
 e_fm_main.c \
 e_fm_ipc.c \
-$(hal_s) \
 $(udisks_s) \
 $(eeze_s) \
 ../e_fm_shared_codec.c \

src/bin/e_fm/e_fm_main.c

@@ -54,9 +54,6 @@ void *alloca (size_t);
 #include "e_fm_op.h"
 
 #include "e_fm_shared_device.h"
-#ifdef HAVE_HAL_MOUNT
-# include "e_fm_main_hal.h"
-#endif
 #ifdef HAVE_UDISKS_MOUNT
 # include "e_fm_main_udisks.h"
 #endif
@@ -65,8 +62,7 @@ void *alloca (size_t);
 #endif
 
 
-/* if using ehal, functions will point to _e_fm_main_hal_X
- * if using udisks, functions will point to _e_fm_main_udisks_X
+/* if using udisks, functions will point to _e_fm_main_udisks_X
  * if using eeze, functions will point to _e_fm_main_eeze_X
  */
 
@@ -94,9 +90,6 @@ int efm_log_dom = -1;
 static void
 _e_fm_init(void)
 {
-#ifdef HAVE_HAL_MOUNT
-   _e_fm_main_hal_init();
-#else
 # ifdef HAVE_UDISKS_MOUNT
    _e_fm_main_udisks_init();
 # else
@@ -105,15 +98,11 @@ _e_fm_init(void)
    mode = EFM_MODE_USING_EEZE_MOUNT; /* this gets overridden if the others are available */
 #  endif
 # endif
-#endif
 }
 
 static void
 _e_fm_shutdown(void)
 {
-#ifdef HAVE_HAL_MOUNT
-   _e_fm_main_hal_shutdown();
-#else
 # ifdef HAVE_UDISKS_MOUNT
    _e_fm_main_udisks_shutdown();
 # else
@@ -121,7 +110,6 @@ _e_fm_shutdown(void)
    _e_fm_main_eeze_shutdown();
 #  endif
 # endif
-#endif
 }
 
 /* externally accessible functions */
@@ -170,21 +158,6 @@ main(int argc, char **argv)
    return 0;
 }
 
-#ifdef HAVE_HAL_MOUNT
-void
-_e_fm_main_hal_catch(Eina_Bool usable)
-{
-   if (usable)
-     {
-        mode = EFM_MODE_USING_HAL_MOUNT;
-        return;
-     }
-# ifdef HAVE_EEZE_MOUNT
-   _e_fm_main_eeze_init();
-   mode = EFM_MODE_USING_EEZE_MOUNT;
-# endif
-}
-#endif
 #ifdef HAVE_UDISKS_MOUNT
 void
 _e_fm_main_udisks_catch(Eina_Bool usable)
@@ -220,11 +193,6 @@ e_volume_mount(E_Volume *v)
 {
   switch (mode)
     {
-#ifdef HAVE_HAL_MOUNT
-     case EFM_MODE_USING_HAL_MOUNT:
-       _e_fm_main_hal_volume_mount(v);
-       break;
-#endif
 #ifdef HAVE_UDISKS_MOUNT
      case EFM_MODE_USING_UDISKS_MOUNT:
        _e_fm_main_udisks_volume_mount(v);
@@ -247,11 +215,6 @@ e_volume_unmount(E_Volume *v)
 {
   switch (mode)
     {
-#ifdef HAVE_HAL_MOUNT
-     case EFM_MODE_USING_HAL_MOUNT:
-       _e_fm_main_hal_volume_unmount(v);
-       break;
-#endif
 #ifdef HAVE_UDISKS_MOUNT
      case EFM_MODE_USING_UDISKS_MOUNT:
        _e_fm_main_udisks_volume_unmount(v);
@@ -273,11 +236,6 @@ e_volume_eject(E_Volume *v)
 {
   switch (mode)
     {
-#ifdef HAVE_HAL_MOUNT
-     case EFM_MODE_USING_HAL_MOUNT:
-       _e_fm_main_hal_volume_eject(v);
-       break;
-#endif
 #ifdef HAVE_UDISKS_MOUNT
      case EFM_MODE_USING_UDISKS_MOUNT:
        _e_fm_main_udisks_volume_eject(v);
@@ -299,10 +257,6 @@ e_volume_find(const char *udi)
 {
    switch (mode)
      {
-#ifdef HAVE_HAL_MOUNT
-      case EFM_MODE_USING_HAL_MOUNT:
-        return _e_fm_main_hal_volume_find(udi);
-#endif
 #ifdef HAVE_UDISKS_MOUNT
       case EFM_MODE_USING_UDISKS_MOUNT:
         return _e_fm_main_udisks_volume_find(udi);
@@ -323,11 +277,6 @@ e_storage_del(const char *udi)
 {
   switch (mode)
     {
-#ifdef HAVE_HAL_MOUNT
-     case EFM_MODE_USING_HAL_MOUNT:
-       _e_fm_main_hal_storage_del(udi);
-       break;
-#endif
 #ifdef HAVE_UDISKS_MOUNT
      case EFM_MODE_USING_UDISKS_MOUNT:
        _e_fm_main_udisks_storage_del(udi);
@@ -349,10 +298,6 @@ e_storage_find(const char *udi)
 {
   switch (mode)
     {
-#ifdef HAVE_HAL_MOUNT
-     case EFM_MODE_USING_HAL_MOUNT:
-       return _e_fm_main_hal_storage_find(udi);
-#endif
 #ifdef HAVE_UDISKS_MOUNT
      case EFM_MODE_USING_UDISKS_MOUNT:
        return _e_fm_main_udisks_storage_find(udi);

src/bin/e_fm/e_fm_main_hal.h

@@ -1,21 +0,0 @@
-#ifndef E_FM_MAIN_HAL_H
-#define E_FM_MAIN_HAL_H
-
-E_Volume *_e_fm_main_hal_volume_add(const char *udi, Eina_Bool first_time);
-void _e_fm_main_hal_volume_del(const char *udi);
-E_Volume *_e_fm_main_hal_volume_find(const char *udi);
-
-void _e_fm_main_hal_volume_eject(E_Volume *v);
-void _e_fm_main_hal_volume_unmount(E_Volume *v);
-void _e_fm_main_hal_volume_mount(E_Volume *v);
-
-E_Storage *_e_fm_main_hal_storage_add(const char *udi);
-void _e_fm_main_hal_storage_del(const char *udi);
-E_Storage *_e_fm_main_hal_storage_find(const char *udi);
-
-
-void _e_fm_main_hal_init(void);
-void _e_fm_main_hal_shutdown(void);
-void _e_fm_main_hal_catch(Eina_Bool usable);
-
-#endif