I attach the patches for those changes.
--
Pau Espin Pedrol
mail/jabber: pespin.s...@gmail.com
http://blog.espeweb.net
Index: elm_map.h
===================================================================
--- elm_map.h (revision 68557)
+++ elm_map.h (working copy)
@@ -108,7 +108,7 @@
{
ELM_MAP_NAME_SOURCE_NOMINATIM,
ELM_MAP_NAME_SOURCE_LAST
-} Elm_Map_Name_Sources;
+} Elm_Map_Name_Source;
/**
* Set type of transport used on route.
Index: elm_map.c
===================================================================
--- elm_map.c (revision 68557)
+++ elm_map.c (working copy)
@@ -102,7 +102,7 @@
int zoom_min;
int zoom_max;
ElmMapModuleUrlFunc url_cb;
- Elm_Map_Route_Sources route_source;
+ Elm_Map_Route_Source route_source;
ElmMapModuleRouteUrlFunc route_url_cb;
ElmMapModuleNameUrlFunc name_url_cb;
ElmMapModuleGeoIntoCoordFunc geo_into_coord;
@@ -368,7 +368,7 @@
Eina_List *marker_classes;
Eina_List *markers;
- Elm_Map_Route_Sources route_source;
+ Elm_Map_Route_Source route_source;
Eina_List *route;
Eina_List *track;
Eina_List *names;
@@ -3805,7 +3805,7 @@
}
EAPI void
-elm_map_route_source_set(Evas_Object *obj, Elm_Map_Route_Sources source)
+elm_map_route_source_set(Evas_Object *obj, Elm_Map_Route_Source source)
{
#ifdef HAVE_ELEMENTARY_ECORE_CON
ELM_CHECK_WIDTYPE(obj, widtype);
@@ -3819,7 +3819,7 @@
#endif
}
-EAPI Elm_Map_Route_Sources
+EAPI Elm_Map_Route_Source
elm_map_route_source_get(const Evas_Object *obj)
{
#ifdef HAVE_ELEMENTARY_ECORE_CON
Index: elm_map.h
===================================================================
--- elm_map.h (revision 68557)
+++ elm_map.h (working copy)
@@ -102,7 +102,7 @@
ELM_MAP_ROUTE_SOURCE_MONAV, /**< MoNav offers exact routing without
heuristic assumptions. Its routing core is based on Contraction Hierarchies.
It's not working with Map yet. */
ELM_MAP_ROUTE_SOURCE_ORS, /**< Open Route Service:
http://www.openrouteservice.org/ . It's not working with Map yet. */
ELM_MAP_ROUTE_SOURCE_LAST
-} Elm_Map_Route_Sources;
+} Elm_Map_Route_Source;
typedef enum
{
@@ -1061,7 +1061,7 @@
*
* @ingroup Map
*/
-EAPI void elm_map_route_source_set(Evas_Object *obj,
Elm_Map_Route_Sources source);
+EAPI void elm_map_route_source_set(Evas_Object *obj,
Elm_Map_Route_Source source);
/**
* Get the current route source.
@@ -1073,7 +1073,7 @@
*
* @ingroup Map
*/
-EAPI Elm_Map_Route_Sources elm_map_route_source_get(const Evas_Object *obj);
+EAPI Elm_Map_Route_Source elm_map_route_source_get(const Evas_Object *obj);
/**
* Set the minimum zoom of the source.
Index: elm_menu.c
===================================================================
--- elm_menu.c (revision 68557)
+++ elm_menu.c (working copy)
@@ -117,7 +117,7 @@
elm_widget_style_get(obj));
elm_object_item_text_set((Elm_Object_Item *) item,
item->label);
- elm_menu_item_object_icon_name_set((Elm_Object_Item *) item,
+ elm_menu_item_icon_name_set((Elm_Object_Item *) item,
item->icon_str);
}
else
@@ -126,7 +126,7 @@
elm_widget_style_get(obj));
elm_object_item_text_set((Elm_Object_Item *) item,
item->label);
- elm_menu_item_object_icon_name_set((Elm_Object_Item *) item,
+ elm_menu_item_icon_name_set((Elm_Object_Item *) item,
item->icon_str);
}
_item_disable_hook((Elm_Object_Item *) item);
@@ -498,7 +498,7 @@
elm_object_item_text_set((Elm_Object_Item *) item,
item->label);
if (item->icon_str)
- elm_menu_item_object_icon_name_set((Elm_Object_Item *) item,
+ elm_menu_item_icon_name_set((Elm_Object_Item *) item,
item->icon_str);
edje_object_signal_callback_add(VIEW(item), "elm,action,open", "",
_submenu_open, item);
@@ -744,7 +744,7 @@
elm_widget_sub_object_add(WIDGET(subitem), subitem->content);
edje_object_part_swallow(VIEW(subitem), "elm.swallow.content",
subitem->content);
if (icon)
- elm_menu_item_object_icon_name_set((Elm_Object_Item *) subitem, icon);
+ elm_menu_item_icon_name_set((Elm_Object_Item *) subitem, icon);
_elm_menu_item_add_helper(obj, (Elm_Menu_Item *) parent, subitem, wd);
@@ -806,7 +806,7 @@
}
EAPI void
-elm_menu_item_object_icon_name_set(Elm_Object_Item *it, const char *icon)
+elm_menu_item_icon_name_set(Elm_Object_Item *it, const char *icon)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
EINA_SAFETY_ON_NULL_RETURN(icon);
@@ -897,7 +897,7 @@
}
EAPI const char *
-elm_menu_item_object_icon_name_get(const Elm_Object_Item *it)
+elm_menu_item_icon_name_get(const Elm_Object_Item *it)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
return ((Elm_Menu_Item *) it)->icon_str;
Index: elm_menu.h
===================================================================
--- elm_menu.h (revision 68557)
+++ elm_menu.h (working copy)
@@ -135,7 +135,7 @@
*
* Once this icon is set, any previously set icon will be deleted.
*/
-EAPI void
elm_menu_item_object_icon_name_set(Elm_Object_Item *it, const char *icon);
+EAPI void elm_menu_item_icon_name_set(Elm_Object_Item
*it, const char *icon);
/**
* @brief Get the string representation from the icon of a menu item
@@ -143,9 +143,9 @@
* @param it The menu item object.
* @return The string representation of @p item's icon or NULL
*
- * @see elm_menu_item_object_icon_name_set()
+ * @see elm_menu_item_icon_name_set()
*/
-EAPI const char *elm_menu_item_object_icon_name_get(const
Elm_Object_Item *it);
+EAPI const char *elm_menu_item_icon_name_get(const
Elm_Object_Item *it);
/**
* @brief Set the selected state of @p item.
Index: src/lib/elm_slideshow.c
===================================================================
--- src/lib/elm_slideshow.c (revision 68557)
+++ src/lib/elm_slideshow.c (working copy)
@@ -365,11 +365,11 @@
{
l2 = eina_list_prev(l);
if (l2)
- elm_slideshow_show(eina_list_data_get(l2));
+ elm_slideshow_item_show(eina_list_data_get(l2));
}
else
- elm_slideshow_show(eina_list_data_get(l2));
+ elm_slideshow_item_show(eina_list_data_get(l2));
}
wd->items = eina_list_remove_list(wd->items, item->l);
@@ -449,7 +449,7 @@
wd->items = eina_list_merge(wd->items, item->l);
- if (!wd->current) elm_slideshow_show((Elm_Object_Item *) item);
+ if (!wd->current) elm_slideshow_item_show((Elm_Object_Item *) item);
return (Elm_Object_Item *) item;
}
@@ -471,13 +471,13 @@
wd->items = eina_list_sorted_merge(wd->items, item->l, func);
- if (!wd->current) elm_slideshow_show((Elm_Object_Item *) item);
+ if (!wd->current) elm_slideshow_item_show((Elm_Object_Item *) item);
return (Elm_Object_Item *) item;
}
EAPI void
-elm_slideshow_show(Elm_Object_Item *it)
+elm_slideshow_item_show(Elm_Object_Item *it)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Index: src/lib/elm_slideshow.h
===================================================================
--- src/lib/elm_slideshow.h (revision 68557)
+++ src/lib/elm_slideshow.h (working copy)
@@ -153,7 +153,7 @@
*
* @ingroup Slideshow
*/
-EAPI void elm_slideshow_show(Elm_Object_Item *it);
+EAPI void elm_slideshow_item_show(Elm_Object_Item *it);
/**
* Slide to the @b next item, in a given slideshow widget
Index: src/examples/slideshow_example.c
===================================================================
--- src/examples/slideshow_example.c (revision 68557)
+++ src/examples/slideshow_example.c (working copy)
@@ -69,7 +69,7 @@
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- elm_slideshow_show(data);
+ elm_slideshow_item_show(data);
}
static void
@@ -77,7 +77,7 @@
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- elm_slideshow_show(data);
+ elm_slideshow_item_show(data);
}
static void
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
