enlightenment
/
enlightenment-module-places
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unbork places module after unknown efl changes

This commit is contained in:
Davide Andreoli 2019-06-02 19:01:41 +02:00
parent 65bd9f748b
commit 468cc4243e
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -92,14 +92,14 @@ if test "x$want_eeze" != "xyes";then
fi
AM_CONDITIONAL([HAVE_ELDBUS], [test "x$have_eldbus" = "xyes"])
test "x$have_eldbus" = "xyes" && AC_DEFINE_UNQUOTED([HAVE_ELDBUS], [1], [enable eldbus support])
AM_CONDITIONAL([PLACES_HAVE_ELDBUS], [test "x$have_eldbus" = "xyes"])
test "x$have_eldbus" = "xyes" && AC_DEFINE_UNQUOTED([PLACES_HAVE_ELDBUS], [1], [enable eldbus support])
AM_CONDITIONAL([HAVE_EEZE], [test "x$have_eeze" = "xyes"])
test "x$have_eeze" = "xyes" && AC_DEFINE_UNQUOTED([HAVE_EEZE], [1], [enable eeze support])
AM_CONDITIONAL([PLACES_HAVE_EEZE], [test "x$have_eeze" = "xyes"])
test "x$have_eeze" = "xyes" && AC_DEFINE_UNQUOTED([PLACES_HAVE_EEZE], [1], [enable eeze support])
AM_CONDITIONAL([HAVE_MOUNT], [test "x$have_mount" = "xyes"])
test "x$have_mount" = "xyes" && AC_DEFINE_UNQUOTED([HAVE_MOUNT], [1], [enable mount support])
AM_CONDITIONAL([PLACES_HAVE_MOUNT], [test "x$have_mount" = "xyes"])
test "x$have_mount" = "xyes" && AC_DEFINE_UNQUOTED([PLACES_HAVE_MOUNT], [1], [enable mount support])
# homedir install

2
src/e_mod_eeze.c
View File

@ -3,7 +3,7 @@
# include "config.h"
#endif
#ifdef HAVE_EEZE
#ifdef PLACES_HAVE_EEZE
#include <e.h>
#include "e_mod_places.h"

2
src/e_mod_mount.c
View File

@ -2,7 +2,7 @@
# include "config.h"
#endif
#ifdef HAVE_MOUNT
#ifdef PLACES_HAVE_MOUNT
#include <e.h>
#include "e_mod_main.h"

18
src/e_mod_places.c
View File

@ -5,13 +5,13 @@
#include <sys/statvfs.h>
#include "e_mod_main.h"
#include "e_mod_places.h"
#ifdef HAVE_EEZE
#ifdef PLACES_HAVE_EEZE
# include "e_mod_eeze.h"
#endif
#ifdef HAVE_ELDBUS
#ifdef PLACES_HAVE_ELDBUS
# include "e_mod_udisks_eldbus.h"
#endif
#ifdef HAVE_MOUNT
#ifdef PLACES_HAVE_MOUNT
# include "e_mod_mount.h"
#endif
@ -42,13 +42,13 @@ places_init(void)
printf("PLACES: Init\n");
#ifdef HAVE_EEZE
#ifdef PLACES_HAVE_EEZE
places_eeze_init();
#endif
#ifdef HAVE_ELDBUS
#ifdef PLACES_HAVE_ELDBUS
places_udisks_eldbus_init();
#endif
#ifdef HAVE_MOUNT
#ifdef PLACES_HAVE_MOUNT
places_mount_init();
#endif
@ -65,13 +65,13 @@ places_shutdown(void)
while (volumes)
places_volume_del((Volume*)volumes->data);
#ifdef HAVE_EEZE
#ifdef PLACES_HAVE_EEZE
places_eeze_shutdown();
#endif
#ifdef HAVE_ELDBUS
#ifdef PLACES_HAVE_ELDBUS
places_udisks_eldbus_shutdown();
#endif
#ifdef HAVE_MOUNT
#ifdef PLACES_HAVE_MOUNT
places_mount_shutdown();
#endif
}

12
src/e_mod_udisks_eldbus.c
View File

@ -3,7 +3,7 @@
# include "config.h"
#endif
#ifdef HAVE_ELDBUS
#ifdef PLACES_HAVE_ELDBUS
#include <e.h>
#include <Eldbus.h>
@ -211,7 +211,7 @@ _places_udisks_vol_props_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendin
{
Eldbus_Message_Iter *var;
const char *key;
Eina_Bool bool;
Eina_Bool bool_ret;
if (!eldbus_message_iter_arguments_get(dict, "sv", &key, &var))
continue;
@ -219,14 +219,14 @@ _places_udisks_vol_props_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendin
// skip volumes with volume.ignore set
if (!strcmp(key, "DeviceIsMediaChangeDetectionInhibited"))
{
eldbus_message_iter_arguments_get(var, "b", &bool);
if (bool) return;
eldbus_message_iter_arguments_get(var, "b", &bool_ret);
if (bool_ret) return;
}
// skip volumes with presentation.hide set
if (!strcmp(key, "DevicePresentationHide"))
{
eldbus_message_iter_arguments_get(var, "b", &bool);
if (bool) return;
eldbus_message_iter_arguments_get(var, "b", &bool_ret);
if (bool_ret) return;
}
else if (!strcmp(key, "IdUsage"))
eldbus_message_iter_arguments_get(var, "s", &id_usage);