summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2019-06-02 19:01:41 +0200
committerDave Andreoli <dave@gurumeditation.it>2019-06-02 19:01:41 +0200
commit468cc4243e578b24068f2b7a9bb3f1d558937b2b (patch)
tree2b8a7c8535fba9c536901734488b184467f50656
parent65bd9f748bc53b41218dbac90b7900a2123f9d7b (diff)
Unbork places module after unknown efl changesHEADmaster
-rw-r--r--configure.ac12
-rw-r--r--src/e_mod_eeze.c2
-rw-r--r--src/e_mod_mount.c2
-rw-r--r--src/e_mod_places.c18
-rw-r--r--src/e_mod_udisks_eldbus.c12
5 files changed, 23 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac
index 06f9d03..8025481 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,14 +92,14 @@ if test "x$want_eeze" != "xyes";then
92fi 92fi
93 93
94 94
95AM_CONDITIONAL([HAVE_ELDBUS], [test "x$have_eldbus" = "xyes"]) 95AM_CONDITIONAL([PLACES_HAVE_ELDBUS], [test "x$have_eldbus" = "xyes"])
96test "x$have_eldbus" = "xyes" && AC_DEFINE_UNQUOTED([HAVE_ELDBUS], [1], [enable eldbus support]) 96test "x$have_eldbus" = "xyes" && AC_DEFINE_UNQUOTED([PLACES_HAVE_ELDBUS], [1], [enable eldbus support])
97 97
98AM_CONDITIONAL([HAVE_EEZE], [test "x$have_eeze" = "xyes"]) 98AM_CONDITIONAL([PLACES_HAVE_EEZE], [test "x$have_eeze" = "xyes"])
99test "x$have_eeze" = "xyes" && AC_DEFINE_UNQUOTED([HAVE_EEZE], [1], [enable eeze support]) 99test "x$have_eeze" = "xyes" && AC_DEFINE_UNQUOTED([PLACES_HAVE_EEZE], [1], [enable eeze support])
100 100
101AM_CONDITIONAL([HAVE_MOUNT], [test "x$have_mount" = "xyes"]) 101AM_CONDITIONAL([PLACES_HAVE_MOUNT], [test "x$have_mount" = "xyes"])
102test "x$have_mount" = "xyes" && AC_DEFINE_UNQUOTED([HAVE_MOUNT], [1], [enable mount support]) 102test "x$have_mount" = "xyes" && AC_DEFINE_UNQUOTED([PLACES_HAVE_MOUNT], [1], [enable mount support])
103 103
104 104
105# homedir install 105# homedir install
diff --git a/src/e_mod_eeze.c b/src/e_mod_eeze.c
index f253a27..2b5c9c6 100644
--- a/src/e_mod_eeze.c
+++ b/src/e_mod_eeze.c
@@ -3,7 +3,7 @@
3# include "config.h" 3# include "config.h"
4#endif 4#endif
5 5
6#ifdef HAVE_EEZE 6#ifdef PLACES_HAVE_EEZE
7 7
8#include <e.h> 8#include <e.h>
9#include "e_mod_places.h" 9#include "e_mod_places.h"
diff --git a/src/e_mod_mount.c b/src/e_mod_mount.c
index 178ed5f..54de89c 100644
--- a/src/e_mod_mount.c
+++ b/src/e_mod_mount.c
@@ -2,7 +2,7 @@
2# include "config.h" 2# include "config.h"
3#endif 3#endif
4 4
5#ifdef HAVE_MOUNT 5#ifdef PLACES_HAVE_MOUNT
6 6
7#include <e.h> 7#include <e.h>
8#include "e_mod_main.h" 8#include "e_mod_main.h"
diff --git a/src/e_mod_places.c b/src/e_mod_places.c
index ce60a78..9f4e010 100644
--- a/src/e_mod_places.c
+++ b/src/e_mod_places.c
@@ -5,13 +5,13 @@
5#include <sys/statvfs.h> 5#include <sys/statvfs.h>
6#include "e_mod_main.h" 6#include "e_mod_main.h"
7#include "e_mod_places.h" 7#include "e_mod_places.h"
8#ifdef HAVE_EEZE 8#ifdef PLACES_HAVE_EEZE
9# include "e_mod_eeze.h" 9# include "e_mod_eeze.h"
10#endif 10#endif
11#ifdef HAVE_ELDBUS 11#ifdef PLACES_HAVE_ELDBUS
12# include "e_mod_udisks_eldbus.h" 12# include "e_mod_udisks_eldbus.h"
13#endif 13#endif
14#ifdef HAVE_MOUNT 14#ifdef PLACES_HAVE_MOUNT
15# include "e_mod_mount.h" 15# include "e_mod_mount.h"
16#endif 16#endif
17 17
@@ -42,13 +42,13 @@ places_init(void)
42 42
43 printf("PLACES: Init\n"); 43 printf("PLACES: Init\n");
44 44
45#ifdef HAVE_EEZE 45#ifdef PLACES_HAVE_EEZE
46 places_eeze_init(); 46 places_eeze_init();
47#endif 47#endif
48#ifdef HAVE_ELDBUS 48#ifdef PLACES_HAVE_ELDBUS
49 places_udisks_eldbus_init(); 49 places_udisks_eldbus_init();
50#endif 50#endif
51#ifdef HAVE_MOUNT 51#ifdef PLACES_HAVE_MOUNT
52 places_mount_init(); 52 places_mount_init();
53#endif 53#endif
54 54
@@ -65,13 +65,13 @@ places_shutdown(void)
65 while (volumes) 65 while (volumes)
66 places_volume_del((Volume*)volumes->data); 66 places_volume_del((Volume*)volumes->data);
67 67
68#ifdef HAVE_EEZE 68#ifdef PLACES_HAVE_EEZE
69 places_eeze_shutdown(); 69 places_eeze_shutdown();
70#endif 70#endif
71#ifdef HAVE_ELDBUS 71#ifdef PLACES_HAVE_ELDBUS
72 places_udisks_eldbus_shutdown(); 72 places_udisks_eldbus_shutdown();
73#endif 73#endif
74#ifdef HAVE_MOUNT 74#ifdef PLACES_HAVE_MOUNT
75 places_mount_shutdown(); 75 places_mount_shutdown();
76#endif 76#endif
77} 77}
diff --git a/src/e_mod_udisks_eldbus.c b/src/e_mod_udisks_eldbus.c
index e448361..a6b923b 100644
--- a/src/e_mod_udisks_eldbus.c
+++ b/src/e_mod_udisks_eldbus.c
@@ -3,7 +3,7 @@
3# include "config.h" 3# include "config.h"
4#endif 4#endif
5 5
6#ifdef HAVE_ELDBUS 6#ifdef PLACES_HAVE_ELDBUS
7 7
8#include <e.h> 8#include <e.h>
9#include <Eldbus.h> 9#include <Eldbus.h>
@@ -211,7 +211,7 @@ _places_udisks_vol_props_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendin
211 { 211 {
212 Eldbus_Message_Iter *var; 212 Eldbus_Message_Iter *var;
213 const char *key; 213 const char *key;
214 Eina_Bool bool; 214 Eina_Bool bool_ret;
215 215
216 if (!eldbus_message_iter_arguments_get(dict, "sv", &key, &var)) 216 if (!eldbus_message_iter_arguments_get(dict, "sv", &key, &var))
217 continue; 217 continue;
@@ -219,14 +219,14 @@ _places_udisks_vol_props_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendin
219 // skip volumes with volume.ignore set 219 // skip volumes with volume.ignore set
220 if (!strcmp(key, "DeviceIsMediaChangeDetectionInhibited")) 220 if (!strcmp(key, "DeviceIsMediaChangeDetectionInhibited"))
221 { 221 {
222 eldbus_message_iter_arguments_get(var, "b", &bool); 222 eldbus_message_iter_arguments_get(var, "b", &bool_ret);
223 if (bool) return; 223 if (bool_ret) return;
224 } 224 }
225 // skip volumes with presentation.hide set 225 // skip volumes with presentation.hide set
226 if (!strcmp(key, "DevicePresentationHide")) 226 if (!strcmp(key, "DevicePresentationHide"))
227 { 227 {
228 eldbus_message_iter_arguments_get(var, "b", &bool); 228 eldbus_message_iter_arguments_get(var, "b", &bool_ret);
229 if (bool) return; 229 if (bool_ret) return;
230 } 230 }
231 else if (!strcmp(key, "IdUsage")) 231 else if (!strcmp(key, "IdUsage"))
232 eldbus_message_iter_arguments_get(var, "s", &id_usage); 232 eldbus_message_iter_arguments_get(var, "s", &id_usage);