Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_bindings.c e_fileman_smart.c
Log Message:
First get filename, then open file.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_bindings.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_bindings.c 9 Oct 2005 18:02:17 -0000 1.22
+++ e_bindings.c 10 Oct 2005 22:33:12 -0000 1.23
@@ -50,6 +50,16 @@
eb = l->data;
e_bindings_signal_add(eb->context, eb->signal, eb->source,
eb->modifiers,
eb->any_mod, eb->action, eb->params);
+ /* FIXME: Can this be solved in a generic way? */
+ if ((!strcmp(eb->action, "window_resize")) &&
+ (!strncmp(eb->signal, "mouse,down,", 11)) &&
+ (!strncmp(eb->source, "resize_", 7)))
+ {
+ e_bindings_signal_add(eb->context, "mouse,in", eb->source,
eb->modifiers,
+ eb->any_mod, "pointer_push", eb->params);
+ e_bindings_signal_add(eb->context, "mouse,out", eb->source,
eb->modifiers,
+ eb->any_mod, "pointer_pop", eb->params);
+ }
}
for (l = e_config->wheel_bindings; l; l = l->next)
@@ -61,11 +71,6 @@
eb->any_mod, eb->action, eb->params);
}
- e_bindings_signal_add(E_BINDING_CONTEXT_BORDER, "mouse,in", "resize_br",
- E_BINDING_MODIFIER_NONE, 1, "pointer_push",
"resize_br");
- e_bindings_signal_add(E_BINDING_CONTEXT_BORDER, "mouse,out", "resize_br",
- E_BINDING_MODIFIER_NONE, 1, "pointer_pop",
"resize_br");
-
return 1;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_fileman_smart.c 10 Oct 2005 22:06:20 -0000 1.14
+++ e_fileman_smart.c 10 Oct 2005 22:33:12 -0000 1.15
@@ -2540,8 +2540,15 @@
Ecore_Evas *buf;
Evas *evasbuf;
+ thumbpath = _e_fm_file_thumb_path_get(file);
+
ef = eet_open(thumbpath, EET_FILE_MODE_WRITE);
- if (!ef) return -1;
+ if (!ef)
+ {
+ free(thumpath);
+ return -1;
+ }
+ free(thumbpath);
// we need to remove the hardcode somehow.
//buf = ecore_evas_buffer_new(file->sd->icon_info.w,file->sd->icon_info.h);
@@ -2554,12 +2561,10 @@
evas_object_show(im);
data = ecore_evas_buffer_pixels_get(buf);
- thumbpath = _e_fm_file_thumb_path_get(file);
if ((size = eet_data_image_write(ef, "/thumbnail/data", (void *)data, 48,
48, 1, 0, 70, 1)) < 0)
{
printf("BUG: Couldn't write thumb db\n");
}
- free(thumbpath);
eet_close(ef);
@@ -2577,8 +2582,6 @@
unsigned int w, h;
int a, c, q, l;
- ef = eet_open(thumb, EET_FILE_MODE_READ);
- if (!ef) return NULL;
fullname = _e_fm_file_fullname(file);
if (!_e_fm_file_thumb_exists(fullname))
@@ -2586,6 +2589,16 @@
thumb = _e_fm_file_thumb_path_get(fullname);
+ ef = eet_open(thumb, EET_FILE_MODE_READ);
+ if (!ef)
+ {
+ free(fullname);
+ free(thumb);
+ return NULL;
+ }
+ free(fullname);
+ free(thumb);
+
data = eet_data_image_read(ef, "/thumbnail/data", &w, &h, &a, &c, &q, &l);
if (data)
{
@@ -2600,8 +2613,6 @@
free(data);
}
eet_close(ef);
- free(fullname);
- free(thumb);
return im;
}
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
