discomfitor pushed a commit to branch enlightenment-0.20.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=93e47dda3aee7dba8e985eddb0d3cbe138cb2c12
commit 93e47dda3aee7dba8e985eddb0d3cbe138cb2c12
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Fri Apr 22 13:30:05 2016 -0400
remove some X references in settings dialogs
fix T3435
---
.../conf_applications/e_int_config_deskenv.c | 23 +++++++++++++---------
src/modules/conf_display/e_int_config_desklock.c | 2 +-
src/modules/conf_interaction/e_int_config_mouse.c | 4 ++--
src/modules/conf_theme/e_int_config_xsettings.c | 2 ++
4 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/modules/conf_applications/e_int_config_deskenv.c
b/src/modules/conf_applications/e_int_config_deskenv.c
index 7a83124..cec587f 100644
--- a/src/modules/conf_applications/e_int_config_deskenv.c
+++ b/src/modules/conf_applications/e_int_config_deskenv.c
@@ -141,15 +141,20 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas
*evas, E_Config_Dialog_Data
&(cfdata->exe_always_single_instance));
e_widget_framelist_object_append(fr, ob);
e_widget_list_object_append(o, fr, 1, 0, 0.0);
-
- fr = e_widget_framelist_add(evas, _("X11 Basics"), 0);
- ob = e_widget_check_add(evas, _("Load X Resources"),
- &(cfdata->load_xrdb));
- e_widget_framelist_object_append(fr, ob);
- ob = e_widget_check_add(evas, _("Load X Modifier Map"),
- &(cfdata->load_xmodmap));
- e_widget_framelist_object_append(fr, ob);
- e_widget_list_object_append(o, fr, 1, 0, 0.0);
+
+#ifndef HAVE_WAYLAND_ONLY
+ if (e_comp->comp_type == E_PIXMAP_TYPE_X)
+ {
+ fr = e_widget_framelist_add(evas, _("X11 Basics"), 0);
+ ob = e_widget_check_add(evas, _("Load X Resources"),
+ &(cfdata->load_xrdb));
+ e_widget_framelist_object_append(fr, ob);
+ ob = e_widget_check_add(evas, _("Load X Modifier Map"),
+ &(cfdata->load_xmodmap));
+ e_widget_framelist_object_append(fr, ob);
+ e_widget_list_object_append(o, fr, 1, 0, 0.0);
+ }
+#endif
fr = e_widget_framelist_add(evas, _("Major Desktops"), 0);
ob = e_widget_check_add(evas, _("Start GNOME services on login"),
diff --git a/src/modules/conf_display/e_int_config_desklock.c
b/src/modules/conf_display/e_int_config_desklock.c
index 8e96d9e..9223dd1 100644
--- a/src/modules/conf_display/e_int_config_desklock.c
+++ b/src/modules/conf_display/e_int_config_desklock.c
@@ -346,7 +346,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
/* Timers */
ol = e_widget_list_add(evas, 0, 0);
- oc = e_widget_check_add(evas, _("Lock after X screensaver activates"),
+ oc = e_widget_check_add(evas, _("Lock after screensaver activates"),
&cfdata->screensaver_lock);
e_widget_disabled_set(oc, !cfdata->use_xscreensaver);
e_widget_list_object_append(ol, oc, 1, 1, 0.5);
diff --git a/src/modules/conf_interaction/e_int_config_mouse.c
b/src/modules/conf_interaction/e_int_config_mouse.c
index e807809..18de2fd 100644
--- a/src/modules/conf_interaction/e_int_config_mouse.c
+++ b/src/modules/conf_interaction/e_int_config_mouse.c
@@ -155,11 +155,11 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED,
Evas *evas, E_Config_Dia
e_widget_framelist_object_append(of, ob);
e_widget_check_widget_disable_on_unchecked_add(oc, ob);
- ob = e_widget_label_add(evas, _("Theme"));
+ ob = e_widget_label_add(evas, _("E Theme"));
e_widget_framelist_object_append(of, ob);
e_widget_check_widget_disable_on_unchecked_add(oc, ob);
- ob = e_widget_radio_add(evas, _("X"), 0, rg);
+ ob = e_widget_radio_add(evas, _("Application"), 0, rg);
e_widget_on_change_hook_set(ob, _use_e_cursor_cb_change, cfdata);
e_widget_framelist_object_append(of, ob);
e_widget_check_widget_disable_on_unchecked_add(oc, ob);
diff --git a/src/modules/conf_theme/e_int_config_xsettings.c
b/src/modules/conf_theme/e_int_config_xsettings.c
index e5cf725..e3c46f8 100644
--- a/src/modules/conf_theme/e_int_config_xsettings.c
+++ b/src/modules/conf_theme/e_int_config_xsettings.c
@@ -482,9 +482,11 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas
*evas, E_Config_Dialog_Data
* e_widget_list_object_append(o, ow, 0, 0, 0.0); */
// >> advanced
+#ifndef HAVE_WAYLAND_ONLY
oc = e_widget_check_add(evas, _("Enable X Application Settings"),
&(cfdata->enable_xsettings));
e_widget_list_object_append(ol, oc, 0, 0, 0.0);
+#endif
e_widget_check_widget_disable_on_unchecked_add(oc, ilist);
e_widget_check_widget_disable_on_unchecked_add(oc, ow);
e_widget_toolbook_page_append(otb, NULL, _("GTK Applications"), ol,
--
