Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_desklock.c e_int_config_wallpaper_import.c
Log Message:
fix import if dir contains special chars
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desklock.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_int_config_desklock.c 14 Aug 2006 15:22:45 -0000 1.28
+++ e_int_config_desklock.c 20 Aug 2006 22:51:12 -0000 1.29
@@ -58,7 +58,7 @@
int zone_count; // local variable;
- char *cur_bg; // local variable;
+ char *bg; // local variable;
Evas *evas; // local variable
Evas_Object *preview_image; // local variable
@@ -144,9 +144,9 @@
cfdata->show_password = 0;
if (!e_config->desklock_background)
- cfdata->cur_bg = strdup(DEF_DESKLOCK_BACKGROUND);
+ cfdata->bg = strdup(DEF_DESKLOCK_BACKGROUND);
else
- cfdata->cur_bg = strdup(e_config->desklock_background);
+ cfdata->bg = strdup(e_config->desklock_background);
#ifdef HAVE_PAM
cfdata->auth_method = e_config->desklock_auth_method;
@@ -176,7 +176,7 @@
E_FREE(cfdata->desklock_passwd);
E_FREE(cfdata->desklock_passwd_cp);
- E_FREE(cfdata->cur_bg);
+ E_FREE(cfdata->bg);
free(cfdata);
}
@@ -296,11 +296,11 @@
}
e_config->desklock_personal_passwd = (char
*)evas_stringshare_add(cfdata->desklock_passwd_cp);
- if (cfdata->cur_bg)
+ if (cfdata->bg)
{
if (e_config->desklock_background)
evas_stringshare_del(e_config->desklock_background);
- e_config->desklock_background = (char
*)evas_stringshare_add(cfdata->cur_bg);
+ e_config->desklock_background = (char
*)evas_stringshare_add(cfdata->bg);
}
if (_e_desklock_zone_num_get() > 1)
@@ -343,7 +343,7 @@
/* start: bkg list */
cfdata->gui.bg_list = e_widget_ilist_add(evas, BG_LIST_ICON_SIZE_W,
- BG_LIST_ICON_SIZE_H,
&(cfdata->cur_bg));
+ BG_LIST_ICON_SIZE_H, &(cfdata->bg));
e_widget_ilist_selector_set(cfdata->gui.bg_list, 1);
e_widget_min_size_set(cfdata->gui.bg_list, 180, 200);
@@ -651,16 +651,16 @@
E_Config_Dialog_Data *cfdata;
cfdata = data;
- if (cfdata->cur_bg[0])
+ if (cfdata->bg[0])
{
- if (!strcmp(cfdata->cur_bg, DEF_DESKLOCK_BACKGROUND))
+ if (!strcmp(cfdata->bg, DEF_DESKLOCK_BACKGROUND))
{
const char *theme;
theme = e_theme_edje_file_get("base/theme/desklock",
"desklock/background");
e_widget_preview_edje_set(cfdata->preview_image, theme,
"desklock/background");
}
- else if (!strcmp(cfdata->cur_bg, DEF_THEME_BACKGROUND))
+ else if (!strcmp(cfdata->bg, DEF_THEME_BACKGROUND))
{
const char *theme;
@@ -668,7 +668,7 @@
e_widget_preview_edje_set(cfdata->preview_image, theme,
"desktop/background");
}
else
- e_widget_preview_edje_set(cfdata->preview_image, cfdata->cur_bg,
"desktop/background");
+ e_widget_preview_edje_set(cfdata->preview_image, cfdata->bg,
"desktop/background");
}
else
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_int_config_wallpaper_import.c 17 Aug 2006 16:58:32 -0000 1.14
+++ e_int_config_wallpaper_import.c 20 Aug 2006 22:51:12 -0000 1.15
@@ -336,7 +336,7 @@
if (!imgdir) ipart[0] = '\0';
else
{
- snprintf(ipart, sizeof(ipart), "-id %s", imgdir);
+ snprintf(ipart, sizeof(ipart), "-id %s",
e_util_filename_escape(imgdir));
free(imgdir);
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
