styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove old unused stuff. 

SVN revision: 27596
This commit is contained in:
Sebastian Dransfeld 2006-12-28 14:08:54 +00:00
parent 5f0627fe83
commit 3e597341fd
2 changed files with 2 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/bin/e_int_border_menu.c
View File

@ -23,7 +23,6 @@ static void _e_border_menu_cb_stick(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_on_top(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_normal(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_below(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_borderless(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_fullscreen(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_skip_winlist(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_sendto_pre(void *data, E_Menu *m, E_Menu_Item *mi);
@ -214,24 +213,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_
e_theme_edje_file_get("base/theme/borders",
"e/widgets/border/default/stick"),
"e/widgets/border/default/stick");
/* Removed as Borderless is in the Borders dialog also */
/*
if ((!bd->shaded) && (!bd->fullscreen) && (!bd->lock_border))
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Borderless"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, ((bd->client.border.name) && !strcmp("borderless", bd->client.border.name)));
e_menu_item_callback_set(mi, _e_border_menu_cb_borderless, bd);
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders",
"e/widgets/border/default/borderless"),
"e/widgets/border/default/borderless");
}
*/
if ((bd->client.icccm.accepts_focus || bd->client.icccm.take_focus) &&
(!bd->client.netwm.state.skip_taskbar))
{
@ -734,34 +716,6 @@ _e_border_menu_cb_normal(void *data, E_Menu *m, E_Menu_Item *mi)
}
}
static void
_e_border_menu_cb_borderless(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Border *bd;
int toggle;
bd = data;
if (!bd) return;
if (!bd->lock_border)
{
toggle = e_menu_item_toggle_get(mi);
if (toggle)
{
bd->borderless = 1;
ecore_x_mwm_borderless_set(bd->client.win, 1);
}
else
{
bd->borderless = 0;
ecore_x_mwm_borderless_set(bd->client.win, 0);
}
bd->client.border.changed = 1;
bd->changed = 1;
}
}
static void
_e_border_menu_cb_fullscreen(void *data, E_Menu *m, E_Menu_Item *mi)
{

82
src/bin/e_int_config_desklock.c
View File

@ -30,11 +30,7 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
static int _e_desklock_zone_num_get(void);
static void _e_desklock_cb_show_passwd(void *data, Evas_Object *obj);
static void _e_desklock_cb_lb_show_change(void *data, Evas_Object *obj);
#ifdef HAVE_PAM
static void _e_desklock_cb_auth_method_change(void *data, Evas_Object *obj);
#endif
/*******************************************************************************************/
@ -405,52 +401,8 @@ static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ob;
#ifdef HAVE_PAM
E_Radio_Group *rg_auth;
Evas_Object *oc;
#endif
o = e_widget_list_add(evas, 0, 0);
/*
#ifdef HAVE_PAM
of = e_widget_framelist_add(evas, _("Password Type"), 0);
rg_auth = e_widget_radio_group_new((int*)(&cfdata->auth_method));
oc = e_widget_radio_add(evas, _("Use my login password"), 0, rg_auth);
e_widget_on_change_hook_set(oc, _e_desklock_cb_auth_method_change, cfdata);
e_widget_framelist_object_append(of, oc);
oc = e_widget_radio_add(evas, _("Personalized password"), 1, rg_auth);
e_widget_on_change_hook_set(oc, _e_desklock_cb_auth_method_change, cfdata);
e_widget_framelist_object_append(of, oc);
e_widget_list_object_append(o, of, 1, 1, 0.5);
#endif
of = e_widget_framelist_add(evas, _("Personalized Password:"), 0);
cfdata->gui.passwd_field = ob = e_widget_entry_add(evas, &(cfdata->desklock_passwd));
#ifdef HAVE_PAM
if (cfdata->auth_method == 0) e_widget_disabled_set(ob, 1);
#endif
e_widget_entry_password_set(ob, !cfdata->show_password);
e_widget_min_size_set(ob, 200, 25);
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Show password"), &(cfdata->show_password));
e_widget_on_change_hook_set(ob, _e_desklock_cb_show_passwd, cfdata);
cfdata->gui.show_passwd_check = ob;
#ifdef HAVE_PAM
if (cfdata->auth_method == 0) e_widget_disabled_set(ob, 1);
#endif
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
*/
of = e_widget_framelist_add(evas, _("Automatic Locking"), 0);
e_widget_disabled_set(of, !ecore_x_screensaver_event_available_get());
@ -530,7 +482,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *ob, *oc;
Evas_Object *ob;
Evas_Object *o, *ot, *of, *il, *ol;
char path[4096];
const char *homedir;
@ -538,9 +490,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
E_Fm2_Config fmc;
E_Zone *z;
E_Radio_Group *rg;
#ifdef HAVE_PAM
E_Radio_Group *rg_auth;
#endif
homedir = e_user_homedir_get();
@ -793,15 +742,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
/* general functionality/callbacks */
static void
_e_desklock_cb_show_passwd(void *data, Evas_Object *obj)
{
E_Config_Dialog_Data *cfdata;
cfdata = data;
e_widget_entry_password_set(cfdata->gui.passwd_field, !cfdata->show_password);
}
static int
_e_desklock_zone_num_get(void)
{
@ -845,23 +785,3 @@ _e_desklock_cb_lb_show_change(void *data, Evas_Object *obj)
e_widget_disabled_set(cfdata->gui.loginbox_obj.screen_slider, 0);
}
}
#ifdef HAVE_PAM
static void
_e_desklock_cb_auth_method_change(void *data, Evas_Object *obj)
{
E_Config_Dialog_Data *cfdata;
cfdata = data;
if (cfdata->auth_method == 0)
{
e_widget_disabled_set(cfdata->gui.passwd_field, 1);
e_widget_disabled_set(cfdata->gui.show_passwd_check, 1);
}
else if (cfdata->auth_method == 1)
{
e_widget_disabled_set(cfdata->gui.passwd_field, 0);
e_widget_disabled_set(cfdata->gui.show_passwd_check, 0);
}
}
#endif