Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_border.c e_error.c e_gadman.c e_hints.c e_init.c
e_int_menus.c e_module.c e_path.c e_pointer.c e_theme.c
Log Message:
fix memory leaks! no more leaks!
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_actions.c 10 May 2005 10:34:19 -0000 1.8
+++ e_actions.c 25 May 2005 08:08:43 -0000 1.9
@@ -608,5 +608,5 @@
act = data;
IF_FREE(act->name);
free(act);
- return 0;
+ return 1;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -3 -r1.222 -r1.223
--- e_border.c 21 May 2005 17:56:20 -0000 1.222
+++ e_border.c 25 May 2005 08:08:43 -0000 1.223
@@ -295,6 +295,20 @@
bd->client.icccm.fetch.protocol = 1;
bd->client.mwm.fetch.hints = 1;
bd->client.border.changed = 1;
+
+ bd->client.netwm.pid = 0;
+ bd->client.netwm.desktop = 0;
+ bd->client.netwm.state.modal = 0;
+ bd->client.netwm.state.sticky = 0;
+ bd->client.netwm.state.shaded = 0;
+ bd->client.netwm.state.hidden = 0;
+ bd->client.netwm.state.maximized_v = 0;
+ bd->client.netwm.state.maximized_h = 0;
+ bd->client.netwm.state.skip_taskbar = 0;
+ bd->client.netwm.state.skip_pager = 0;
+ bd->client.netwm.state.fullscreen = 0;
+ bd->client.netwm.state.stacking = E_STACKING_NONE;
+ bd->client.netwm.type = ECORE_X_WINDOW_TYPE_NORMAL;
bd->client.w = att->w;
bd->client.h = att->h;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_error.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_error.c 13 May 2005 18:59:51 -0000 1.21
+++ e_error.c 25 May 2005 08:08:44 -0000 1.22
@@ -62,6 +62,7 @@
E_Container *con;
Ecore_X_Window win;
int x, y;
+ char *s;
con = e_container_current_get(man);
@@ -106,7 +107,9 @@
maxh = 0;
o = evas_object_image_add(e);
- evas_object_image_file_set(o, e_path_find(path_images, "e.png"), NULL);
+ s = e_path_find(path_images, "e.png");
+ evas_object_image_file_set(o, s, NULL);
+ IF_FREE(s);
evas_object_move(o, 16, 16);
evas_object_resize(o, 64, 64);
evas_object_image_fill_set(o, 0, 0, 64, 64);
@@ -189,7 +192,9 @@
if (error_h > man->h) error_h = man->h;
o = evas_object_image_add(e);
- evas_object_image_file_set(o, e_path_find(path_images,
"button_out.png"), NULL);
+ s = e_path_find(path_images, "button_out.png");
+ evas_object_image_file_set(o, s, NULL);
+ IF_FREE(s);
evas_object_move(o, (error_w - 64) / 2, error_h - 16 - 32);
evas_object_resize(o, 64, 32);
evas_object_image_fill_set(o, 0, 0, 64, 32);
@@ -217,7 +222,9 @@
evas_object_show(o);
o = evas_object_image_add(e);
- evas_object_image_file_set(o, e_path_find(path_images, "error_bg.png"),
NULL);
+ s = e_path_find(path_images, "error_bg.png");
+ evas_object_image_file_set(o, s, NULL);
+ IF_FREE(s);
evas_object_move(o, 0, 0);
evas_object_image_fill_set(o, 0, 0, error_w, error_h);
evas_object_resize(o, error_w, error_h);
@@ -362,11 +369,14 @@
{
Evas_Event_Mouse_Down *ev;
Ecore_Evas *ee;
-
+ char *s;
+
ev = event_info;
if (ev->button != 1) return;
ee = data;
- evas_object_image_file_set(obj, e_path_find(path_images, "button_in.png"),
NULL);
+ s = e_path_find(path_images, "button_in.png");
+ evas_object_image_file_set(obj, s, NULL);
+ IF_FREE(s);
}
static void
@@ -375,11 +385,14 @@
Evas_Event_Mouse_Up *ev;
Ecore_Evas *ee;
Evas_Object *o;
+ char *s;
ev = event_info;
if (ev->button != 1) return;
ee = data;
- evas_object_image_file_set(obj, e_path_find(path_images, "button_out.png"),
NULL);
+ s = e_path_find(path_images, "button_out.png");
+ evas_object_image_file_set(obj, s, NULL);
+ IF_FREE(s);
o = evas_object_name_find(ecore_evas_get(ee), "allocated");
if (o)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_gadman.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- e_gadman.c 19 May 2005 02:46:50 -0000 1.36
+++ e_gadman.c 25 May 2005 08:08:44 -0000 1.37
@@ -491,6 +491,7 @@
E_Menu *m;
E_Menu_Item *mi;
int disallow, seperator;
+ char *s;
E_OBJECT_CHECK_RETURN(gmc, NULL);
E_OBJECT_TYPE_CHECK_RETURN(gmc, E_GADMAN_CLIENT_TYPE, NULL);
@@ -508,24 +509,24 @@
e_menu_item_label_set(mi, _("Automatic Width"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, gmc->use_autow);
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "auto_width");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "auto_width");
+ IF_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_auto_width, gmc);
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
}
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Half Screen Width"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "half_width");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "half_width");
+ IF_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_half_width, gmc);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Full Screen Width"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "full_width");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "full_width");
+ IF_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_full_width, gmc);
}
disallow = (gmc->policy & E_GADMAN_POLICY_EDGES)
@@ -535,9 +536,9 @@
seperator = 1;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Center Horizontally"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "center_horiz");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "center_horiz");
+ IF_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_center_horiz, gmc);
}
if (seperator)
@@ -555,24 +556,23 @@
e_menu_item_label_set(mi, _("Automatic Height"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, gmc->use_autoh);
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "auto_height");
+ s = e_path_find(path_icons, "default.edj"),
+ e_menu_item_icon_edje_set(mi, s, "auto_height");
+ IF_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_auto_height, gmc);
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
}
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Half Screen Height"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "half_height");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "half_height");
+ IF_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_half_height, gmc);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Full Screen Height"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "full_height");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "full_height");
e_menu_item_callback_set(mi, _e_gadman_cb_full_height, gmc);
}
disallow = (gmc->policy & E_GADMAN_POLICY_EDGES)
@@ -582,9 +582,9 @@
seperator = 1;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Center Vertically"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "center_vert");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "center_vert");
+ IF_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_center_vert, gmc);
}
if (seperator)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- e_hints.c 23 May 2005 19:12:22 -0000 1.31
+++ e_hints.c 25 May 2005 08:08:44 -0000 1.32
@@ -162,7 +162,7 @@
ecore_x_netwm_client_list_stacking_set(m->root, 0, NULL);
}
}
-
+ IF_FREE(clients);
}
/* Client list is already in stacking order, so this function is nearly
@@ -221,7 +221,7 @@
ecore_x_netwm_client_list_stacking_set(m->root, 0, NULL);
}
}
-
+ IF_FREE(clients);
}
void
@@ -1033,6 +1033,11 @@
unsigned int current;
current = (bd->desk->y * bd->zone->desk_x_count) + bd->desk->x;
+ /* if valgrind complains here it is complaining bd->client.netwm.desktop
+ * is an uninitialised variable - but it isn't. it can't be. its part of
+ * a calloc()'d struct and thus has to have been set to 0. hell even
+ * e_border.c explicitly sets it to 0 on creation of the border object.
+ */
if (bd->client.netwm.desktop != current)
{
deskpos[0] = bd->desk->x;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_init.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_init.c 7 May 2005 13:50:38 -0000 1.20
+++ e_init.c 25 May 2005 08:08:44 -0000 1.21
@@ -26,6 +26,7 @@
int num;
Evas_Object *o;
Evas_List *l, *screens;
+ char *s;
num = 0;
roots = ecore_x_window_root_list(&num);
@@ -73,18 +74,20 @@
/* first screen */
if (l == screens)
{
- edje_object_file_set(o,
- /* FIXME: "init.edj" needs to come from
config */
- e_path_find(path_init, "init.edj"),
- "init/splash");
+ /* FIXME: "init.edj" needs to come from config */
+ s = e_path_find(path_init, "init.edj"),
+ edje_object_file_set(o, s, "init/splash");
+ IF_FREE(s);
_e_init_object = o;
}
/* other screens */
else
- edje_object_file_set(o,
- /* FIXME: "init.edj" needs to come from
config */
- e_path_find(path_init, "init.edj"),
- "init/extra_screen");
+ {
+ /* FIXME: "init.edj" needs to come from config */
+ s = e_path_find(path_init, "init.edj"),
+ edje_object_file_set(o, s, "init/extra_screen");
+ IF_FREE(s);
+ }
evas_object_move(o, scr->x, scr->y);
evas_object_resize(o, scr->w, scr->h);
evas_object_show(o);
@@ -93,10 +96,10 @@
else
{
o = edje_object_add(_e_init_evas);
- edje_object_file_set(o,
- /* FIXME: "init.edj" needs to come from config */
- e_path_find(path_init, "init.edj"),
- "init/splash");
+ /* FIXME: "init.edj" needs to come from config */
+ s = e_path_find(path_init, "init.edj"),
+ edje_object_file_set(o, s, "init/splash");
+ IF_FREE(s);
_e_init_object = o;
evas_object_move(o, 0, 0);
evas_object_resize(o, w, h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- e_int_menus.c 18 May 2005 10:18:02 -0000 1.60
+++ e_int_menus.c 25 May 2005 08:08:44 -0000 1.61
@@ -48,6 +48,7 @@
E_Menu *m, *subm;
E_Menu_Item *mi;
Main_Data *dat;
+ char *s;
dat = calloc(1, sizeof(Main_Data));
m = e_menu_new();
@@ -59,9 +60,9 @@
dat->apps = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Favorite Applications"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "favorites");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "favorites");
+ IF_FREE(s);
e_menu_item_submenu_set(mi, subm);
mi = e_menu_item_new(m);
@@ -71,45 +72,45 @@
dat->modules = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Modules"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "module");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "module");
+ IF_FREE(s);
e_menu_item_submenu_set(mi, subm);
subm = e_int_menus_desktops_new();
dat->desktops = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Desktops"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "desktops");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "desktops");
+ IF_FREE(s);
e_menu_item_submenu_set(mi, subm);
subm = e_int_menus_clients_new();
dat->clients = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Windows"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "windows");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "windows");
+ IF_FREE(s);
e_menu_item_submenu_set(mi, subm);
subm = e_int_menus_gadgets_new();
dat->gadgets = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Gadgets"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "gadgets");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "gadgets");
+ IF_FREE(s);
e_menu_item_submenu_set(mi, subm);
subm = e_int_menus_themes_new();
dat->themes = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Themes"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "theme");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "theme");
+ IF_FREE(s);
e_menu_item_submenu_set(mi, subm);
mi = e_menu_item_new(m);
@@ -117,9 +118,9 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("About Enlightenment"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "e");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "e");
+ IF_FREE(s);
e_menu_item_callback_set(mi, _e_int_menus_main_about, NULL);
mi = e_menu_item_new(m);
@@ -127,16 +128,16 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Restart Enlightenment"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "reset");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "reset");
+ IF_FREE(s);
e_menu_item_callback_set(mi, _e_int_menus_main_restart, NULL);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Exit Enlightenment"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "power");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "power");
+ IF_FREE(s);
e_menu_item_callback_set(mi, _e_int_menus_main_exit, NULL);
return m;
}
@@ -454,6 +455,7 @@
Evas_List *l, *borders = NULL;
E_Menu *root;
E_Zone *zone = NULL;
+ char *s;
e_menu_pre_activate_callback_set(m, NULL, NULL);
root = e_menu_root_get(m);
@@ -497,9 +499,9 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Cleanup Windows"));
- e_menu_item_icon_edje_set(mi,
- e_path_find(path_icons, "default.edj"),
- "windows");
+ s = e_path_find(path_icons, "default.edj");
+ e_menu_item_icon_edje_set(mi, s, "windows");
+ IF_FREE(s);
e_menu_item_callback_set(mi, _e_int_menus_clients_cleanup_cb, zone);
e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_clients_free_hook);
e_object_data_set(E_OBJECT(m), borders);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_module.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_module.c 20 May 2005 03:09:44 -0000 1.27
+++ e_module.c 25 May 2005 08:08:44 -0000 1.28
@@ -171,6 +171,7 @@
e_config->modules = evas_list_append(e_config->modules, em);
e_config_save_queue();
}
+ free(modpath);
return m;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_path.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_path.c 20 May 2005 03:09:44 -0000 1.10
+++ e_path.c 25 May 2005 08:08:44 -0000 1.11
@@ -8,9 +8,6 @@
static void _e_path_cache_free(E_Path *ep);
static Evas_Bool _e_path_cache_free_cb(Evas_Hash *hash, const char *key, void
*data, void *fdata);
-/* local subsystem globals */
-static char _e_path_buf[PATH_MAX] = "";
-
/* externally accessible functions */
E_Path *
e_path_new(void)
@@ -254,18 +251,14 @@
{
Evas_List *l;
char *str;
+ char buf[PATH_MAX] = "";
E_OBJECT_CHECK_RETURN(ep, NULL);
E_OBJECT_TYPE_CHECK_RETURN(ep, E_PATH_TYPE, NULL);
if (!file) return NULL;
- _e_path_buf[0] = 0;
str = evas_hash_find(ep->hash, file);
- if (str)
- {
- strcpy(_e_path_buf, str);
- return _e_path_buf;
- }
+ if (str) return strdup(str);
/* Look in the default dir list */
for (l = ep->default_dir_list; l; l = l->next)
{
@@ -275,17 +268,17 @@
epd = l->data;
if (epd->dir)
{
- snprintf(_e_path_buf, sizeof(_e_path_buf), "%s/%s", epd->dir,
file);
- rp = ecore_file_realpath(_e_path_buf);
+ snprintf(buf, sizeof(buf), "%s/%s", epd->dir, file);
+ rp = ecore_file_realpath(buf);
if ((rp) && (rp[0] != 0))
{
- strncpy(_e_path_buf, rp, sizeof(_e_path_buf) - 1);
- _e_path_buf[sizeof(_e_path_buf) - 1] = 0;
+ strncpy(buf, rp, sizeof(buf) - 1);
+ buf[sizeof(buf) - 1] = 0;
free(rp);
if (evas_hash_size(ep->hash) >= 512)
_e_path_cache_free(ep);
- ep->hash = evas_hash_add(ep->hash, file, strdup(_e_path_buf));
- return _e_path_buf;
+ ep->hash = evas_hash_add(ep->hash, file, strdup(buf));
+ return strdup(buf);
}
if (rp) free(rp);
}
@@ -299,22 +292,22 @@
epd = l->data;
if (epd->dir)
{
- snprintf(_e_path_buf, sizeof(_e_path_buf), "%s/%s", epd->dir,
file);
- rp = ecore_file_realpath(_e_path_buf);
+ snprintf(buf, sizeof(buf), "%s/%s", epd->dir, file);
+ rp = ecore_file_realpath(buf);
if ((rp) && (rp[0] != 0))
{
- strncpy(_e_path_buf, rp, sizeof(_e_path_buf) - 1);
- _e_path_buf[sizeof(_e_path_buf) - 1] = 0;
+ strncpy(buf, rp, sizeof(buf) - 1);
+ buf[sizeof(buf) - 1] = 0;
free(rp);
if (evas_hash_size(ep->hash) >= 512)
_e_path_cache_free(ep);
- ep->hash = evas_hash_add(ep->hash, file, strdup(_e_path_buf));
- return _e_path_buf;
+ ep->hash = evas_hash_add(ep->hash, file, strdup(buf));
+ return strdup(buf);
}
if (rp) free(rp);
}
}
- return _e_path_buf;
+ return NULL;
}
void
@@ -335,7 +328,10 @@
epd = l->data;
if (epd->dir) evas_font_path_append(evas, epd->dir);
+ free(epd->dir);
+ free(epd);
}
+ if (dir_list) evas_list_free(dir_list);
}
/* compine default_list and and user_list int and easy to use list */
@@ -411,5 +407,5 @@
_e_path_cache_free_cb(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
void *data, void *fdata __UNUSED__)
{
free(data);
- return 0;
+ return 1;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_pointer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_pointer.c 7 Feb 2005 13:51:09 -0000 1.4
+++ e_pointer.c 25 May 2005 08:08:44 -0000 1.5
@@ -11,14 +11,23 @@
int w, h;
Evas_Object *o;
int *pix;
+ char *s;
E_OBJECT_CHECK(E_OBJECT(con));
o = evas_object_image_add(con->bg_evas);
if (ecore_x_cursor_color_supported_get())
- evas_object_image_file_set(o, e_path_find(path_images, "pointer.png"),
NULL);
+ {
+ s = e_path_find(path_images, "pointer.png");
+ evas_object_image_file_set(o, s, NULL);
+ IF_FREE(s);
+ }
else
- evas_object_image_file_set(o, e_path_find(path_images,
"pointer_mono.png"), NULL);
+ {
+ s = e_path_find(path_images, "pointer_mono.png");
+ evas_object_image_file_set(o, s, NULL);
+ IF_FREE(s);
+ }
evas_object_image_size_get(o, &w, &h);
pix = evas_object_image_data_get(o, 0);
cur = ecore_x_cursor_new(con->win, pix, w, h, 0, 0);
@@ -38,14 +47,23 @@
Evas_Object *o;
int *pix;
Evas *e;
+ char *s;
e = ecore_evas_get(ee);
win = ecore_evas_software_x11_window_get(ee);
o = evas_object_image_add(e);
if (ecore_x_cursor_color_supported_get())
- evas_object_image_file_set(o, e_path_find(path_images, "pointer.png"),
NULL);
+ {
+ s = e_path_find(path_images, "pointer.png");
+ evas_object_image_file_set(o, s, NULL);
+ IF_FREE(s);
+ }
else
- evas_object_image_file_set(o, e_path_find(path_images,
"pointer_mono.png"), NULL);
+ {
+ s = e_path_find(path_images, "pointer_mono.png");
+ evas_object_image_file_set(o, s, NULL);
+ IF_FREE(s);
+ }
evas_object_image_size_get(o, &w, &h);
pix = evas_object_image_data_get(o, 0);
cur = ecore_x_cursor_new(win, pix, w, h, 0, 0);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_theme.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_theme.c 7 May 2005 13:50:38 -0000 1.8
+++ e_theme.c 25 May 2005 08:08:44 -0000 1.9
@@ -104,8 +104,7 @@
if (str[0] != '/')
str = e_path_find(path_themes, str);
/* save cached value */
- if (str)
- res->cache = strdup(str);
+ if (str) res->cache = str;
}
if (str)
{
@@ -170,8 +169,7 @@
if (str[0] != '/')
str = e_path_find(path_themes, str);
/* save cached value */
- if (str)
- res->cache = strdup(str);
+ if (str) res->cache = str;
}
if (str)
{
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs