protection for fools.

SVN revision: 16046
This commit is contained in:
Carsten Haitzler 2005-08-06 05:35:34 +00:00
parent 85682c6ed9
commit 6782b00ba5
2 changed files with 26 additions and 1 deletions

View File

@ -689,6 +689,16 @@ _e_int_menus_themes_pre_cb(void *data, E_Menu *m)
deftheme = et->file;
}
mi = e_menu_item_new(m);
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (((deftheme) && (!strcmp("default.edj", deftheme))) ||
(!deftheme))
e_menu_item_toggle_set(mi, 1);
e_menu_item_label_set(mi, "default");
e_menu_item_callback_set(mi, _e_int_menus_themes_edit_mode_cb, NULL);
num++;
while ((theme = ecore_list_next(themes)))
{
char *ext;
@ -700,6 +710,7 @@ _e_int_menus_themes_pre_cb(void *data, E_Menu *m)
{
mi = e_menu_item_new(m);
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (deftheme)
{
if (!strcmp(theme, deftheme))

View File

@ -61,7 +61,7 @@ main(int argc, char **argv)
int i;
int nostartup = 0;
int after_restart = 0;
char buf[1024];
char buf[PATH_MAX];
char *s;
struct sigaction action;
/* trap deadly bug signals and allow some form of sane recovery */
@ -246,6 +246,20 @@ main(int argc, char **argv)
}
}
}
/* fixes for FOOLS that keep cp'ing default.edj into ~/.e/e/themes */
{
char *homedir;
homedir = e_user_homedir_get();
if (homedir)
{
snprintf(buf, sizeof(buf), "%s/.e/e/themes/default.edj", homedir);
if (ecore_file_exists(buf))
ecore_file_unlink(buf);
free(homedir);
}
}
/* init edje and set it up in frozen mode */
edje_init();