forked from enlightenment/enlightenment
patches to remove eukit and add device icon from D99
This commit is contained in:
parent
7cfd355f7f
commit
02149c903c
17
configure.ac
17
configure.ac
|
@ -350,7 +350,6 @@ test "x${device_backend}" = "xeeze" || AC_DEFINE_UNQUOTED([HAVE_HAL],[1],[enable
|
||||||
|
|
||||||
DBUS_MOUNT_CONFIG=1
|
DBUS_MOUNT_CONFIG=1
|
||||||
dbus_mount="dbus-1"
|
dbus_mount="dbus-1"
|
||||||
udisks_mount="eukit >= $efl_version"
|
|
||||||
|
|
||||||
AC_ARG_ENABLE([mount-udisks],
|
AC_ARG_ENABLE([mount-udisks],
|
||||||
AS_HELP_STRING([--enable-mount-udisks],[enable udisks mounting support @<:@default=enabled@:>@]),
|
AS_HELP_STRING([--enable-mount-udisks],[enable udisks mounting support @<:@default=enabled@:>@]),
|
||||||
|
@ -360,22 +359,10 @@ AC_ARG_ENABLE([mount-udisks],
|
||||||
AC_MSG_CHECKING([whether the UDISKS mounting support is enabled])
|
AC_MSG_CHECKING([whether the UDISKS mounting support is enabled])
|
||||||
AC_MSG_RESULT([${e_cv_want_mount_udisks}])
|
AC_MSG_RESULT([${e_cv_want_mount_udisks}])
|
||||||
|
|
||||||
if test "x$e_cv_want_mount_udisks" != "xno";then
|
|
||||||
PKG_CHECK_EXISTS([eukit >= ${efl_version}],
|
|
||||||
[],[
|
|
||||||
udisks_mount=
|
|
||||||
AC_MSG_NOTICE([udisks mounting disabled])
|
|
||||||
])
|
|
||||||
else
|
|
||||||
udisks_mount=
|
|
||||||
AC_MSG_NOTICE([udisks mounting disabled])
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if test "x${e_cv_want_mount_udisks}" = "xno" ; then
|
if test "x${e_cv_want_mount_udisks}" = "xno" ; then
|
||||||
DBUS_MOUNT_CONFIG=0
|
DBUS_MOUNT_CONFIG=0
|
||||||
dbus_mount=
|
dbus_mount=
|
||||||
udisks_mount=
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_ARG_ENABLE([mount-eeze],
|
AC_ARG_ENABLE([mount-eeze],
|
||||||
|
@ -414,8 +401,8 @@ fi
|
||||||
AC_SUBST([EEZE_MOUNT_CONFIG])
|
AC_SUBST([EEZE_MOUNT_CONFIG])
|
||||||
AC_SUBST([DBUS_MOUNT_CONFIG])
|
AC_SUBST([DBUS_MOUNT_CONFIG])
|
||||||
AM_CONDITIONAL([HAVE_EEZE_MOUNT], [false])
|
AM_CONDITIONAL([HAVE_EEZE_MOUNT], [false])
|
||||||
test -n "$udisks_mount" && AC_DEFINE_UNQUOTED([HAVE_UDISKS_MOUNT], [1], [enable Udisks mounting])
|
test -n "$dbus_mount" && AC_DEFINE_UNQUOTED([HAVE_UDISKS_MOUNT], [1], [enable Udisks mounting])
|
||||||
AM_CONDITIONAL([HAVE_UDISKS_MOUNT], [test -n "$udisks_mount"])
|
AM_CONDITIONAL([HAVE_UDISKS_MOUNT], [test -n "$dbus_mount"])
|
||||||
AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test -n "$eeze_mount"])
|
AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test -n "$eeze_mount"])
|
||||||
|
|
||||||
# doxygen program for documentation building
|
# doxygen program for documentation building
|
||||||
|
|
|
@ -402,7 +402,7 @@ _e_fm_main_udisks_cb_store_prop(void *data, const Eldbus_Message *msg,
|
||||||
if (s->icon.drive)
|
if (s->icon.drive)
|
||||||
eina_stringshare_del(s->icon.drive);
|
eina_stringshare_del(s->icon.drive);
|
||||||
s->icon.drive = NULL;
|
s->icon.drive = NULL;
|
||||||
if (!icon[0])
|
if (icon[0])
|
||||||
s->icon.drive = eina_stringshare_add(icon);
|
s->icon.drive = eina_stringshare_add(icon);
|
||||||
s->icon.volume = s->icon.drive;
|
s->icon.volume = s->icon.drive;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue