Enlightenment CVS committal
Author : kiwi
Project : e_modules
Module : devian
Dir : e_modules/devian/src/module
Modified Files:
e_mod_config_dialog.c e_mod_config_dialog_devian.c
e_mod_data_file.c
Log Message:
Log feature work
* Enable font size configuration
* Remove printf
===================================================================
RCS file: /cvs/e/e_modules/devian/src/module/e_mod_config_dialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_config_dialog.c 18 Apr 2006 08:08:22 -0000 1.4
+++ e_mod_config_dialog.c 18 Apr 2006 11:32:59 -0000 1.5
@@ -132,12 +132,26 @@
conf = DEVIANM->conf;
- cfdata->viewer_http = strdup(conf->viewer_http);
- cfdata->viewer_image = strdup(conf->viewer_image);
- cfdata->viewer_file = strdup(conf->viewer_file);
+ if (conf->viewer_http)
+ cfdata->viewer_http = strdup(conf->viewer_http);
+ else
+ cfdata->viewer_http = strdup ("");
+
+ if (conf->viewer_image)
+ cfdata->viewer_image = strdup(conf->viewer_image);
+ else
+ cfdata->viewer_image = strdup("");
+
+ if (conf->viewer_file)
+ cfdata->viewer_file = strdup(conf->viewer_file);
+ else
+ cfdata->viewer_file = strdup("");
#ifdef HAVE_PICTURE
- cfdata->sources_picture_data_import_dir =
strdup(conf->sources_picture_data_import_dir);
+ if (conf->sources_picture_data_import_dir)
+ cfdata->sources_picture_data_import_dir =
strdup(conf->sources_picture_data_import_dir);
+ else
+ cfdata->sources_picture_data_import_dir = strdup("");
cfdata->sources_picture_data_import_recursive =
conf->sources_picture_data_import_recursive;
cfdata->sources_picture_data_import_hidden =
conf->sources_picture_data_import_hidden;
#endif
===================================================================
RCS file: /cvs/e/e_modules/devian/src/module/e_mod_config_dialog_devian.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_config_dialog_devian.c 11 Apr 2006 11:18:44 -0000 1.4
+++ e_mod_config_dialog_devian.c 18 Apr 2006 11:32:59 -0000 1.5
@@ -245,7 +245,10 @@
#ifdef HAVE_FILE
if (cfdata->s_file)
{
- cfdata->source_file_path = strdup(d_conf->file_path);
+ if (d_conf->file_path)
+ cfdata->source_file_path = strdup(d_conf->file_path);
+ else
+ cfdata->source_file_path = strdup("");
cfdata->source_file_auto_scroll = d_conf->file_auto_scroll;
}
#endif
===================================================================
RCS file: /cvs/e/e_modules/devian/src/module/e_mod_data_file.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_data_file.c 18 Apr 2006 08:08:22 -0000 1.5
+++ e_mod_data_file.c 18 Apr 2006 11:32:59 -0000 1.6
@@ -110,18 +110,14 @@
Evas_Textblock_Style *tb_style;
char style[1024];
- /*
- * snprintf(style, sizeof(style),
- * "DEFAULT='font=Vera font_size=%d align=left color=#000000ff wrap=word'"
- * "br='\n'",
- * DEVIANM->conf->sources_file_font_size);
- */
+ snprintf(style, sizeof(style),
+ "DEFAULT='font=Vera font_size=%d align=left color=#000000ff wrap=line'
br='\n'",
+ DEVIANM->conf->sources_file_font_size);
tb = evas_object_textblock_add(DEVIANM->container->bg_evas);
tb_style = evas_textblock_style_new();
- evas_textblock_style_set(tb_style, "DEFAULT='font=Vera font_size=10
align=left color=#000000ff wrap=line'" "br='\n'");
- /* evas_textblock_style_set(tb_style,
- * style); */
+ //evas_textblock_style_set(tb_style, "DEFAULT='font=Vera font_size=10
align=left color=#000001ff wrap=line'" "br='\n'");
+ evas_textblock_style_set(tb_style, style);
evas_object_textblock_style_set(tb, tb_style);
evas_textblock_style_free(tb_style);
@@ -169,8 +165,8 @@
pos = E_NEW(int, 1);
*pos = p2 - *buffer;
ecore_list_append(lines, pos);
- printf("pos %d sizeleft %d (new %d) size %d (p1 %5.5s p2 %5.5s)\nBUF
:\n%s",
- *pos, size_left, *size - (*pos +1), *size, p1, p2, *buffer);
+ DDATAFILE(("pos %d sizeleft %d (new %d) size %d (p1 %5.5s p2
%5.5s)\nBUF :\n%s",
+ *pos, size_left, *size - (*pos +1), *size, p1, p2, *buffer));
/* Replace by <br> */
*size = *size + 3;
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
