summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Lima Chaves <glima@profusion.mobi>2010-10-13 12:36:42 +0000
committerGustavo Lima Chaves <glima@profusion.mobi>2010-10-13 12:36:42 +0000
commit8b56cd37311cce8dd848b3299bd123841ce2844b (patch)
treee11f01e35975329bbc06e18146b0abcf9d409823
parentda963d78d92ff7e736196a32fff1820258714464 (diff)
downloadenlightenment-8b56cd37311cce8dd848b3299bd123841ce2844b.tar.gz
Fixing boo boo @ disco stu's changeset.
Patch by FidĂȘncio. SVN revision: 53352
-rw-r--r--src/modules/fileman/e_mod_config.c22
-rw-r--r--src/modules/fileman/e_mod_main.c2
2 files changed, 12 insertions, 12 deletions
diff --git a/src/modules/fileman/e_mod_config.c b/src/modules/fileman/e_mod_config.c
index d0f8979430..dab16f8240 100644
--- a/src/modules/fileman/e_mod_config.c
+++ b/src/modules/fileman/e_mod_config.c
@@ -1,7 +1,7 @@
#include "e.h"
#include "e_mod_main.h"
#include "e_mod_config.h"
-#include "e_fm_dbus.h"
+#include "e_fm_device.h"
struct _E_Config_Dialog_Data
{
@@ -125,9 +125,9 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->selection.windows_modifiers = fileman_config->selection.windows_modifiers;
cfdata->list.sort.dirs.first = fileman_config->list.sort.dirs.first;
cfdata->list.sort.case_sen = !(fileman_config->list.sort.no_case);
- cfdata->dbus.desktop = e_config->dbus_desktop;
- cfdata->dbus.auto_mount = e_config->dbus_auto_mount;
- cfdata->dbus.auto_open = e_config->dbus_auto_open;
+ cfdata->dbus.desktop = e_config->device_desktop;
+ cfdata->dbus.auto_mount = e_config->device_auto_mount;
+ cfdata->dbus.auto_open = e_config->device_auto_open;
}
static void
@@ -158,14 +158,14 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
fileman_config->list.sort.dirs.last = !(cfdata->list.sort.dirs.first);
fileman_config->list.sort.no_case = !(cfdata->list.sort.case_sen);
- e_config->dbus_desktop = cfdata->dbus.desktop;
- if(e_config->dbus_desktop)
+ e_config->device_desktop = cfdata->dbus.desktop;
+ if(e_config->device_desktop)
e_fm2_device_show_desktop_icons();
else
e_fm2_device_hide_desktop_icons();
- e_config->dbus_auto_mount = cfdata->dbus.auto_mount;
- e_config->dbus_auto_open = cfdata->dbus.auto_open;
+ e_config->device_auto_mount = cfdata->dbus.auto_mount;
+ e_config->device_auto_open = cfdata->dbus.auto_open;
e_config_save_queue();
@@ -191,9 +191,9 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
(fileman_config->list.sort.dirs.first != cfdata->list.sort.dirs.first) ||
(fileman_config->list.sort.dirs.last != !(cfdata->list.sort.dirs.first)) ||
(fileman_config->list.sort.no_case != !(cfdata->list.sort.case_sen)) ||
- (e_config->dbus_desktop != cfdata->dbus.desktop) ||
- (e_config->dbus_auto_mount != cfdata->dbus.auto_mount) ||
- (e_config->dbus_auto_open != cfdata->dbus.auto_open));
+ (e_config->device_desktop != cfdata->dbus.desktop) ||
+ (e_config->device_auto_mount != cfdata->dbus.auto_mount) ||
+ (e_config->device_auto_open != cfdata->dbus.auto_open));
}
static Evas_Object *
diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c
index 9af8b4dcaf..8ea7f5f9bc 100644
--- a/src/modules/fileman/e_mod_main.c
+++ b/src/modules/fileman/e_mod_main.c
@@ -1,5 +1,5 @@
#include "e.h"
-#include "e_fm_dbus.h"
+#include "e_fm_device.h"
#include "e_mod_main.h"
#include "e_mod_config.h"
#include "e_mod_dbus.h"