cleanup files structure and backend names

meson.build

@@ -38,7 +38,7 @@ endif
 #### Udisks1 support ####
 if get_option('udisks') == true
    dependency('udisks', required: true)
-   config_h.set('PLACES_HAVE_UDISKS', 1)
+   config_h.set('PLACES_HAVE_UDISKS1', 1)
 endif
 
 

src/backend_mount.h

@@ -1,7 +1,7 @@
 #ifndef E_MOD_PLACES_MOUNT_H
 #define E_MOD_PLACES_MOUNT_H
 
-void places_mount_init(void);
+Eina_Bool places_mount_init(void);
 void places_mount_shutdown(void);
 
 #endif

src/backend_systemd.c

@@ -11,9 +11,9 @@
 
 /*
 
-NOTE
+NOTES
 
--  I remoti li vede solo con opzione "auto" in fstab !!!!
+-  mounts in fstab seems to need the "auto" option to be seen over dbus :/
 
 */
 
@@ -25,7 +25,6 @@ NOTE
 #define SYSTEMD_MOUNT_IFACE "org.freedesktop.systemd1.Mount"
 
 
-
 /* Local backend data */
 typedef struct Places_Systemd_Backend_Data
 {

src/backend_systemd.h

@@ -1,7 +1,7 @@
 #ifndef E_MOD_PLACES_SYSTEMD_H
 #define E_MOD_PLACES_SYSTEMD_H
 
-void places_systemd_init(void);
+Eina_Bool places_systemd_init(void);
 void places_systemd_shutdown(void);
 
 #endif

src/backend_udisks1.c

@@ -2,7 +2,7 @@
 #include "places_config.h"
 
 
-#ifdef PLACES_HAVE_UDISKS
+#ifdef PLACES_HAVE_UDISKS1
 
 #include <e.h>
 #include <Eldbus.h>
@@ -37,9 +37,9 @@ static Eldbus_Proxy *_places_udisks_proxy = NULL;
 
 /* API */
 Eina_Bool
-places_udisks_eldbus_init(void)
+places_udisks1_init(void)
 {
-   printf("PLACES: udisks: init()\n");
+   printf("PLACES: udisks1: init()\n");
 
    if (!eldbus_init())
       return EINA_FALSE;
@@ -58,7 +58,7 @@ places_udisks_eldbus_init(void)
 }
 
 void
-places_udisks_eldbus_shutdown(void)
+places_udisks1_shutdown(void)
 {
    if (_places_udisks_proxy) eldbus_proxy_unref(_places_udisks_proxy);
    if (_places_dbus_conn) eldbus_connection_unref(_places_dbus_conn);

src/backend_udisks1.h

@@ -0,0 +1,8 @@
+#ifndef E_MOD_PLACES_UDISKS1_H
+#define E_MOD_PLACES_UDISKS1_H
+
+Eina_Bool places_udisks1_init(void);
+void places_udisks1_shutdown(void);
+
+#endif
+

src/backend_udisks2.h

@@ -1,7 +1,7 @@
 #ifndef E_MOD_PLACES_UDISKS2_H
 #define E_MOD_PLACES_UDISKS2_H
 
-void places_udisks2_init(void);
+Eina_Bool places_udisks2_init(void);
 void places_udisks2_shutdown(void);
 
 #endif

src/e_mod_places.c

@@ -6,23 +6,23 @@
 
 
 #ifdef PLACES_HAVE_SYSTEMD
-# include "e_mod_systemd.h"
+# include "backend_systemd.h"
 #endif
 
 #ifdef PLACES_HAVE_EEZE
-# include "e_mod_eeze.h"
+# include "backend_eeze.h"
 #endif
 
-#ifdef PLACES_HAVE_UDISKS
-# include "e_mod_udisks_eldbus.h"
+#ifdef PLACES_HAVE_UDISKS1
+# include "backend_udisks1.h"
 #endif
 
 #ifdef PLACES_HAVE_UDISKS2
-# include "e_mod_udisks2.h"
+# include "backend_udisks2.h"
 #endif
 
 #ifdef PLACES_HAVE_MOUNT
-# include "e_mod_mount.h"
+# include "backend_mount.h"
 #endif
 
 
@@ -76,8 +76,8 @@ places_init(void)
 #ifdef PLACES_HAVE_EEZE
    places_eeze_init();
 #endif
-#ifdef PLACES_HAVE_UDISKS
-   places_udisks_eldbus_init();
+#ifdef PLACES_HAVE_UDISKS1
+   places_udisks1_init();
 #endif
 #ifdef PLACES_HAVE_UDISKS2
    places_udisks2_init();
@@ -133,8 +133,8 @@ places_shutdown(void)
 #ifdef PLACES_HAVE_EEZE
    places_eeze_shutdown();
 #endif
-#ifdef PLACES_HAVE_UDISKS
-   places_udisks_eldbus_shutdown();
+#ifdef PLACES_HAVE_UDISKS1
+   places_udisks1_shutdown();
 #endif
 #ifdef PLACES_HAVE_UDISKS2
    places_udisks2_shutdown();

src/e_mod_udisks_eldbus.h

@@ -1,8 +0,0 @@
-#ifndef E_MOD_PLACES_UDISKS_ELDBUS_H
-#define E_MOD_PLACES_UDISKS_ELDBUS_H
-
-void places_udisks_eldbus_init(void);
-void places_udisks_eldbus_shutdown(void);
-
-#endif
-

src/meson.build

@@ -1,15 +1,14 @@
 
-module = shared_module(
-   'module',
+module = shared_module('module',
    'e_mod_main.c',
    'e_mod_config.c',
    'e_mod_places.c',
 
-   'e_mod_udisks2.c',
-   'e_mod_udisks_eldbus.c',
-   'e_mod_mount.c',
-   'e_mod_eeze.c',
-   'e_mod_systemd.c',
+   'backend_udisks1.c',
+   'backend_udisks2.c',
+   'backend_mount.c',
+   'backend_eeze.c',
+   'backend_systemd.c',
 
    dependencies : [dep_e, dep_intl],
    install_dir: lib_install_dir,