Menu
▾
▴
enlightenment-cvs — CVS Commits Mailing List
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(182) |
Nov
(302) |
Dec
(141) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(142) |
Feb
(214) |
Mar
(291) |
Apr
(355) |
May
(185) |
Jun
(167) |
Jul
(281) |
Aug
(462) |
Sep
(227) |
Oct
(371) |
Nov
(303) |
Dec
(103) |
| 2002 |
Jan
(173) |
Feb
(204) |
Mar
(345) |
Apr
(427) |
May
(330) |
Jun
(296) |
Jul
(233) |
Aug
(163) |
Sep
(104) |
Oct
(162) |
Nov
(188) |
Dec
(197) |
| 2003 |
Jan
(328) |
Feb
(333) |
Mar
(169) |
Apr
(177) |
May
(150) |
Jun
(262) |
Jul
(316) |
Aug
(249) |
Sep
(218) |
Oct
(492) |
Nov
(399) |
Dec
(404) |
| 2004 |
Jan
(766) |
Feb
(779) |
Mar
(632) |
Apr
(690) |
May
(690) |
Jun
(418) |
Jul
(867) |
Aug
(653) |
Sep
(414) |
Oct
(661) |
Nov
(521) |
Dec
(633) |
| 2005 |
Jan
(818) |
Feb
(576) |
Mar
(932) |
Apr
(792) |
May
(790) |
Jun
(727) |
Jul
(648) |
Aug
(794) |
Sep
(1165) |
Oct
(1618) |
Nov
(777) |
Dec
(1140) |
| 2006 |
Jan
(1370) |
Feb
(1036) |
Mar
(1357) |
Apr
(1342) |
May
(968) |
Jun
(1010) |
Jul
(1320) |
Aug
(1506) |
Sep
(1396) |
Oct
(1108) |
Nov
(605) |
Dec
(650) |
| 2007 |
Jan
(727) |
Feb
(532) |
Mar
(1309) |
Apr
(719) |
May
(546) |
Jun
(651) |
Jul
(1299) |
Aug
(1042) |
Sep
(525) |
Oct
(701) |
Nov
(1750) |
Dec
(751) |
| 2008 |
Jan
(547) |
Feb
(529) |
Mar
(586) |
Apr
(571) |
May
(633) |
Jun
(453) |
Jul
(519) |
Aug
(365) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(112) |
Nov
|
Dec
|
|
From: Carsten H. (T. R. <ra...@ra...> - 2008-08-18 01:05:48
|
We have moved! CVS is now deprecated and "dead". We are using SVN. it may disappear at any time. This list will exist for archival purposes only. please re-susbscribe (if you want to keep getting mails): https://lists.sourceforge.net/lists/listinfo/enlightenment-svn -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) ra...@ra... |
|
From: Enlightenment C. <no...@cv...> - 2008-08-16 12:53:35
|
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_x Modified Files: Ecore_X.h Log Message: Set source action (patch from Fedor Gusev). =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v retrieving revision 1.204 retrieving revision 1.205 diff -u -3 -r1.204 -r1.205 --- Ecore_X.h 25 Jul 2008 02:21:03 -0000 1.204 +++ Ecore_X.h 16 Aug 2008 12:53:31 -0000 1.205 @@ -1078,6 +1078,8 @@ EAPI int ecore_x_dnd_drop(void); EAPI void ecore_x_dnd_send_status(int will_accept, int suppress, Ecore_X_Rectangle rectangle, Ecore_X_Atom action); EAPI void ecore_x_dnd_send_finished(void); +EAPI void ecore_x_dnd_source_action_set(Ecore_X_Atom action); +EAPI Ecore_X_Atom ecore_x_dnd_source_action_get(void); EAPI Ecore_X_Window ecore_x_window_new(Ecore_X_Window parent, int x, int y, int w, int h); EAPI Ecore_X_Window ecore_x_window_override_new(Ecore_X_Window parent, int x, int y, int w, int h); |
|
From: Enlightenment C. <no...@cv...> - 2008-08-16 12:53:35
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x/xlib
Modified Files:
ecore_x_dnd.c ecore_x_private.h
Log Message:
Set source action (patch from Fedor Gusev).
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_x_dnd.c 23 Jul 2008 10:00:01 -0000 1.1
+++ ecore_x_dnd.c 16 Aug 2008 12:53:31 -0000 1.2
@@ -35,6 +35,7 @@
_source->win = None;
_source->dest = None;
_source->state = ECORE_X_DND_SOURCE_IDLE;
+ _source->prev.window = 0;
_target = calloc(1, sizeof(Ecore_X_DND_Target));
_target->win = None;
@@ -335,6 +336,7 @@
ecore_x_window_ignore_set(_source->win, 1);
_source->state = ECORE_X_DND_SOURCE_DRAGGING;
_source->time = _ecore_x_event_last_time;
+ _source->prev.window = 0;
/* Default Accepted Action: move */
_source->action = ECORE_X_ATOM_XDND_ACTION_MOVE;
@@ -384,6 +386,8 @@
}
ecore_x_window_ignore_set(_source->win, 0);
+ _source->prev.window = 0;
+
return status;
}
@@ -462,6 +466,20 @@
}
void
+ecore_x_dnd_source_action_set(Ecore_X_Atom action)
+{
+ _source->action = action;
+ if (_source->prev.window)
+ _ecore_x_dnd_drag(_source->prev.window, _source->prev.x, _source->prev.y);
+}
+
+Ecore_X_Atom
+ecore_x_dnd_source_action_get(void)
+{
+ return _source->action;
+}
+
+void
_ecore_x_dnd_drag(Ecore_X_Window root, int x, int y)
{
XEvent xev;
@@ -561,6 +579,10 @@
XSendEvent(_ecore_x_disp, win, False, 0, &xev);
_source->await_status = 1;
+
+ _source->prev.x = x;
+ _source->prev.y = y;
+ _source->prev.window = root;
}
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/xlib/ecore_x_private.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_x_private.h 23 Jul 2008 10:00:01 -0000 1.1
+++ ecore_x_private.h 16 Aug 2008 12:53:31 -0000 1.2
@@ -103,6 +103,11 @@
unsigned short width, height;
} rectangle;
+ struct {
+ Ecore_X_Window window;
+ int x, y;
+ } prev;
+
Time time;
Ecore_X_Atom action, accepted_action;
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-16 12:53:35
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x/xcb
Modified Files:
ecore_xcb_dnd.c ecore_xcb_private.h
Log Message:
Set source action (patch from Fedor Gusev).
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/xcb/ecore_xcb_dnd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_xcb_dnd.c 23 Jul 2008 10:00:01 -0000 1.1
+++ ecore_xcb_dnd.c 16 Aug 2008 12:53:31 -0000 1.2
@@ -30,6 +30,7 @@
_source->win = XCB_NONE;
_source->dest = XCB_NONE;
_source->state = ECORE_X_DND_SOURCE_IDLE;
+ _source->prev.window = 0;
_target = calloc(1, sizeof(Ecore_X_DND_Target));
_target->win = XCB_NONE;
@@ -485,6 +486,7 @@
ecore_x_window_ignore_set(_source->win, 1);
_source->state = ECORE_X_DND_SOURCE_DRAGGING;
_source->time = _ecore_xcb_event_last_time;
+ _source->prev.window = 0;
/* Default Accepted Action: ask */
_source->action = ECORE_X_ATOM_XDND_ACTION_COPY;
@@ -532,6 +534,7 @@
}
ecore_x_window_ignore_set(_source->win, 0);
+ _source->prev.window = 0;
_source->dest = XCB_NONE;
return status;
@@ -611,6 +614,20 @@
}
void
+ecore_x_dnd_source_action_set(Ecore_X_Atom action)
+{
+ _source->action = action;
+ if (_source->prev.window)
+ _ecore_x_dnd_drag(_source->prev.window, _source->prev.x, _source->prev.y);
+}
+
+Ecore_X_Atom
+ecore_x_dnd_source_action_get(void)
+{
+ return _source->action;
+}
+
+void
_ecore_x_dnd_drag(Ecore_X_Window root,
int x,
int y)
@@ -744,6 +761,10 @@
xcb_send_event(_ecore_xcb_conn, 0, win, 0, (const char *)&ev);
_source->await_status = 1;
+
+ _source->prev.x = x;
+ _source->prev.y = y;
+ _source->prev.window = root;
}
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_xcb_private.h 23 Jul 2008 10:00:01 -0000 1.1
+++ ecore_xcb_private.h 16 Aug 2008 12:53:31 -0000 1.2
@@ -107,6 +107,11 @@
unsigned short width, height;
} rectangle;
+ struct {
+ Ecore_X_Window window;
+ int x, y;
+ } prev;
+
Ecore_X_Time time;
Ecore_X_Atom action, accepted_action;
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 21:05:09
|
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore Modified Files: ecore_plugin.c Log Message: Add missing header =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_plugin.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- ecore_plugin.c 11 Jun 2008 20:36:35 -0000 1.20 +++ ecore_plugin.c 14 Aug 2008 21:05:07 -0000 1.21 @@ -18,6 +18,7 @@ #endif #include "Ecore_Data.h" +#include "Ecore_Str.h" #include "ecore_private.h" |
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:51:33
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_icon_theme.c
Log Message:
fix against efreet API breakage.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon_theme.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_icon_theme.c 7 May 2008 13:38:23 -0000 1.28
+++ ewl_icon_theme.c 14 Aug 2008 20:51:26 -0000 1.29
@@ -12,7 +12,7 @@
static Ecore_Hash *ewl_icon_fallback_theme_cache = NULL;
static void ewl_icon_theme_cb_free(void *data);
static const char *ewl_icon_theme_icon_path_get_helper(const char *icon,
- const char *size, const char *theme,
+ unsigned int size, const char *theme,
const char *key, Ecore_Hash *cache);
/**
@@ -99,7 +99,6 @@
{
const char *ret;
const char *icon_theme;
- char icon_size[16];
char key[256];
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -120,13 +119,12 @@
size = ewl_config_int_get(ewl_config,
EWL_CONFIG_THEME_ICON_SIZE);
- snprintf(icon_size, sizeof(icon_size), "%dx%d", size, size);
- snprintf(key, sizeof(key), "%s@%s", icon, icon_size);
- ret = ewl_icon_theme_icon_path_get_helper(icon, icon_size, icon_theme,
+ snprintf(key, sizeof(key), "%s@%d", icon, size);
+ ret = ewl_icon_theme_icon_path_get_helper(icon, size, icon_theme,
key, ewl_icon_theme_cache);
if (ret == EWL_THEME_KEY_NOMATCH)
- ret = ewl_icon_theme_icon_path_get_helper(icon, icon_size, "EWL",
+ ret = ewl_icon_theme_icon_path_get_helper(icon, size, "EWL",
key, ewl_icon_fallback_theme_cache);
if (ret == EWL_THEME_KEY_NOMATCH)
@@ -136,7 +134,7 @@
}
static const char *
-ewl_icon_theme_icon_path_get_helper(const char *icon, const char *size,
+ewl_icon_theme_icon_path_get_helper(const char *icon, unsigned int size,
const char *theme, const char *key,
Ecore_Hash *cache)
{
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:50:12
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_configure.c e_eap_editor.c e_fm.c
e_int_border_menu.c e_int_menus.c e_module.c e_slidecore.c
e_utils.c e_utils.h
Log Message:
fix against efreet API breakage
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -3 -r1.654 -r1.655
--- e_border.c 11 Aug 2008 01:22:33 -0000 1.654
+++ e_border.c 14 Aug 2008 20:49:36 -0000 1.655
@@ -2798,7 +2798,7 @@
{
if ((bd->desktop) && (bd->icon_preference != E_ICON_PREF_NETWM))
{
- o = e_util_desktop_icon_add(bd->desktop, "24x24", evas);
+ o = e_util_desktop_icon_add(bd->desktop, 24, evas);
if (o)
return o;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -3 -r1.120 -r1.121
--- e_configure.c 19 Jun 2008 11:56:54 -0000 1.120
+++ e_configure.c 14 Aug 2008 20:49:36 -0000 1.121
@@ -103,7 +103,7 @@
cfg_cat_icon = strdup(cfg_cat_icon);
else
cfg_cat_icon = efreet_icon_path_find(e_config->icon_theme,
- cfg_cat_icon, "64x64");
+ cfg_cat_icon, 64);
}
}
if (desktop->icon)
@@ -112,7 +112,7 @@
cfg_icon = strdup(desktop->icon);
else
cfg_icon = efreet_icon_path_find(e_config->icon_theme,
- desktop->icon, "64x64");
+ desktop->icon, 64);
}
if (desktop->name) label = desktop->name;
else if (desktop->generic_name) label = desktop->generic_name;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- e_eap_editor.c 18 Jul 2008 10:05:25 -0000 1.97
+++ e_eap_editor.c 14 Aug 2008 20:49:36 -0000 1.98
@@ -567,7 +567,7 @@
if (ecore_file_exists(cfdata->icon))
icon_path = strdup(cfdata->icon);
else
- icon_path = efreet_icon_path_find(e_config->icon_theme, cfdata->icon, "scalable");
+ icon_path = efreet_icon_path_find(e_config->icon_theme, cfdata->icon, 64);
if (icon_path)
{
@@ -721,7 +721,7 @@
Evas_Object *o;
if (!cfdata->editor->img_widget) return;
- o = e_util_icon_theme_icon_add(cfdata->icon, "32x32", cfdata->editor->evas);
+ o = e_util_icon_theme_icon_add(cfdata->icon, 32, cfdata->editor->evas);
/* NB this takes care of freeing any previous icon object */
e_widget_button_icon_set(cfdata->editor->img_widget, o);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -3 -r1.247 -r1.248
--- e_fm.c 11 Aug 2008 02:13:22 -0000 1.247
+++ e_fm.c 14 Aug 2008 20:49:36 -0000 1.248
@@ -1201,7 +1201,7 @@
snprintf(buf, sizeof(buf), "%s/%s",
e_fm2_real_path_get(ic->info.fm), ic->info.file);
ef = efreet_desktop_new(buf);
- if (ef) oic = e_util_desktop_icon_add(ef, "48x48", evas);
+ if (ef) oic = e_util_desktop_icon_add(ef, 48, evas);
if (type_ret) *type_ret = "DESKTOP";
if (ef) efreet_desktop_free(ef);
}
@@ -1278,7 +1278,7 @@
oic = NULL;
snprintf(buf, sizeof(buf), "%s/%s", ic->sd->realpath, ic->info.file);
ef = efreet_desktop_new(buf);
- if (ef) oic = e_util_desktop_icon_add(ef, "48x48", evas);
+ if (ef) oic = e_util_desktop_icon_add(ef, 48, evas);
if (type_ret) *type_ret = "DESKTOP";
if (ef) efreet_desktop_free(ef);
}
@@ -1350,7 +1350,7 @@
oic = NULL;
ef = efreet_desktop_new(buf);
- if (ef) oic = e_util_desktop_icon_add(ef, "48x48", evas);
+ if (ef) oic = e_util_desktop_icon_add(ef, 48, evas);
if (type_ret) *type_ret = "DESKTOP";
if (ef) efreet_desktop_free(ef);
}
@@ -1372,7 +1372,7 @@
Efreet_Desktop *desktop;
desktop = efreet_util_desktop_exec_find(imc->e_im_setup_exec);
if (desktop)
- oic = e_util_desktop_icon_add(desktop, "24x24", evas);
+ oic = e_util_desktop_icon_add(desktop, 24, evas);
}
e_intl_input_method_config_free(imc);
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- e_int_border_menu.c 25 Jul 2008 21:32:28 -0000 1.85
+++ e_int_border_menu.c 14 Aug 2008 20:49:36 -0000 1.86
@@ -70,7 +70,7 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Edit Icon"));
e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, bd);
- e_util_desktop_menu_item_icon_add(bd->desktop, "16x16", mi);
+ e_util_desktop_menu_item_icon_add(bd->desktop, 16, mi);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Add Application..."));
@@ -922,7 +922,7 @@
e_menu_item_radio_set(submi, 1);
e_menu_item_radio_group_set(submi, 2);
e_menu_item_toggle_set(submi, (bd->icon_preference == E_ICON_PREF_USER ? 1 : 0));
- e_util_desktop_menu_item_icon_add(bd->desktop, "16x16", submi);
+ e_util_desktop_menu_item_icon_add(bd->desktop, 16, submi);
e_menu_item_callback_set(submi, _e_border_menu_cb_iconpref_user, bd);
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -3 -r1.234 -r1.235
--- e_int_menus.c 11 Aug 2008 01:22:33 -0000 1.234
+++ e_int_menus.c 14 Aug 2008 20:49:36 -0000 1.235
@@ -584,7 +584,7 @@
char *file;
file = efreet_icon_path_find(e_config->icon_theme,
- entry->icon, "24x24");
+ entry->icon, 24);
e_menu_item_icon_file_set(mi, file);
E_FREE(file);
}
@@ -707,15 +707,15 @@
E_Drag *drag;
Evas_Object *o = NULL;
Evas_Coord x, y, w, h;
+ unsigned int size;
const char *drag_types[] = { "enlightenment/desktop" };
- char buf[128];
evas_object_geometry_get(mi->icon_object, &x, &y, &w, &h);
drag = e_drag_new(m->zone->container, x, y, drag_types, 1, desktop, -1,
NULL, NULL);
- snprintf(buf, sizeof(buf), "%dx%d", w, h);
- o = e_util_desktop_icon_add(desktop, buf, e_drag_evas_get(drag));
+ size = MAX(w, h);
+ o = e_util_desktop_icon_add(desktop, size, e_drag_evas_get(drag));
e_drag_object_set(drag, o);
e_drag_resize(drag, w, h);
e_drag_start(drag, mi->drag.x + w, mi->drag.y + h);
@@ -1425,7 +1425,7 @@
e_object_ref(E_OBJECT(bd));
e_menu_item_callback_set(mi, _e_int_menus_lost_clients_item_cb, bd);
if (bd->desktop)
- e_util_desktop_menu_item_icon_add(bd->desktop, "24x24", mi);
+ e_util_desktop_menu_item_icon_add(bd->desktop, 24, mi);
}
e_object_free_attach_func_set(E_OBJECT(m),
_e_int_menus_lost_clients_free_hook);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_module.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- e_module.c 19 May 2008 04:37:34 -0000 1.89
+++ e_module.c 14 Aug 2008 20:49:36 -0000 1.90
@@ -397,7 +397,7 @@
desktop = efreet_desktop_get(buf);
if ((desktop) && (desktop->icon))
{
- icon = efreet_icon_path_find(e_config->icon_theme, desktop->icon, "64x64");
+ icon = efreet_icon_path_find(e_config->icon_theme, desktop->icon, 64);
if (!icon)
{
snprintf(buf, sizeof(buf), "%s/%s.edj",
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_slidecore.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_slidecore.c 27 Apr 2008 07:52:09 -0000 1.5
+++ e_slidecore.c 14 Aug 2008 20:49:36 -0000 1.6
@@ -231,7 +231,7 @@
it2 = evas_list_nth(sd->items, pl2);
if (it1 && it2)
{
- sd->o1 = e_util_icon_theme_icon_add(it1->icon, "512x512",
+ sd->o1 = e_util_icon_theme_icon_add(it1->icon, 512,
evas_object_evas_get(sd->smart_obj));
if (sd->o1)
{
@@ -243,7 +243,7 @@
evas_object_clip_set(sd->o1, evas_object_clip_get(sd->smart_obj));
evas_object_show(sd->o1);
}
- sd->o2 = e_util_icon_theme_icon_add(it2->icon, "512x512",
+ sd->o2 = e_util_icon_theme_icon_add(it2->icon, 512,
evas_object_evas_get(sd->smart_obj));
if (sd->o2)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- e_utils.c 19 May 2008 04:15:47 -0000 1.82
+++ e_utils.c 14 Aug 2008 20:49:36 -0000 1.83
@@ -862,7 +862,7 @@
}
EAPI Evas_Object *
-e_util_desktop_icon_add(Efreet_Desktop *desktop, const char *size, Evas *evas)
+e_util_desktop_icon_add(Efreet_Desktop *desktop, unsigned int size, Evas *evas)
{
if ((!desktop) || (!desktop->icon)) return NULL;
@@ -870,7 +870,7 @@
}
EAPI Evas_Object *
-e_util_icon_theme_icon_add(const char *icon_name, const char *size, Evas *evas)
+e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas)
{
if (!icon_name) return NULL;
if (icon_name[0] == '/') return e_util_icon_add(icon_name, evas);
@@ -891,7 +891,7 @@
}
EAPI void
-e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, const char *size, E_Menu_Item *mi)
+e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, unsigned int size, E_Menu_Item *mi)
{
char *path = NULL;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- e_utils.h 30 Oct 2007 20:01:41 -0000 1.41
+++ e_utils.h 14 Aug 2008 20:49:36 -0000 1.42
@@ -49,9 +49,9 @@
EAPI void e_util_library_path_strip(void);
EAPI void e_util_library_path_restore(void);
EAPI Evas_Object *e_util_icon_add(const char *path, Evas *evas);
-EAPI Evas_Object *e_util_desktop_icon_add(Efreet_Desktop *desktop, const char *size, Evas *evas);
-EAPI Evas_Object *e_util_icon_theme_icon_add(const char *icon_name, const char *size, Evas *evas);
-EAPI void e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, const char *size, E_Menu_Item *mi);
+EAPI Evas_Object *e_util_desktop_icon_add(Efreet_Desktop *desktop, unsigned int size, Evas *evas);
+EAPI Evas_Object *e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas);
+EAPI void e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, unsigned int size, E_Menu_Item *mi);
EAPI int e_util_dir_check(const char *dir);
EAPI void e_util_defer_object_del(E_Object *obj);
EAPI const char *e_util_winid_str_get(Ecore_X_Window win);
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:50:12
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_icon_theme
Modified Files:
e_int_config_icon_themes.c
Log Message:
fix against efreet API breakage
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_config_icon_themes.c 23 Aug 2007 10:07:55 -0000 1.6
+++ e_int_config_icon_themes.c 14 Aug 2008 20:49:36 -0000 1.7
@@ -183,7 +183,7 @@
{
char *path;
- path = efreet_icon_path_find(theme->name.internal, theme->example_icon, "24x24");
+ path = efreet_icon_path_find(theme->name.internal, theme->example_icon, 24);
if (path)
{
oc = e_icon_add(evas);
@@ -297,7 +297,7 @@
{
char *path;
- path = efreet_icon_path_find(theme->name.internal, theme->example_icon, "24x24");
+ path = efreet_icon_path_find(theme->name.internal, theme->example_icon, 24);
if (path)
{
oc = e_icon_add(evas);
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:50:11
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/exebuf
Modified Files:
e_exebuf.c
Log Message:
fix against efreet API breakage
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/exebuf/e_exebuf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_exebuf.c 19 Jun 2008 15:56:18 -0000 1.4
+++ e_exebuf.c 14 Aug 2008 20:49:37 -0000 1.5
@@ -419,7 +419,7 @@
if (!desktop) desktop = efreet_util_desktop_generic_name_find(cmd_buf);
if (desktop)
{
- o = e_util_desktop_icon_add(desktop, "24x24", exebuf->evas);
+ o = e_util_desktop_icon_add(desktop, 24, exebuf->evas);
icon_object = o;
edje_object_part_swallow(bg_object, "e.swallow.icons", o);
evas_object_show(o);
@@ -1053,7 +1053,7 @@
evas_object_show(o);
if (edje_object_part_exists(exe->bg_object, "e.swallow.icons"))
{
- o = e_util_desktop_icon_add(exe->desktop, "24x24", exebuf->evas);
+ o = e_util_desktop_icon_add(exe->desktop, 24, exebuf->evas);
exe->icon_object = o;
edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o);
evas_object_show(o);
@@ -1103,7 +1103,7 @@
desktop = efreet_util_desktop_exec_find(exe->file);
if (desktop)
{
- o = e_util_desktop_icon_add(desktop, "24x24", exebuf->evas);
+ o = e_util_desktop_icon_add(desktop, 24, exebuf->evas);
exe->icon_object = o;
edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o);
evas_object_show(o);
@@ -1157,7 +1157,7 @@
desktop = efreet_util_desktop_exec_find(exe->file);
if (desktop)
{
- o = e_util_desktop_icon_add(desktop, "24x24", exebuf->evas);
+ o = e_util_desktop_icon_add(desktop, 24, exebuf->evas);
exe->icon_object = o;
edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o);
evas_object_show(o);
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:50:11
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/fileman
Modified Files:
e_fwin.c
Log Message:
fix against efreet API breakage
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/fileman/e_fwin.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_fwin.c 6 May 2008 05:05:13 -0000 1.27
+++ e_fwin.c 14 Aug 2008 20:49:37 -0000 1.28
@@ -1343,7 +1343,7 @@
for (l = apps; l; l = l->next)
{
desk = l->data;
- oi = e_util_desktop_icon_add(desk, "24x24", evas);
+ oi = e_util_desktop_icon_add(desk, 24, evas);
e_widget_ilist_append(o, oi, desk->name, NULL, NULL,
efreet_util_path_to_file_id(desk->orig_path));
}
@@ -1383,7 +1383,7 @@
desk = mlist->data;
if (!desk) continue;
- icon = e_util_desktop_icon_add(desk, "24x24", evas);
+ icon = e_util_desktop_icon_add(desk, 24, evas);
e_widget_ilist_append(o, icon, desk->name, NULL, NULL,
efreet_util_path_to_file_id(desk->orig_path));
}
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:50:11
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_imc Modified Files: e_int_config_imc.c Log Message: fix against efreet API breakage =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_imc/e_int_config_imc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_int_config_imc.c 12 Feb 2008 06:11:22 -0000 1.5 +++ e_int_config_imc.c 14 Aug 2008 20:49:36 -0000 1.6 @@ -353,7 +353,7 @@ Efreet_Desktop *desktop; desktop = efreet_util_desktop_exec_find(imc->e_im_setup_exec); if (desktop) - icon = e_util_desktop_icon_add(desktop, "48x48", evas); + icon = e_util_desktop_icon_add(desktop, 48, evas); } e_widget_ilist_append(cfdata->gui.imc_basic_list, icon, imc->e_im_name, NULL, NULL, imc_path); |
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:50:08
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_applications
Modified Files:
e_int_config_apps.c
Log Message:
fix against efreet API breakage
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/conf_applications/e_int_config_apps.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_int_config_apps.c 18 Dec 2007 01:27:44 -0000 1.10
+++ e_int_config_apps.c 14 Aug 2008 20:49:36 -0000 1.11
@@ -378,7 +378,7 @@
{
Evas_Object *icon = NULL;
- icon = e_util_desktop_icon_add(desk, "24x24", evas);
+ icon = e_util_desktop_icon_add(desk, 24, evas);
e_widget_ilist_append(cfdata->o_all, icon, desk->name,
_all_list_cb_selected, cfdata, desk->orig_path);
}
@@ -413,7 +413,7 @@
{
Evas_Object *icon = NULL;
- icon = e_util_desktop_icon_add(desk, "24x24", evas);
+ icon = e_util_desktop_icon_add(desk, 24, evas);
e_widget_ilist_append(cfdata->o_sel, icon, desk->name,
_sel_list_cb_selected, cfdata, desk->orig_path);
}
@@ -525,7 +525,7 @@
if (!lbl) continue;
desk = efreet_util_desktop_name_find(lbl);
if (!desk) continue;
- icon = e_util_desktop_icon_add(desk, "24x24", evas);
+ icon = e_util_desktop_icon_add(desk, 24, evas);
e_widget_ilist_append(cfdata->o_sel, icon, desk->name,
_sel_list_cb_selected, cfdata, desk->orig_path);
}
@@ -594,7 +594,7 @@
{
e_widget_ilist_remove_num(cfdata->o_sel, sel);
e_widget_ilist_go(cfdata->o_sel);
- icon = e_util_desktop_icon_add(desk, "24x24", evas);
+ icon = e_util_desktop_icon_add(desk, 24, evas);
e_widget_ilist_prepend_relative(cfdata->o_sel, icon, desk->name,
_sel_list_cb_selected, cfdata,
desk->orig_path, (sel - 1));
@@ -634,7 +634,7 @@
{
e_widget_ilist_remove_num(cfdata->o_sel, sel);
e_widget_ilist_go(cfdata->o_sel);
- icon = e_util_desktop_icon_add(desk, "24x24", evas);
+ icon = e_util_desktop_icon_add(desk, 24, evas);
e_widget_ilist_append_relative(cfdata->o_sel, icon, desk->name,
_sel_list_cb_selected, cfdata,
desk->orig_path, sel);
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:49:42
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
fix against efreet API breakage
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -3 -r1.191 -r1.192
--- e_mod_main.c 13 Dec 2007 13:25:10 -0000 1.191
+++ e_mod_main.c 14 Aug 2008 20:49:37 -0000 1.192
@@ -598,12 +598,12 @@
{
/* TODO: Correct icon size! */
if (ic->o_icon) evas_object_del(ic->o_icon);
- ic->o_icon = e_util_desktop_icon_add(ic->app, "48x48", evas_object_evas_get(ic->ibar->o_box));
+ ic->o_icon = e_util_desktop_icon_add(ic->app, 48, evas_object_evas_get(ic->ibar->o_box));
edje_object_part_swallow(ic->o_holder, "e.swallow.content", ic->o_icon);
evas_object_pass_events_set(ic->o_icon, 1);
evas_object_show(ic->o_icon);
if (ic->o_icon2) evas_object_del(ic->o_icon2);
- ic->o_icon2 = e_util_desktop_icon_add(ic->app, "48x48", evas_object_evas_get(ic->ibar->o_box));
+ ic->o_icon2 = e_util_desktop_icon_add(ic->app, 48, evas_object_evas_get(ic->ibar->o_box));
edje_object_part_swallow(ic->o_holder2, "e.swallow.content", ic->o_icon2);
evas_object_pass_events_set(ic->o_icon2, 1);
evas_object_show(ic->o_icon2);
@@ -905,8 +905,8 @@
E_Drag *d;
Evas_Object *o;
Evas_Coord x, y, w, h;
+ unsigned int size;
const char *drag_types[] = { "enlightenment/desktop" };
- char buf[128];
ic->drag.dnd = 1;
ic->drag.start = 0;
@@ -915,8 +915,8 @@
d = e_drag_new(ic->ibar->inst->gcc->gadcon->zone->container,
x, y, drag_types, 1,
ic->app, -1, NULL, NULL);
- snprintf(buf, sizeof(buf), "%dx%d", w, h);
- o = e_util_desktop_icon_add(ic->app, buf, e_drag_evas_get(d));
+ size = MAX(w, h);
+ o = e_util_desktop_icon_add(ic->app, size, e_drag_evas_get(d));
e_drag_object_set(d, o);
e_drag_resize(d, w, h);
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:49:15
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/bin
Modified Files:
ef_icon_theme.c
Log Message:
Pass icon size as unsigned int.
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_icon_theme.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ef_icon_theme.c 7 May 2008 02:48:06 -0000 1.9
+++ ef_icon_theme.c 14 Aug 2008 20:48:40 -0000 1.10
@@ -8,8 +8,8 @@
#define PATH_MAX 4096
#endif
-#define SIZE "128x128"
-#define THEME "Tango"
+#define SIZE 128
+#define THEME "Human"
#define FREE(x) do { free(x); x = NULL; } while (0);
static void ef_icon_theme_themes_find(const char *search_dir,
@@ -262,6 +262,7 @@
"accessories-text-editor",
"help-browser",
"multimedia-volume-control",
+#if 0
"preferences-desktop-accessibility",
"preferences-desktop-font",
"preferences-desktop-keyboard",
@@ -416,6 +417,7 @@
"weather-showers-scattered",
"weather-snow",
"weather-storm",
+#endif
NULL
};
@@ -449,6 +451,7 @@
ef_icons_find(theme, themes, icon_hash);
ecore_list_destroy(themes);
+ double start = ecore_time_get();
for (i = 0; icons[i] != NULL; i++)
{
char *path, *s;
@@ -457,11 +460,13 @@
if (!path)
{
+#if 0
if (ecore_hash_get(icon_hash, icons[i]))
{
printf("NOT FOUND %s\n", icons[i]);
ret = 0;
}
+#endif
continue;
}
@@ -477,7 +482,31 @@
}
free(path);
}
+ printf("Time: %f\n", (ecore_time_get() - start));
ecore_hash_destroy(icon_hash);
+
+ start = ecore_time_get();
+ for (i = 0; icons[i] != NULL; i++)
+ {
+ char *path, *s;
+
+ path = efreet_icon_path_find(THEME, icons[i], SIZE);
+
+ if (!path) continue;
+
+ s = strrchr(path, '.');
+ if (s) *s = '\0';
+ s = strrchr(path, '/');
+ if (s) s++;
+
+ if (s && strcmp(s, icons[i]))
+ {
+ printf("Name mismatch name (%s) vs ef (%s)\n", icons[i], s);
+ ret = 0;
+ }
+ free(path);
+ }
+ printf("Time: %f\n", (ecore_time_get() - start));
return ret;
}
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:49:15
|
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin/compare Modified Files: comp.h Log Message: Pass icon size as unsigned int. =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/compare/comp.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- comp.h 6 Sep 2007 16:15:09 -0000 1.4 +++ comp.h 14 Aug 2008 20:48:40 -0000 1.5 @@ -3,7 +3,7 @@ #define LOOPS 1000 #define THEME "Tango" -#define SIZE "16x16" +#define SIZE 16 #define ADDRESS_BOOK_NEW "address-book-new" #define APPLICATION_EXIT "application-exit" |
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:49:02
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/e_dbus
Dir : e17/libs/e_dbus/src/bin
Modified Files:
hal.c
Log Message:
fix against efreet API change.
===================================================================
RCS file: /cvs/e/e17/libs/e_dbus/src/bin/hal.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- hal.c 24 Nov 2007 13:22:03 -0000 1.2
+++ hal.c 14 Aug 2008 20:48:59 -0000 1.3
@@ -620,7 +620,7 @@
if (icon_name)
{
//printf("find icon path: %s\n", icon_name);
- path = efreet_icon_path_find("Tango", icon_name, "32x32");
+ path = efreet_icon_path_find("Tango", icon_name, 32);
//printf("found: %s\n", path);
if (path)
{
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:48:42
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/lib
Modified Files:
Efreet_Mime.h efreet_icon.c efreet_icon.h efreet_mime.c
Log Message:
Pass icon size as unsigned int.
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/Efreet_Mime.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Efreet_Mime.h 2 Aug 2008 21:48:44 -0000 1.10
+++ Efreet_Mime.h 14 Aug 2008 20:48:40 -0000 1.11
@@ -50,7 +50,7 @@
EAPI const char *efreet_mime_fallback_type_get(const char *file);
EAPI char *efreet_mime_type_icon_get(const char *mime, const char *theme,
- const char *size);
+ unsigned int size);
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- efreet_icon.c 14 Aug 2008 20:02:07 -0000 1.36
+++ efreet_icon.c 14 Aug 2008 20:48:41 -0000 1.37
@@ -331,25 +331,23 @@
* @brief Retrives the path to the given icon.
*/
EAPI char *
-efreet_icon_path_find(const char *theme_name, const char *icon, const char *size)
+efreet_icon_path_find(const char *theme_name, const char *icon, unsigned int size)
{
char *value = NULL;
Efreet_Icon_Theme *theme;
- unsigned int real_size;
theme = efreet_icon_find_theme_check(theme_name);
- real_size = atoi(size);
#ifdef SLOPPY_SPEC
{
char *tmp;
tmp = efreet_icon_remove_extension(icon);
- value = efreet_icon_find_helper(theme, tmp, real_size);
+ value = efreet_icon_find_helper(theme, tmp, size);
FREE(tmp);
}
#else
- value = efreet_icon_find_helper(theme, icon, real_size);
+ value = efreet_icon_find_helper(theme, icon, size);
#endif
/* we didn't find the icon in the theme or in the inherited directories
@@ -374,15 +372,13 @@
*/
EAPI char *
efreet_icon_list_find(const char *theme_name, Ecore_List *icons,
- const char *size)
+ unsigned int size)
{
const char *icon = NULL;
char *value = NULL;
Efreet_Icon_Theme *theme;
- unsigned int real_size;
theme = efreet_icon_find_theme_check(theme_name);
- real_size = atoi(size);
ecore_list_first_goto(icons);
#ifdef SLOPPY_SPEC
@@ -395,11 +391,11 @@
while ((icon = ecore_list_next(icons)))
ecore_list_append(tmps, efreet_icon_remove_extension(icon));
- value = efreet_icon_list_find_helper(theme, tmps, real_size);
+ value = efreet_icon_list_find_helper(theme, tmps, size);
ecore_list_destroy(tmps);
}
#else
- value = efreet_icon_list_find_helper(theme, icons, real_size);
+ value = efreet_icon_list_find_helper(theme, icons, size);
#endif
/* we didn't find the icons in the theme or in the inherited directories
@@ -429,7 +425,7 @@
* @brief Retrieves all of the information about the given icon.
*/
EAPI Efreet_Icon *
-efreet_icon_find(const char *theme_name, const char *icon, const char *size)
+efreet_icon_find(const char *theme_name, const char *icon, unsigned int size)
{
char *path;
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- efreet_icon.h 14 Aug 2008 16:59:41 -0000 1.8
+++ efreet_icon.h 14 Aug 2008 20:48:41 -0000 1.9
@@ -166,13 +166,13 @@
EAPI Efreet_Icon_Theme *efreet_icon_theme_find(const char *theme_name);
EAPI Efreet_Icon *efreet_icon_find(const char *theme_name,
const char *icon,
- const char *size);
+ unsigned int size);
EAPI char *efreet_icon_list_find(const char *theme_name,
Ecore_List *icons,
- const char *size);
+ unsigned int size);
EAPI char *efreet_icon_path_find(const char *theme_name,
const char *icon,
- const char *size);
+ unsigned int size);
EAPI void efreet_icon_free(Efreet_Icon *icon);
/**
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_mime.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- efreet_mime.c 2 Aug 2008 22:09:04 -0000 1.39
+++ efreet_mime.c 14 Aug 2008 20:48:41 -0000 1.40
@@ -175,7 +175,7 @@
* @brief Retreive the mime type icon for a file
*/
EAPI char *
-efreet_mime_type_icon_get(const char *mime, const char *theme, const char *size)
+efreet_mime_type_icon_get(const char *mime, const char *theme, unsigned int size)
{
char *icon = NULL;
Ecore_List *icons = NULL;
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:02:08
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/lib
Modified Files:
efreet_icon.c
Log Message:
Do atoi only once for each query.
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- efreet_icon.c 14 Aug 2008 19:47:48 -0000 1.35
+++ efreet_icon.c 14 Aug 2008 20:02:07 -0000 1.36
@@ -25,16 +25,16 @@
static char *efreet_icon_find_fallback(Efreet_Icon_Theme *theme,
const char *icon,
- const char *size);
+ unsigned int size);
static char *efreet_icon_list_find_fallback(Efreet_Icon_Theme *theme,
Ecore_List *icons,
- const char *size);
+ unsigned int size);
static char *efreet_icon_find_helper(Efreet_Icon_Theme *theme,
- const char *icon, const char *size);
+ const char *icon, unsigned int size);
static char *efreet_icon_list_find_helper(Efreet_Icon_Theme *theme,
- Ecore_List *icons, const char *size);
+ Ecore_List *icons, unsigned int size);
static char *efreet_icon_lookup_icon(Efreet_Icon_Theme *theme,
- const char *icon_name, const char *size);
+ const char *icon_name, unsigned int size);
static char *efreet_icon_fallback_icon(const char *icon_name);
static char *efreet_icon_fallback_dir_scan(const char *dir,
const char *icon_name);
@@ -76,8 +76,8 @@
static int efreet_icon_cache_find(Efreet_Icon_Cache *value, const char *key);
static void efreet_icon_cache_flush(Ecore_List *list);
static void efreet_icon_cache_free(Efreet_Icon_Cache *value);
-static char *efreet_icon_cache_check(Efreet_Icon_Theme *theme, const char *icon, const char *size);
-static void efreet_icon_cache_add(Efreet_Icon_Theme *theme, const char *icon, const char *size, const char *value);
+static char *efreet_icon_cache_check(Efreet_Icon_Theme *theme, const char *icon, unsigned int size);
+static void efreet_icon_cache_add(Efreet_Icon_Theme *theme, const char *icon, unsigned int size, const char *value);
/**
* @internal
@@ -335,19 +335,21 @@
{
char *value = NULL;
Efreet_Icon_Theme *theme;
+ unsigned int real_size;
theme = efreet_icon_find_theme_check(theme_name);
+ real_size = atoi(size);
#ifdef SLOPPY_SPEC
{
char *tmp;
tmp = efreet_icon_remove_extension(icon);
- value = efreet_icon_find_helper(theme, tmp, size);
+ value = efreet_icon_find_helper(theme, tmp, real_size);
FREE(tmp);
}
#else
- value = efreet_icon_find_helper(theme, icon, size);
+ value = efreet_icon_find_helper(theme, icon, real_size);
#endif
/* we didn't find the icon in the theme or in the inherited directories
@@ -377,8 +379,10 @@
const char *icon = NULL;
char *value = NULL;
Efreet_Icon_Theme *theme;
+ unsigned int real_size;
theme = efreet_icon_find_theme_check(theme_name);
+ real_size = atoi(size);
ecore_list_first_goto(icons);
#ifdef SLOPPY_SPEC
@@ -391,11 +395,11 @@
while ((icon = ecore_list_next(icons)))
ecore_list_append(tmps, efreet_icon_remove_extension(icon));
- value = efreet_icon_list_find_helper(theme, tmps, size);
+ value = efreet_icon_list_find_helper(theme, tmps, real_size);
ecore_list_destroy(tmps);
}
#else
- value = efreet_icon_list_find_helper(theme, icons, size);
+ value = efreet_icon_list_find_helper(theme, icons, real_size);
#endif
/* we didn't find the icons in the theme or in the inherited directories
@@ -453,7 +457,7 @@
*/
static char *
efreet_icon_find_fallback(Efreet_Icon_Theme *theme,
- const char *icon, const char *size)
+ const char *icon, unsigned int size)
{
char *parent = NULL;
char *value = NULL;
@@ -497,7 +501,7 @@
*/
static char *
efreet_icon_find_helper(Efreet_Icon_Theme *theme,
- const char *icon, const char *size)
+ const char *icon, unsigned int size)
{
char *value;
static int recurse = 0;
@@ -532,7 +536,7 @@
*/
static char *
efreet_icon_list_find_fallback(Efreet_Icon_Theme *theme,
- Ecore_List *icons, const char *size)
+ Ecore_List *icons, unsigned int size)
{
char *parent = NULL;
char *value = NULL;
@@ -580,7 +584,7 @@
*/
static char *
efreet_icon_list_find_helper(Efreet_Icon_Theme *theme,
- Ecore_List *icons, const char *size)
+ Ecore_List *icons, unsigned int size)
{
char *value = NULL;
const char *icon = NULL;
@@ -622,25 +626,23 @@
*/
static char *
efreet_icon_lookup_icon(Efreet_Icon_Theme *theme, const char *icon_name,
- const char *size)
+ unsigned int size)
{
char *icon = NULL, *tmp = NULL;
Efreet_Icon_Theme_Directory *dir;
int minimal_size = INT_MAX;
- unsigned int real_size;
if (!theme || (theme->paths.count == 0) || !icon_name || !size)
return NULL;
icon = efreet_icon_cache_check(theme, icon_name, size);
if (icon) return icon;
- real_size = atoi(size);
/* search for allowed size == requested size */
ecore_list_first_goto(theme->directories);
while ((dir = ecore_list_next(theme->directories)))
{
- if (!efreet_icon_directory_size_match(dir, real_size)) continue;
+ if (!efreet_icon_directory_size_match(dir, size)) continue;
icon = efreet_icon_lookup_directory(theme, dir,
icon_name);
if (icon)
@@ -656,7 +658,7 @@
{
int distance;
- distance = efreet_icon_directory_size_distance(dir, real_size);
+ distance = efreet_icon_directory_size_distance(dir, size);
if (distance >= minimal_size) continue;
tmp = efreet_icon_lookup_directory(theme, dir,
@@ -781,7 +783,7 @@
char *icon;
if (!icon_name) return NULL;
- icon = efreet_icon_cache_check(NULL, icon_name, NULL);
+ icon = efreet_icon_cache_check(NULL, icon_name, 0);
if (icon) return icon;
icon = efreet_icon_fallback_dir_scan(efreet_icon_deprecated_user_dir_get(), icon_name);
@@ -799,7 +801,7 @@
icon = efreet_icon_fallback_dir_scan(dir, icon_name);
if (icon)
{
- efreet_icon_cache_add(NULL, icon_name, NULL, icon);
+ efreet_icon_cache_add(NULL, icon_name, 0, icon);
return icon;
}
}
@@ -812,7 +814,7 @@
icon = efreet_icon_fallback_dir_scan(path, icon_name);
if (icon)
{
- efreet_icon_cache_add(NULL, icon_name, NULL, icon);
+ efreet_icon_cache_add(NULL, icon_name, 0, icon);
return icon;
}
}
@@ -820,7 +822,7 @@
icon = efreet_icon_fallback_dir_scan("/usr/share/pixmaps", icon_name);
}
- efreet_icon_cache_add(NULL, icon_name, NULL, icon);
+ efreet_icon_cache_add(NULL, icon_name, 0, icon);
return icon;
}
@@ -1576,7 +1578,7 @@
}
static char *
-efreet_icon_cache_check(Efreet_Icon_Theme *theme, const char *icon, const char *size)
+efreet_icon_cache_check(Efreet_Icon_Theme *theme, const char *icon, unsigned int size)
{
Ecore_List *list;
Efreet_Icon_Cache *cache;
@@ -1592,7 +1594,7 @@
return NULL;
}
- snprintf(key, sizeof(key), "%s %s", icon, size);
+ snprintf(key, sizeof(key), "%s %d", icon, size);
cache = ecore_list_find(list, ECORE_COMPARE_CB(efreet_icon_cache_find), key);
if (cache)
{
@@ -1613,7 +1615,7 @@
}
static void
-efreet_icon_cache_add(Efreet_Icon_Theme *theme, const char *icon, const char *size, const char *value)
+efreet_icon_cache_add(Efreet_Icon_Theme *theme, const char *icon, unsigned int size, const char *value)
{
Ecore_List *list;
Efreet_Icon_Cache *cache;
@@ -1628,7 +1630,7 @@
ecore_hash_set(efreet_icon_cache, theme, list);
}
- snprintf(key, sizeof(key), "%s %s", icon, size);
+ snprintf(key, sizeof(key), "%s %d", icon, size);
cache = NEW(Efreet_Icon_Cache, 1);
cache->key = strdup(key);
if ((value) && !stat(value, &st))
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 19:47:51
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/lib
Modified Files:
efreet_icon.c
Log Message:
Make the icon cache work for efreet_icon_list_find.
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- efreet_icon.c 14 Aug 2008 16:59:41 -0000 1.34
+++ efreet_icon.c 14 Aug 2008 19:47:48 -0000 1.35
@@ -4,11 +4,10 @@
static char *efreet_icon_deprecated_user_dir = NULL;
static char *efreet_icon_user_dir = NULL;
-static Ecore_Hash *efreet_icon_dirs_cached = NULL;
static Ecore_Hash *efreet_icon_themes = NULL;
-Ecore_List *efreet_icon_extensions = NULL;
+static Ecore_List *efreet_icon_extensions = NULL;
static Ecore_List *efreet_extra_icon_dirs = NULL;
-static Ecore_List *efreet_icon_cache = NULL;
+static Ecore_Hash *efreet_icon_cache = NULL;
static int efreet_icon_init_count = 0;
@@ -75,8 +74,10 @@
const char *dir);
static int efreet_icon_cache_find(Efreet_Icon_Cache *value, const char *key);
-static void efreet_icon_cache_flush(void);
+static void efreet_icon_cache_flush(Ecore_List *list);
static void efreet_icon_cache_free(Efreet_Icon_Cache *value);
+static char *efreet_icon_cache_check(Efreet_Icon_Theme *theme, const char *icon, const char *size);
+static void efreet_icon_cache_add(Efreet_Icon_Theme *theme, const char *icon, const char *size, const char *value);
/**
* @internal
@@ -112,8 +113,8 @@
ECORE_FREE_CB(efreet_icon_theme_free));
efreet_extra_icon_dirs = ecore_list_new();
- efreet_icon_cache = ecore_list_new();
- ecore_list_free_cb_set(efreet_icon_cache, ECORE_FREE_CB(efreet_icon_cache_free));
+ efreet_icon_cache = ecore_hash_new(ecore_direct_hash, ecore_direct_compare);
+ ecore_hash_free_value_cb_set(efreet_icon_cache, ECORE_FREE_CB(ecore_list_destroy));
}
return 1;
@@ -135,10 +136,9 @@
IF_FREE_LIST(efreet_icon_extensions);
IF_FREE_HASH(efreet_icon_themes);
- IF_FREE_HASH(efreet_icon_dirs_cached);
IF_FREE_LIST(efreet_extra_icon_dirs);
- IF_FREE_LIST(efreet_icon_cache);
+ IF_FREE_HASH(efreet_icon_cache);
ecore_shutdown();
efreet_icon_init_count = 0;
@@ -333,33 +333,9 @@
EAPI char *
efreet_icon_path_find(const char *theme_name, const char *icon, const char *size)
{
- struct stat st;
char *value = NULL;
- char key[4096];
- Efreet_Icon_Cache *cache;
Efreet_Icon_Theme *theme;
- snprintf(key, sizeof(key), "%s %s %s", theme_name, icon, size);
- cache = ecore_list_find(efreet_icon_cache, ECORE_COMPARE_CB(efreet_icon_cache_find), key);
- if (cache)
- {
- ecore_list_remove(efreet_icon_cache);
- if (!cache->path)
- {
- if (ecore_time_get() < (cache->lasttime + 5))
- {
- ecore_list_prepend(efreet_icon_cache, cache);
- return NULL;
- }
- }
- else if (!stat(cache->path, &st) && st.st_mtime == cache->lasttime)
- {
- ecore_list_prepend(efreet_icon_cache, cache);
- return strdup(cache->path);
- }
- efreet_icon_cache_free(cache);
- }
-
theme = efreet_icon_find_theme_check(theme_name);
#ifdef SLOPPY_SPEC
@@ -377,20 +353,9 @@
/* we didn't find the icon in the theme or in the inherited directories
* then just look for a non theme icon
*/
- if (!value) value = efreet_icon_fallback_icon(icon);
-
- cache = NEW(Efreet_Icon_Cache, 1);
- cache->key = strdup(key);
- if ((value) && !stat(value, &st))
- {
- cache->path = strdup(value);
- cache->lasttime = st.st_mtime;
- }
- else
- cache->lasttime = ecore_time_get();
- ecore_list_prepend(efreet_icon_cache, cache);
- efreet_icon_cache_flush();
+ if (!value || (value == (void *)-1)) value = efreet_icon_fallback_icon(icon);
+ if (value == (void *)-1) value = NULL;
return value;
}
@@ -436,16 +401,18 @@
/* we didn't find the icons in the theme or in the inherited directories
* then just look for a non theme icon
*/
- if (!value)
+ if (!value || (value == (void *)-1))
{
ecore_list_first_goto(icons);
while ((icon = ecore_list_next(icons)))
{
- if ((value = efreet_icon_fallback_icon(icon)))
+ value = efreet_icon_fallback_icon(icon);
+ if (value && (value != (void *)-1))
break;
}
}
+ if (value == (void *)-1) value = NULL;
return value;
}
@@ -502,7 +469,7 @@
if ((!parent_theme) || (parent_theme == theme)) continue;
value = efreet_icon_find_helper(parent_theme, icon, size);
- if (value) break;
+ if (value && (value != (void *)-1)) break;
}
}
/* if this isn't the hicolor theme, and we have no other fallbacks
@@ -547,7 +514,7 @@
value = efreet_icon_lookup_icon(theme, icon, size);
/* we didin't find the image check the inherited themes */
- if (!value)
+ if (!value || (value == (void *)-1))
value = efreet_icon_find_fallback(theme, icon, size);
recurse--;
@@ -582,7 +549,7 @@
value = efreet_icon_list_find_helper(parent_theme,
icons, size);
- if (value) break;
+ if (value && (value != (void *)-1)) break;
}
}
@@ -631,12 +598,13 @@
ecore_list_first_goto(icons);
while ((icon = ecore_list_next(icons)))
{
- if ((value = efreet_icon_lookup_icon(theme, icon, size)))
+ value = efreet_icon_lookup_icon(theme, icon, size);
+ if (value && (value != (void *)-1))
break;
}
/* we didn't find the image check the inherited themes */
- if (!value)
+ if (!value || (value == (void *)-1))
value = efreet_icon_list_find_fallback(theme, icons, size);
recurse--;
@@ -664,6 +632,8 @@
if (!theme || (theme->paths.count == 0) || !icon_name || !size)
return NULL;
+ icon = efreet_icon_cache_check(theme, icon_name, size);
+ if (icon) return icon;
real_size = atoi(size);
/* search for allowed size == requested size */
@@ -673,7 +643,11 @@
if (!efreet_icon_directory_size_match(dir, real_size)) continue;
icon = efreet_icon_lookup_directory(theme, dir,
icon_name);
- if (icon) return icon;
+ if (icon)
+ {
+ efreet_icon_cache_add(theme, icon_name, size, icon);
+ return icon;
+ }
}
/* search for any icon that matches */
@@ -695,6 +669,7 @@
}
}
+ efreet_icon_cache_add(theme, icon_name, size, icon);
return icon;
}
@@ -806,6 +781,8 @@
char *icon;
if (!icon_name) return NULL;
+ icon = efreet_icon_cache_check(NULL, icon_name, NULL);
+ if (icon) return icon;
icon = efreet_icon_fallback_dir_scan(efreet_icon_deprecated_user_dir_get(), icon_name);
if (!icon)
@@ -820,7 +797,11 @@
while ((dir = ecore_list_next(efreet_extra_icon_dirs)))
{
icon = efreet_icon_fallback_dir_scan(dir, icon_name);
- if (icon) return icon;
+ if (icon)
+ {
+ efreet_icon_cache_add(NULL, icon_name, NULL, icon);
+ return icon;
+ }
}
xdg_dirs = efreet_data_dirs_get();
@@ -829,12 +810,17 @@
{
snprintf(path, PATH_MAX, "%s/icons", dir);
icon = efreet_icon_fallback_dir_scan(path, icon_name);
- if (icon) return icon;
+ if (icon)
+ {
+ efreet_icon_cache_add(NULL, icon_name, NULL, icon);
+ return icon;
+ }
}
icon = efreet_icon_fallback_dir_scan("/usr/share/pixmaps", icon_name);
}
+ efreet_icon_cache_add(NULL, icon_name, NULL, icon);
return icon;
}
@@ -1212,6 +1198,7 @@
break;
}
}
+ theme->last_cache_check = new_check;
}
/**
@@ -1230,8 +1217,7 @@
/* have we modified this directory since our last cache check? */
if (stat(dir, &buf) || (buf.st_mtime > theme->last_cache_check))
{
- if (efreet_icon_dirs_cached)
- ecore_hash_remove(efreet_icon_dirs_cached, dir);
+ ecore_hash_remove(efreet_icon_cache, theme);
return 0;
}
@@ -1564,17 +1550,17 @@
}
static void
-efreet_icon_cache_flush(void)
+efreet_icon_cache_flush(Ecore_List *list)
{
/* TODO:
* * Dynamic cache size
* * Maybe add references to cache, so that we sort on how often a value is used
*/
- while (ecore_list_count(efreet_icon_cache) > 100)
+ while (ecore_list_count(list) > 100)
{
Efreet_Icon_Cache *cache;
- cache = ecore_list_last_remove(efreet_icon_cache);
+ cache = ecore_list_last_remove(list);
efreet_icon_cache_free(cache);
}
}
@@ -1587,4 +1573,71 @@
IF_FREE(value->key);
IF_FREE(value->path);
free(value);
+}
+
+static char *
+efreet_icon_cache_check(Efreet_Icon_Theme *theme, const char *icon, const char *size)
+{
+ Ecore_List *list;
+ Efreet_Icon_Cache *cache;
+ char key[4096];
+ struct stat st;
+
+ list = ecore_hash_get(efreet_icon_cache, theme);
+ if (!list)
+ {
+ list = ecore_list_new();
+ ecore_list_free_cb_set(list, ECORE_FREE_CB(efreet_icon_cache_free));
+ ecore_hash_set(efreet_icon_cache, theme, list);
+ return NULL;
+ }
+
+ snprintf(key, sizeof(key), "%s %s", icon, size);
+ cache = ecore_list_find(list, ECORE_COMPARE_CB(efreet_icon_cache_find), key);
+ if (cache)
+ {
+ ecore_list_remove(list);
+ if (!cache->path)
+ {
+ ecore_list_prepend(list, cache);
+ return (void *)-1;
+ }
+ else if (!stat(cache->path, &st) && st.st_mtime == cache->lasttime)
+ {
+ ecore_list_prepend(list, cache);
+ return strdup(cache->path);
+ }
+ efreet_icon_cache_free(cache);
+ }
+ return NULL;
+}
+
+static void
+efreet_icon_cache_add(Efreet_Icon_Theme *theme, const char *icon, const char *size, const char *value)
+{
+ Ecore_List *list;
+ Efreet_Icon_Cache *cache;
+ char key[4096];
+ struct stat st;
+
+ list = ecore_hash_get(efreet_icon_cache, theme);
+ if (!list)
+ {
+ list = ecore_list_new();
+ ecore_list_free_cb_set(list, ECORE_FREE_CB(efreet_icon_cache_free));
+ ecore_hash_set(efreet_icon_cache, theme, list);
+ }
+
+ snprintf(key, sizeof(key), "%s %s", icon, size);
+ cache = NEW(Efreet_Icon_Cache, 1);
+ cache->key = strdup(key);
+ if ((value) && !stat(value, &st))
+ {
+ cache->path = strdup(value);
+ cache->lasttime = st.st_mtime;
+ }
+ else
+ cache->lasttime = ecore_time_get();
+ ecore_list_prepend(list, cache);
+ efreet_icon_cache_flush(list);
}
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 18:44:25
|
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Makefile.am emodule.c finders.c lang.c menus-misc.c util.h
Added Files:
string.c
Log Message:
Provide strcase functions if not available.
===================================================================
RCS file: /cvs/e/e16/e/src/Makefile.am,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- Makefile.am 28 Jun 2008 19:08:35 -0000 1.103
+++ Makefile.am 14 Aug 2008 18:44:23 -0000 1.104
@@ -94,6 +94,7 @@
sound.c sound.h \
stacking.c \
startup.c \
+ string.c \
systray.c \
tclass.c tclass.h \
text.c \
===================================================================
RCS file: /cvs/e/e16/e/src/emodule.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- emodule.c 22 Mar 2008 15:00:07 -0000 1.10
+++ emodule.c 14 Aug 2008 18:44:23 -0000 1.11
@@ -53,7 +53,7 @@
for (i = 0; i < n_modules; i++)
{
pm = p_modules[i];
- if (!strncasecmp(name, pm->name, 4) ||
+ if (!strncmp(name, pm->name, 4) ||
(pm->nick && !strcmp(name, pm->nick)))
return pm;
}
===================================================================
RCS file: /cvs/e/e16/e/src/finders.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- finders.c 10 May 2008 23:22:31 -0000 1.57
+++ finders.c 14 Aug 2008 18:44:23 -0000 1.58
@@ -25,6 +25,7 @@
#include "borders.h"
#include "ewins.h"
#include "groups.h"
+#include "util.h"
#include <ctype.h>
#include <string.h>
@@ -173,7 +174,7 @@
name = EwinGetIcccmName(ewin);
if (!name)
continue;
- if (!strcasestr(name, match))
+ if (!Estrcasestr(name, match))
continue;
}
nfound++;
===================================================================
RCS file: /cvs/e/e16/e/src/lang.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- lang.c 26 Jun 2008 21:59:23 -0000 1.27
+++ lang.c 14 Aug 2008 18:44:23 -0000 1.28
@@ -386,9 +386,9 @@
enc_loc, enc_int, MB_CUR_MAX);
}
- if (!strcasecmp(enc_loc, "utf8") || !strcasecmp(enc_loc, "utf-8"))
+ if (!Estrcasecmp(enc_loc, "utf8") || !Estrcasecmp(enc_loc, "utf-8"))
Mode.locale.utf8_loc = 1;
- if (!strcasecmp(enc_int, "utf8") || !strcasecmp(enc_int, "utf-8"))
+ if (!Estrcasecmp(enc_int, "utf8") || !Estrcasecmp(enc_int, "utf-8"))
Mode.locale.utf8_int = 1;
#if HAVE_ICONV
===================================================================
RCS file: /cvs/e/e16/e/src/menus-misc.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- menus-misc.c 16 Jun 2008 21:24:02 -0000 1.49
+++ menus-misc.c 14 Aug 2008 18:44:23 -0000 1.50
@@ -851,7 +851,7 @@
int i;
for (i = 0; exts[i]; i++)
- if (!strcasecmp(exts[i], ext))
+ if (!Estrcasecmp(exts[i], ext))
return 1;
return 0;
===================================================================
RCS file: /cvs/e/e16/e/src/util.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- util.h 7 Aug 2008 23:14:54 -0000 1.18
+++ util.h 14 Aug 2008 18:44:23 -0000 1.19
@@ -59,11 +59,15 @@
#define USE_LIBC_STRNDUP 1 /* Use libc strndup if present */
#endif
-#ifndef HAVE_STRCASESTR
-#define strcasestr(haystack, needle) strstr(haystack, needle)
+#ifdef HAVE_STRCASECMP
+#define Estrcasecmp(s1, s2) strcasecmp(s1, s2)
+#else
+int Estrcasecmp(const char *s1, const char *s2);
#endif
-#ifndef HAVE_STRCASECMP
-#define strcasecmp(s1, s2) strcmp(s1, s2)
+#ifdef HAVE_STRCASESTR
+#define Estrcasestr(haystack, needle) strcasestr(haystack, needle)
+#else
+const char *Estrcasestr(const char *haystack, const char *needle);
#endif
/* memory.c */
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 18:41:57
|
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e Modified Files: configure.in Log Message: Bump version. =================================================================== RCS file: /cvs/e/e16/e/configure.in,v retrieving revision 1.268 retrieving revision 1.269 diff -u -3 -r1.268 -r1.269 --- configure.in 9 Aug 2008 13:06:21 -0000 1.268 +++ configure.in 14 Aug 2008 18:41:55 -0000 1.269 @@ -1,5 +1,5 @@ -m4_define([pkg_version], [0.16.8.14]) -dnl m4_define([pkg_revision], [0.04]) +m4_define([pkg_version], [0.16.8.15]) +m4_define([pkg_revision], [0.00]) m4_define([pkg_ver_rev], m4_ifdef([pkg_revision], [pkg_version-pkg_revision], [pkg_version])) m4_define([rpm_revision], m4_ifdef([pkg_revision], [pkg_revision], [1])) |
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 18:21:31
|
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
Edje.h edje_load.c edje_private.h edje_program.c edje_util.c
Log Message:
Add some consts to Edje's API.
Some methods do no change object internal state and can be marked as
read only. In parallel have infamous edje_object_part_object_get() to
return a read-only object, so it's even more clear that one should not
touch this object state (either a cast or a compiler warning if you do
that!)
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/Edje.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- Edje.h 14 Aug 2008 18:04:42 -0000 1.55
+++ Edje.h 14 Aug 2008 18:21:27 -0000 1.56
@@ -200,21 +200,21 @@
EAPI Evas_Object *edje_object_add (Evas *evas);
/* edje_util.c */
- EAPI const char *edje_object_data_get (Evas_Object *obj, const char *key);
+ EAPI const char *edje_object_data_get (const Evas_Object *obj, const char *key);
/* edje_load.c */
EAPI int edje_object_file_set (Evas_Object *obj, const char *file, const char *group);
- EAPI void edje_object_file_get (Evas_Object *obj, const char **file, const char **group);
- EAPI int edje_object_load_error_get (Evas_Object *obj);
+ EAPI void edje_object_file_get (const Evas_Object *obj, const char **file, const char **group);
+ EAPI int edje_object_load_error_get (const Evas_Object *obj);
/* edje_program.c */
EAPI void edje_object_signal_callback_add (Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *obj, const char *emission, const char *source), void *data);
EAPI void *edje_object_signal_callback_del (Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *obj, const char *emission, const char *source));
EAPI void edje_object_signal_emit (Evas_Object *obj, const char *emission, const char *source);
EAPI void edje_object_play_set (Evas_Object *obj, int play);
- EAPI int edje_object_play_get (Evas_Object *obj);
+ EAPI int edje_object_play_get (const Evas_Object *obj);
EAPI void edje_object_animation_set (Evas_Object *obj, int on);
- EAPI int edje_object_animation_get (Evas_Object *obj);
+ EAPI int edje_object_animation_get (const Evas_Object *obj);
/* edje_util.c */
EAPI int edje_object_freeze (Evas_Object *obj);
@@ -222,30 +222,30 @@
EAPI void edje_object_color_class_set (Evas_Object *obj, const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3);
EAPI void edje_object_color_class_del (Evas_Object *obj, const char *color_class);
EAPI void edje_object_text_class_set (Evas_Object *obj, const char *text_class, const char *font, Evas_Font_Size size);
- EAPI void edje_object_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
- EAPI void edje_object_size_max_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
+ EAPI void edje_object_size_min_get (const Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
+ EAPI void edje_object_size_max_get (const Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
EAPI void edje_object_calc_force (Evas_Object *obj);
EAPI void edje_object_size_min_calc (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
EAPI void edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord restrictedw, Evas_Coord restrictedh);
- EAPI int edje_object_part_exists (Evas_Object *obj, const char *part);
- EAPI Evas_Object *edje_object_part_object_get (Evas_Object *obj, const char *part);
- EAPI void edje_object_part_geometry_get (Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+ EAPI int edje_object_part_exists (const Evas_Object *obj, const char *part);
+ EAPI const Evas_Object *edje_object_part_object_get (const Evas_Object *obj, const char *part);
+ EAPI void edje_object_part_geometry_get (const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
EAPI void edje_object_text_change_cb_set (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, const char *part), void *data);
EAPI void edje_object_part_text_set (Evas_Object *obj, const char *part, const char *text);
- EAPI const char *edje_object_part_text_get (Evas_Object *obj, const char *part);
+ EAPI const char *edje_object_part_text_get (const Evas_Object *obj, const char *part);
EAPI void edje_object_part_swallow (Evas_Object *obj, const char *part, Evas_Object *obj_swallow);
EAPI void edje_object_part_unswallow (Evas_Object *obj, Evas_Object *obj_swallow);
- EAPI Evas_Object *edje_object_part_swallow_get (Evas_Object *obj, const char *part);
- EAPI const char *edje_object_part_state_get (Evas_Object *obj, const char *part, double *val_ret);
- EAPI int edje_object_part_drag_dir_get (Evas_Object *obj, const char *part);
+ EAPI Evas_Object *edje_object_part_swallow_get (const Evas_Object *obj, const char *part);
+ EAPI const char *edje_object_part_state_get (const Evas_Object *obj, const char *part, double *val_ret);
+ EAPI int edje_object_part_drag_dir_get (const Evas_Object *obj, const char *part);
EAPI void edje_object_part_drag_value_set (Evas_Object *obj, const char *part, double dx, double dy);
- EAPI void edje_object_part_drag_value_get (Evas_Object *obj, const char *part, double *dx, double *dy);
+ EAPI void edje_object_part_drag_value_get (const Evas_Object *obj, const char *part, double *dx, double *dy);
EAPI void edje_object_part_drag_size_set (Evas_Object *obj, const char *part, double dw, double dh);
- EAPI void edje_object_part_drag_size_get (Evas_Object *obj, const char *part, double *dw, double *dh);
+ EAPI void edje_object_part_drag_size_get (const Evas_Object *obj, const char *part, double *dw, double *dh);
EAPI void edje_object_part_drag_step_set (Evas_Object *obj, const char *part, double dx, double dy);
- EAPI void edje_object_part_drag_step_get (Evas_Object *obj, const char *part, double *dx, double *dy);
+ EAPI void edje_object_part_drag_step_get (const Evas_Object *obj, const char *part, double *dx, double *dy);
EAPI void edje_object_part_drag_page_set (Evas_Object *obj, const char *part, double dx, double dy);
- EAPI void edje_object_part_drag_page_get (Evas_Object *obj, const char *part, double *dx, double *dy);
+ EAPI void edje_object_part_drag_page_get (const Evas_Object *obj, const char *part, double *dx, double *dy);
EAPI void edje_object_part_drag_step (Evas_Object *obj, const char *part, double dx, double dy);
EAPI void edje_object_part_drag_page (Evas_Object *obj, const char *part, double dx, double dy);
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -3 -r1.129 -r1.130
--- edje_load.c 14 Aug 2008 18:04:42 -0000 1.129
+++ edje_load.c 14 Aug 2008 18:21:27 -0000 1.130
@@ -49,7 +49,7 @@
* interested in one of the values.
*/
EAPI void
-edje_object_file_get(Evas_Object *obj, const char **file, const char **group)
+edje_object_file_get(const Evas_Object *obj, const char **file, const char **group)
{
Edje *ed;
@@ -79,7 +79,7 @@
* 7: Incompatible File
*/
EAPI int
-edje_object_load_error_get(Evas_Object *obj)
+edje_object_load_error_get(const Evas_Object *obj)
{
Edje *ed;
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -3 -r1.153 -r1.154
--- edje_private.h 14 Aug 2008 18:04:43 -0000 1.153
+++ edje_private.h 14 Aug 2008 18:21:27 -0000 1.154
@@ -1073,7 +1073,7 @@
void _edje_text_class_members_free(void);
void _edje_text_class_hash_free(void);
-Edje *_edje_fetch(Evas_Object *obj);
+Edje *_edje_fetch(const Evas_Object *obj);
int _edje_freeze(Edje *ed);
int _edje_thaw(Edje *ed);
int _edje_block(Edje *ed);
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_program.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- edje_program.c 7 Jun 2008 10:06:13 -0000 1.61
+++ edje_program.c 14 Aug 2008 18:21:27 -0000 1.62
@@ -262,7 +262,7 @@
* 1 if Edje set to play
*/
EAPI int
-edje_object_play_get(Evas_Object *obj)
+edje_object_play_get(const Evas_Object *obj)
{
Edje *ed;
@@ -343,7 +343,7 @@
* 1 if animated
*/
EAPI int
-edje_object_animation_get(Evas_Object *obj)
+edje_object_animation_get(const Evas_Object *obj)
{
Edje *ed;
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- edje_util.c 14 Aug 2008 18:04:43 -0000 1.110
+++ edje_util.c 14 Aug 2008 18:21:27 -0000 1.111
@@ -94,7 +94,7 @@
* @endcode
*/
EAPI const char *
-edje_object_data_get(Evas_Object *obj, const char *key)
+edje_object_data_get(const Evas_Object *obj, const char *key)
{
Edje *ed;
Evas_List *l;
@@ -683,7 +683,7 @@
* 1 if Edje part exists
*/
EAPI int
-edje_object_part_exists(Evas_Object *obj, const char *part)
+edje_object_part_exists(const Evas_Object *obj, const char *part)
{
Edje *ed;
Edje_Real_Part *rp;
@@ -707,8 +707,8 @@
* @return Returns the Evas_Object corresponding to the given part,
* or NULL on failure (if the part doesn't exist)
**/
-EAPI Evas_Object *
-edje_object_part_object_get(Evas_Object *obj, const char *part)
+EAPI const Evas_Object *
+edje_object_part_object_get(const Evas_Object *obj, const char *part)
{
Edje *ed;
Edje_Real_Part *rp;
@@ -734,7 +734,7 @@
* values you are uninterested in.
*/
EAPI void
-edje_object_part_geometry_get(Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h )
+edje_object_part_geometry_get(const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h )
{
Edje *ed;
Edje_Real_Part *rp;
@@ -821,7 +821,7 @@
* @return The text string
*/
EAPI const char *
-edje_object_part_text_get(Evas_Object *obj, const char *part)
+edje_object_part_text_get(const Evas_Object *obj, const char *part)
{
Edje *ed;
Edje_Real_Part *rp;
@@ -1032,7 +1032,7 @@
* @return The swallowed object, or NULL if there is none.
*/
EAPI Evas_Object *
-edje_object_part_swallow_get(Evas_Object *obj, const char *part)
+edje_object_part_swallow_get(const Evas_Object *obj, const char *part)
{
Edje *ed;
Edje_Real_Part *rp;
@@ -1053,7 +1053,7 @@
* to zero if no Edje is connected to the Evas Object.
*/
EAPI void
-edje_object_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
+edje_object_size_min_get(const Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
{
Edje *ed;
@@ -1077,7 +1077,7 @@
* to zero if no Edje is connected to the Evas Object.
*/
EAPI void
-edje_object_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
+edje_object_size_max_get(const Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
{
Edje *ed;
@@ -1280,7 +1280,7 @@
*/
/* FIXME: Correctly return other states */
EAPI const char *
-edje_object_part_state_get(Evas_Object *obj, const char *part, double *val_ret)
+edje_object_part_state_get(const Evas_Object *obj, const char *part, double *val_ret)
{
Edje *ed;
Edje_Real_Part *rp;
@@ -1328,7 +1328,7 @@
* 3: Dragable in X & Y directions
*/
EAPI int
-edje_object_part_drag_dir_get(Evas_Object *obj, const char *part)
+edje_object_part_drag_dir_get(const Evas_Object *obj, const char *part)
{
Edje *ed;
Edje_Real_Part *rp;
@@ -1386,7 +1386,7 @@
*/
/* FIXME: Should this be x and y instead of dx/dy? */
EAPI void
-edje_object_part_drag_value_get(Evas_Object *obj, const char *part, double *dx, double *dy)
+edje_object_part_drag_value_get(const Evas_Object *obj, const char *part, double *dx, double *dy)
{
Edje *ed;
Edje_Real_Part *rp;
@@ -1452,7 +1452,7 @@
* Gets the dragable object size.
*/
EAPI void
-edje_object_part_drag_size_get(Evas_Object *obj, const char *part, double *dw, double *dh)
+edje_object_part_drag_size_get(const Evas_Object *obj, const char *part, double *dw, double *dh)
{
Edje *ed;
Edje_Real_Part *rp;
@@ -1510,7 +1510,7 @@
* Gets the x and y step increments for the dragable object.
*/
EAPI void
-edje_object_part_drag_step_get(Evas_Object *obj, const char *part, double *dx, double *dy)
+edje_object_part_drag_step_get(const Evas_Object *obj, const char *part, double *dx, double *dy)
{
Edje *ed;
Edje_Real_Part *rp;
@@ -1568,7 +1568,7 @@
* Gets the x,y page step increments for the dragable object.
*/
EAPI void
-edje_object_part_drag_page_get(Evas_Object *obj, const char *part, double *dx, double *dy)
+edje_object_part_drag_page_get(const Evas_Object *obj, const char *part, double *dx, double *dy)
{
Edje *ed;
Edje_Real_Part *rp;
@@ -1923,7 +1923,7 @@
}
Edje *
-_edje_fetch(Evas_Object *obj)
+_edje_fetch(const Evas_Object *obj)
{
Edje *ed;
char *type;
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 18:10:30
|
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_data.c
Log Message:
Fix warnings about Edje's usage of Eet_Data_Descriptor_Class.
Couple of casts to shut up gcc.
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_data.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- edje_data.c 7 Jun 2008 10:06:13 -0000 1.46
+++ edje_data.c 14 Aug 2008 18:10:26 -0000 1.47
@@ -81,15 +81,15 @@
eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
eddc.func.mem_alloc = NULL;
eddc.func.mem_free = NULL;
- eddc.func.str_alloc = evas_stringshare_add;
+ eddc.func.str_alloc = (char *(*)(const char *))evas_stringshare_add;
eddc.func.str_free = evas_stringshare_del;
- eddc.func.list_next = evas_list_next;
- eddc.func.list_append = evas_list_append;
- eddc.func.list_data = evas_list_data;
- eddc.func.list_free = evas_list_free;
- eddc.func.hash_foreach = evas_hash_foreach;
- eddc.func.hash_add = evas_hash_add;
- eddc.func.hash_free = evas_hash_free;
+ eddc.func.list_next = (void *(*)(void *))evas_list_next;
+ eddc.func.list_append = (void *(*)(void *, void *))evas_list_append;
+ eddc.func.list_data = (void *(*)(void *))evas_list_data;
+ eddc.func.list_free = (void *(*)(void *))evas_list_free;
+ eddc.func.hash_foreach = (void (*)(void *, int (*)(void *, const char *, void *, void *), void *))evas_hash_foreach;
+ eddc.func.hash_add = (void *(*)(void *, const char *, void *))evas_hash_add;
+ eddc.func.hash_free = (void (*)(void *))evas_hash_free;
eddc.func.str_direct_alloc = _edje_str_direct_alloc;
eddc.func.str_direct_free = _edje_str_direct_free;
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 18:04:44
|
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
Edje.h edje_edit.c edje_load.c edje_main.c edje_private.h
edje_util.c
Log Message:
Fix name incoherency: rename Edje->part to group.
It is very confusing to have "part" there and in the methods call,
because we want the group name, not part.
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/Edje.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- Edje.h 31 May 2008 06:10:58 -0000 1.54
+++ Edje.h 14 Aug 2008 18:04:42 -0000 1.55
@@ -203,8 +203,8 @@
EAPI const char *edje_object_data_get (Evas_Object *obj, const char *key);
/* edje_load.c */
- EAPI int edje_object_file_set (Evas_Object *obj, const char *file, const char *part);
- EAPI void edje_object_file_get (Evas_Object *obj, const char **file, const char **part);
+ EAPI int edje_object_file_set (Evas_Object *obj, const char *file, const char *group);
+ EAPI void edje_object_file_get (Evas_Object *obj, const char **file, const char **group);
EAPI int edje_object_load_error_get (Evas_Object *obj);
/* edje_program.c */
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_edit.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- edje_edit.c 30 Jul 2008 22:41:04 -0000 1.23
+++ edje_edit.c 14 Aug 2008 18:04:42 -0000 1.24
@@ -4256,7 +4256,7 @@
printf("*** Edje\n");
printf(" path: '%s'\n", ed->path);
- printf(" part: '%s'\n", ed->part);
+ printf(" group: '%s'\n", ed->group);
printf(" parent: '%s'\n", ed->parent);
printf("\n*** Parts [table:%d list:%d]\n", ed->table_parts_size,
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -3 -r1.128 -r1.129
--- edje_load.c 2 Aug 2008 01:33:39 -0000 1.128
+++ edje_load.c 14 Aug 2008 18:04:42 -0000 1.129
@@ -9,7 +9,7 @@
#ifdef EDJE_PROGRAM_CACHE
static int _edje_collection_free_prog_cache_matches_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
#endif
-static int _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *part, Evas_List *group_path);
+static int _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *group, Evas_List *group_path);
static void _cb_signal_repeat(void *data, Evas_Object *obj, const char *signal, const char *source);
static Evas_List *_edje_swallows_collect(Edje *ed);
@@ -20,7 +20,7 @@
/** Sets the EET file and group to load @a obj from
* @param obj A valid Evas_Object handle
* @param file The path to the EET file
- * @param part The group name in the Edje
+ * @param group The group name in the Edje
* @return 0 on Error\n
* 1 on Success and sets EDJE_LOAD_ERROR_NONE
*
@@ -29,27 +29,27 @@
* specifies the file and group name to load @a obj from.
*/
EAPI int
-edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
+edje_object_file_set(Evas_Object *obj, const char *file, const char *group)
{
- return _edje_object_file_set_internal(obj, file, part, NULL);
+ return _edje_object_file_set_internal(obj, file, group, NULL);
}
/* FIXDOC: Verify/expand doc. */
/** Get the file and group name that @a obj was loaded from
* @param obj A valid Evas_Object handle
* @param file A pointer to store a pointer to the filename in
- * @param part A pointer to store a pointer to the group name in
+ * @param group A pointer to store a pointer to the group name in
*
* This gets the EET file location and group for the given Evas_Object.
* If @a obj is either not an edje file, or has not had its file/group set
- * using edje_object_file_set(), then both @a file and @a part will be set
+ * using edje_object_file_set(), then both @a file and @a group will be set
* to NULL.
*
- * It is valid to pass in NULL for either @a file or @a part if you are not
+ * It is valid to pass in NULL for either @a file or @a group if you are not
* interested in one of the values.
*/
EAPI void
-edje_object_file_get(Evas_Object *obj, const char **file, const char **part)
+edje_object_file_get(Evas_Object *obj, const char **file, const char **group)
{
Edje *ed;
@@ -57,11 +57,11 @@
if (!ed)
{
if (file) *file = NULL;
- if (part) *part = NULL;
+ if (group) *group = NULL;
return;
}
if (file) *file = ed->path;
- if (part) *part = ed->part;
+ if (group) *group = ed->group;
}
/* FIXDOC: Verify. return error? */
@@ -229,7 +229,7 @@
}
static int
-_edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *part, Evas_List *group_path)
+_edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *group, Evas_List *group_path)
{
Edje *ed;
int n;
@@ -240,9 +240,9 @@
ed = _edje_fetch(obj);
if (!ed) return 0;
if (!file) file = "";
- if (!part) part = "";
+ if (!group) group = "";
if (((ed->path) && (!strcmp(file, ed->path))) &&
- (ed->part) && (!strcmp(part, ed->part)))
+ (ed->group) && (!strcmp(group, ed->group)))
return 1;
old_swallows = _edje_swallows_collect(ed);
@@ -251,9 +251,9 @@
_edje_file_del(ed);
if (ed->path) evas_stringshare_del(ed->path);
- if (ed->part) evas_stringshare_del(ed->part);
+ if (ed->group) evas_stringshare_del(ed->group);
ed->path = evas_stringshare_add(file);
- ed->part = evas_stringshare_add(part);
+ ed->group = evas_stringshare_add(group);
ed->load_error = EDJE_LOAD_ERROR_NONE;
_edje_file_add(ed);
@@ -489,7 +489,7 @@
const char *group_path_entry = evas_stringshare_add(rp->part->source);
if (!group_path)
{
- group_path = evas_list_append(NULL, evas_stringshare_add(part));
+ group_path = evas_list_append(NULL, evas_stringshare_add(group));
group_path_started = 1;
}
/* make sure that this group isn't already in the tree of parents */
@@ -590,7 +590,7 @@
_edje_file_add(Edje *ed)
{
if (_edje_edd_edje_file == NULL) return;
- ed->file = _edje_cache_file_coll_open(ed->path, ed->part,
+ ed->file = _edje_cache_file_coll_open(ed->path, ed->group,
&(ed->load_error),
&(ed->collection));
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_main.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- edje_main.c 7 Jun 2008 10:06:13 -0000 1.57
+++ edje_main.c 14 Aug 2008 18:04:43 -0000 1.58
@@ -88,10 +88,10 @@
_edje_callbacks_patterns_clean(ed);
_edje_file_del(ed);
if (ed->path) evas_stringshare_del(ed->path);
- if (ed->part) evas_stringshare_del(ed->part);
+ if (ed->group) evas_stringshare_del(ed->group);
if (ed->parent) evas_stringshare_del(ed->parent);
ed->path = NULL;
- ed->part = NULL;
+ ed->group = NULL;
if ((ed->actions) || (ed->pending_actions))
{
_edje_animators = evas_list_remove(_edje_animators, ed);
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -3 -r1.152 -r1.153
--- edje_private.h 27 Jun 2008 03:14:57 -0000 1.152
+++ edje_private.h 14 Aug 2008 18:04:43 -0000 1.153
@@ -622,7 +622,7 @@
struct _Edje
{
const char *path;
- const char *part;
+ const char *group;
const char *parent;
Evas_Coord x, y, w, h;
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- edje_util.c 13 Jul 2008 13:55:43 -0000 1.109
+++ edje_util.c 14 Aug 2008 18:04:43 -0000 1.110
@@ -1245,7 +1245,7 @@
if ((ed->w > 4000) || (ed->h > 4000))
{
printf("EDJE ERROR: file %s, group %s has a non-fixed part. add fixed: 1 1; ???\n",
- ed->path, ed->part);
+ ed->path, ed->group);
if (pep)
printf(" Problem part is: %s\n", pep->part->name);
printf(" Will recalc min size not allowing broken parts to affect the result.\n");
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 17:58:25
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e
Modified Files:
configure.in
Log Message:
Battery does not depend on ecore-txt
===================================================================
RCS file: /cvs/e/e17/apps/e/configure.in,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -3 -r1.213 -r1.214
--- configure.in 14 Aug 2008 01:16:26 -0000 1.213
+++ configure.in 14 Aug 2008 17:58:22 -0000 1.214
@@ -209,7 +209,6 @@
ecore-txt
], [
have_temp="yes"
- have_bat="yes"
], [ have_temp="no"])
AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = "xyes")
@@ -219,14 +218,12 @@
ecore-file
])
fi
-AM_CONDITIONAL(HAVE_BATTERY, test x$have_bat = "xyes")
-if test x$have_bat = "xyes"; then
- PKG_CHECK_MODULES(BATTERY, [
- ecore
- ecore-file
- ecore-con
- ])
-fi
+
+PKG_CHECK_MODULES(BATTERY, [
+ ecore
+ ecore-file
+ ecore-con
+])
PKG_CHECK_MODULES(E_DBUS, edbus, have_edbus=yes, have_edbus=no)
PKG_CHECK_MODULES(E_HAL, ehal, have_ehal=yes, have_ehal=no)
|
135 messages has been excluded from this view by a project administrator.
