From 911e610febe502ae28c754c1fd9774a847f55ba2 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 19 Dec 2012 02:02:49 +0000 Subject: [PATCH] with the new randr stuff - old screen resolution settings disabled. SVN revision: 81319 --- src/modules/conf_display/e_int_config_display.c | 6 ++++-- src/modules/conf_display/e_mod_main.c | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/modules/conf_display/e_int_config_display.c b/src/modules/conf_display/e_int_config_display.c index 88bad0e6b..49a629bce 100644 --- a/src/modules/conf_display/e_int_config_display.c +++ b/src/modules/conf_display/e_int_config_display.c @@ -5,6 +5,7 @@ * Give list some icons. */ +/* #define RANDR_11 ((1 << 16) | 1) static void _fill_data(E_Config_Dialog_Data *cfdata); @@ -93,8 +94,8 @@ _surebox_dialog_cb_yes(void *data, E_Dialog *dia) _fill_data(sb->cfdata); _load_resolutions(sb->cfdata); - /* No need to load rates as the currently selected resolution has not been - * changed since last selection. */ + // No need to load rates as the currently selected resolution has not been + // changed since last selection. if (dia) _surebox_dialog_cb_delete(dia->win); } @@ -649,3 +650,4 @@ _deferred_norates_error(void *data __UNUSED__) return ECORE_CALLBACK_CANCEL; } +*/ diff --git a/src/modules/conf_display/e_mod_main.c b/src/modules/conf_display/e_mod_main.c index e04dc5b1b..1aaca93a9 100644 --- a/src/modules/conf_display/e_mod_main.c +++ b/src/modules/conf_display/e_mod_main.c @@ -20,10 +20,10 @@ e_modapi_init(E_Module *m) e_configure_registry_item_add("screen/virtual_desktops", 10, _("Virtual Desktops"), NULL, "preferences-desktop", e_int_config_desks); - e_configure_registry_item_add("screen/screen_resolution", 20, - _("Screen Resolution"), NULL, - "preferences-system-screen-resolution", - e_int_config_display); +// e_configure_registry_item_add("screen/screen_resolution", 20, +// _("Screen Resolution"), NULL, +// "preferences-system-screen-resolution", +// e_int_config_display); e_configure_registry_item_add("screen/screen_lock", 30, _("Screen Lock"), NULL, "preferences-system-lock-screen", @@ -68,15 +68,15 @@ e_modapi_shutdown(E_Module *m __UNUSED__) e_object_del(E_OBJECT(cfd)); while ((cfd = e_config_dialog_get("E", "screen/screen_lock"))) e_object_del(E_OBJECT(cfd)); - while ((cfd = e_config_dialog_get("E", "screen/screen_resolution"))) - e_object_del(E_OBJECT(cfd)); +// while ((cfd = e_config_dialog_get("E", "screen/screen_resolution"))) +// e_object_del(E_OBJECT(cfd)); while ((cfd = e_config_dialog_get("E", "screen/virtual_desktops"))) e_object_del(E_OBJECT(cfd)); e_configure_registry_item_del("screen/power_management"); e_configure_registry_item_del("screen/screen_saver"); e_configure_registry_item_del("screen/screen_lock"); - e_configure_registry_item_del("screen/screen_resolution"); +// e_configure_registry_item_del("screen/screen_resolution"); e_configure_registry_item_del("screen/virtual_desktops"); e_configure_registry_category_del("screen");