Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entice
Dir : e17/apps/entice/src/bin
Modified Files:
entice.c image.c ipc.c
Log Message:
Holy Shit! Leak on EVERY image switch, bad bad.
Ran indent, fixed leak, fix last image staying on screen even though it was
deleted.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- entice.c 8 Jan 2004 18:12:49 -0000 1.29
+++ entice.c 9 Jan 2004 04:55:05 -0000 1.30
@@ -292,7 +292,7 @@
}
else
{
- fprintf(stderr, "Error Loading Source Image !!!!\n");
+ fprintf(stderr, "Error Loading Source Image !!!!\n");
}
}
return;
@@ -532,6 +532,7 @@
"");
edje_object_part_text_set(entice->edje, "EnticeFileName", "");
entice->thumb.list = evas_list_free(entice->thumb.list);
+ entice_current_free();
}
}
else
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/image.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- image.c 13 Dec 2003 06:36:47 -0000 1.36
+++ image.c 9 Jan 2004 04:55:05 -0000 1.37
@@ -598,7 +598,12 @@
{
if (im->filename)
free(im->filename);
- evas_object_del(im->obj);
+ if (im->format)
+ free(im->format);
+ if (im->obj)
+ evas_object_del(im->obj);
+ if (im->clip)
+ evas_object_del(im->clip);
free(im);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/ipc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ipc.c 8 Jan 2004 05:03:54 -0000 1.6
+++ ipc.c 9 Jan 2004 04:55:05 -0000 1.7
@@ -104,23 +104,22 @@
char buf[e->size];
snprintf(buf, e->size, "%s", (char *) e->data);
- switch(e->major)
+ switch (e->major)
{
- case IPC_FILE_APPEND:
- entice_file_add(buf);
- break;
- case IPC_FILE_DISPLAY:
- entice_current_image_set(buf);
- break;
- default:
- fprintf(stderr, "Unknown major code sent by client(%d)\n",
- e->major);
- break;
+ case IPC_FILE_APPEND:
+ entice_file_add(buf);
+ break;
+ case IPC_FILE_DISPLAY:
+ entice_current_image_set(buf);
+ break;
+ default:
+ fprintf(stderr, "Unknown major code sent by client(%d)\n",
+ e->major);
+ break;
}
- /*
+ /*
printf("!! Client sent: [%i] [%i] (%i) \"%s\"\n", e->major,
- e->minor, e->size, buf);
- */
+ e->minor, e->size, buf); */
}
return (1);
}
@@ -152,10 +151,10 @@
ecore_ipc_server_del(server);
for (i = 1; i < argc; i++)
{
- entice_file_add_job_cb((void*)argv[i], IPC_FILE_APPEND);
+ entice_file_add_job_cb((void *) argv[i], IPC_FILE_APPEND);
}
- if(argc > 0)
- entice_file_add_job_cb((void*)argv[1], IPC_FILE_DISPLAY);
+ if (argc > 0)
+ entice_file_add_job_cb((void *) argv[1], IPC_FILE_DISPLAY);
return (1);
}
/* Otherwise we create it */
@@ -165,9 +164,8 @@
snprintf(buf, PATH_MAX, "%s/.ecore/entice/0", getenv("HOME"));
unlink(buf);
- /*
- printf("creating new server\n");
- */
+ /*
+ printf("creating new server\n"); */
server = ecore_ipc_server_add(ECORE_IPC_LOCAL_USER, IPC_TITLE, 0, NULL);
if (server == NULL)
printf("creating new IPC server failed\n");
@@ -177,9 +175,8 @@
NULL);
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DATA, ipc_client_data,
NULL);
- /*
- fprintf(stderr, "Listener Started\n");
- */
+ /*
+ fprintf(stderr, "Listener Started\n"); */
}
return (0);
}
@@ -220,7 +217,7 @@
NULL);
ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA, ipc_server_data,
NULL);
-
+
snprintf(buf, PATH_MAX, "%s", file);
ecore_ipc_server_send(server, major, 6, 0, 0, 0, buf, strlen(buf) + 1);
memset(buf, 0, sizeof(buf));
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
