Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop.c ecore_desktop_icon.c ecore_desktop_menu.c
Log Message:
* Revert the ubuntu fix coz it breaks fedora core.
* Try a quick work around for that reported memory eating loop.
I'll fix these properly later today.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- ecore_desktop.c 10 Nov 2006 19:58:18 -0000 1.65
+++ ecore_desktop.c 12 Nov 2006 02:48:34 -0000 1.66
@@ -841,6 +841,7 @@
{
Ecore_List *result;
char *sub_result = NULL, *params = NULL;
+ int is_single;
result = ecore_list_new();
if (!result) return NULL;
@@ -912,9 +913,10 @@
ecore_dlist_goto_first(command);
while ((p = ecore_dlist_next(command)) != NULL)
{
- int do_file = 0, is_single = 0, is_URL = 0, is_directory =
0, is_file = 0;
+ int do_file = 0, is_URL = 0, is_directory = 0, is_file = 0;
t = NULL;
+ is_single = 0;
if (p[0] == '%')
switch (p[1])
{
@@ -1111,7 +1113,7 @@
* go back and do it all again for the next file.
*/
}
- while((fill) && (files) && (ecore_list_current(files)));
+ while((is_single) && (fill) && (files) && (ecore_list_current(files)));
error:
if (params) free(params);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_icon.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- ecore_desktop_icon.c 10 Nov 2006 19:58:18 -0000 1.44
+++ ecore_desktop_icon.c 12 Nov 2006 02:48:34 -0000 1.45
@@ -27,7 +27,7 @@
/* FIXME: We need a way for the client to disable searching for any of these
that they don't support. */
static const char *ext[] =
- { "", ".edj", ".png", ".svgz", ".svg", ".xpm", NULL }; /* "" is in case
the icon already has an extension, search for that first. */
+ { "", ".edj", ".png", /* ".svgz", ".svg", */ ".xpm", NULL }; /* "" is in
case the icon already has an extension, search for that first. */
static int init_count = 0;
static Ecore_Hash *icon_theme_cache = NULL;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ecore_desktop_menu.c 10 Nov 2006 19:58:18 -0000 1.31
+++ ecore_desktop_menu.c 12 Nov 2006 02:48:34 -0000 1.32
@@ -587,21 +587,15 @@
else
{
if ((sub->size == 3)
- && (sub->elements[1].type ==
-
ECORE_DESKTOP_TREE_ELEMENT_TYPE_STRING)
- &&
- (((char *)sub->elements[1].
- element)[0] != '<'))
+ && (sub->elements[1].type ==
ECORE_DESKTOP_TREE_ELEMENT_TYPE_STRING)
+ && (((char
*)sub->elements[1].element)[0] != '<'))
{
char temp[PATH_MAX];
- sprintf(temp, "%s %s",
- (char *)sub->
- elements[0].element,
- (char *)sub->
- elements[1].element);
- ecore_desktop_tree_extend(menu,
- temp);
+ snprintf(temp, PATH_MAX, "%s
%s",
+ (char
*)sub->elements[0].element,
+ (char
*)sub->elements[1].element);
+ ecore_desktop_tree_extend(menu,
temp);
result = 1;
}
else
@@ -1565,9 +1559,9 @@
elements[i].element;
if (generate_data.rule->size > 0)
{
- /* FIXME: This might not be correct, but it
fixes ubuntu. */
- while (generate_data.rule->elements[0].type ==
ECORE_DESKTOP_TREE_ELEMENT_TYPE_TREE)
- generate_data.rule = (Ecore_Desktop_Tree *)
generate_data.rule->elements[0].element;
+ /* FIXME: This is not correct, it fixes ubuntu,
but breaks FC5. */
+// while (generate_data.rule->elements[0].type ==
ECORE_DESKTOP_TREE_ELEMENT_TYPE_TREE)
+// generate_data.rule = (Ecore_Desktop_Tree *)
generate_data.rule->elements[0].element;
if (((char *)generate_data.rule->elements[0].
element)[0] == 'I')
{
-------------------------------------------------------------------------
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
