forked from enlightenment/enlightenment
parent
27a177e90e
commit
b8cd2447aa
|
@ -2272,8 +2272,7 @@ _e_fm2_dev_path_map(const char *dev, const char *path)
|
|||
else if (CMP("removable:*"))
|
||||
{
|
||||
E_Volume *v;
|
||||
char *mountpoint;
|
||||
|
||||
|
||||
v = e_fm2_hal_volume_find(dev + strlen("removable:"));
|
||||
if (v)
|
||||
{
|
||||
|
|
|
@ -81,7 +81,7 @@ e_fm2_hal_storage_find(const char *udi)
|
|||
{
|
||||
Evas_List *l;
|
||||
|
||||
if (!udi) return;
|
||||
if (!udi) return NULL;
|
||||
|
||||
for (l = _e_stores; l; l = l->next)
|
||||
{
|
||||
|
@ -98,7 +98,7 @@ e_fm2_hal_volume_add(E_Volume *v)
|
|||
{
|
||||
E_Storage *s;
|
||||
|
||||
if (e_fm2_hal_volume_find(v)) return;
|
||||
if (e_fm2_hal_volume_find(v->udi)) return;
|
||||
|
||||
v->validated = 1;
|
||||
_e_vols = evas_list_append(_e_vols, v);
|
||||
|
@ -401,7 +401,7 @@ e_fm2_hal_mount(E_Volume *v,
|
|||
{
|
||||
E_Fm2_Mount *m;
|
||||
|
||||
if (!v) return;
|
||||
if (!v) return NULL;
|
||||
|
||||
m = calloc(1, sizeof(E_Fm2_Mount));
|
||||
if (!m) return NULL;
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include <Ecore_Ipc.h>
|
||||
#include <Ecore_File.h>
|
||||
#include <Evas.h>
|
||||
#include <Efreet.h>
|
||||
#include <Eet.h>
|
||||
#include "config.h"
|
||||
|
||||
|
@ -689,10 +690,8 @@ static void
|
|||
_e_dbus_cb_vol_prop_mount_modified(void *data, void *reply_data, DBusError *error)
|
||||
{
|
||||
E_Volume *v = data;
|
||||
E_Storage *s = NULL;
|
||||
E_Hal_Device_Get_All_Properties_Return *ret = reply_data;
|
||||
int err = 0;
|
||||
char *str = NULL;
|
||||
|
||||
if (!ret) return;
|
||||
if (dbus_error_is_set(error))
|
||||
|
|
|
@ -39,6 +39,7 @@ e_int_config_battery_module(E_Container *con, const char *params __UNUSED__)
|
|||
"E", "_e_mod_battery_config_dialog",
|
||||
buf, 0, v, NULL);
|
||||
battery_config->config_dialog = cfd;
|
||||
return cfd;
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -27,7 +27,7 @@ e_int_config_dropshadow_module(E_Container *con, const char *params __UNUSED__)
|
|||
Dropshadow *ds;
|
||||
|
||||
ds = dropshadow_mod->data;
|
||||
if (e_config_dialog_find("E", "_e_mod_dropshadow_config_dialog")) return;
|
||||
if (e_config_dialog_find("E", "_e_mod_dropshadow_config_dialog")) return NULL;
|
||||
v = E_NEW(E_Config_Dialog_View, 1);
|
||||
|
||||
v->create_cfdata = _create_data;
|
||||
|
@ -41,6 +41,7 @@ e_int_config_dropshadow_module(E_Container *con, const char *params __UNUSED__)
|
|||
"E", "_e_mod_dropshadow_config_dialog",
|
||||
buf, 0, v, ds);
|
||||
ds->config_dialog = cfd;
|
||||
return cfd;
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
Loading…
Reference in New Issue