e_desk: change E_API to EINTERN

Change-Id: I0bc0d62955b8671b6a92b5a5e5639b2153cede7b

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 160dffb..83b220e 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -80,12 +80,12 @@ EVAS_SMART_SUBCLASS_NEW(E_DESK_SMART_OBJ_TYPE, _e_desk,
 static E_Desk_Flip_Cb _e_desk_flip_cb = NULL;
 static void *_e_desk_flip_data = NULL;
 
-E_API int E_EVENT_DESK_SHOW = 0;
-E_API int E_EVENT_DESK_BEFORE_SHOW = 0;
-E_API int E_EVENT_DESK_AFTER_SHOW = 0;
-E_API int E_EVENT_DESK_DESKSHOW = 0;
-E_API int E_EVENT_DESK_NAME_CHANGE = 0;
-E_API int E_EVENT_DESK_WINDOW_PROFILE_CHANGE = 0;
+EINTERN int E_EVENT_DESK_SHOW = 0;
+EINTERN int E_EVENT_DESK_BEFORE_SHOW = 0;
+EINTERN int E_EVENT_DESK_AFTER_SHOW = 0;
+EINTERN int E_EVENT_DESK_DESKSHOW = 0;
+EINTERN int E_EVENT_DESK_NAME_CHANGE = 0;
+EINTERN int E_EVENT_DESK_WINDOW_PROFILE_CHANGE = 0;
 E_API int E_EVENT_DESK_GEOMETRY_CHANGE = 0;
 E_API int E_EVENT_DESK_ZOOM_SET = 0;
 E_API int E_EVENT_DESK_ZOOM_UNSET = 0;
@@ -136,7 +136,7 @@ e_desk_shutdown(void)
    return 1;
 }
 
-E_API E_Desk *
+EINTERN E_Desk *
 e_desk_new(E_Zone *zone, int x, int y)
 {
    E_Desk *desk;
@@ -211,7 +211,7 @@ e_desk_new(E_Zone *zone, int x, int y)
    return desk;
 }
 
-E_API E_Client *
+EINTERN E_Client *
 e_desk_client_top_visible_get(const E_Desk *desk)
 {
    E_Client *ec;
@@ -224,7 +224,7 @@ e_desk_client_top_visible_get(const E_Desk *desk)
    return NULL;
 }
 
-E_API void
+EINTERN void
 e_desk_name_set(E_Desk *desk, const char *name)
 {
    E_OBJECT_CHECK(desk);
@@ -235,7 +235,7 @@ e_desk_name_set(E_Desk *desk, const char *name)
    _e_desk_event_simple_add(desk, E_EVENT_DESK_NAME_CHANGE);
 }
 
-E_API void
+EINTERN void
 e_desk_name_add(int zone, int desk_x, int desk_y, const char *name)
 {
    E_Config_Desktop_Name *cfname;
@@ -252,7 +252,7 @@ e_desk_name_add(int zone, int desk_x, int desk_y, const char *name)
    e_config->desktop_names = eina_list_append(e_config->desktop_names, cfname);
 }
 
-E_API void
+EINTERN void
 e_desk_name_del(int zone, int desk_x, int desk_y)
 {
    Eina_List *l = NULL;
@@ -272,7 +272,7 @@ e_desk_name_del(int zone, int desk_x, int desk_y)
      }
 }
 
-E_API void
+EINTERN void
 e_desk_name_update(void)
 {
    const Eina_List *z, *l;
@@ -314,7 +314,7 @@ e_desk_name_update(void)
      }
 }
 
-E_API void
+EINTERN void
 e_desk_show(E_Desk *desk)
 {
    E_Event_Desk_Show *ev = NULL;
@@ -416,7 +416,7 @@ error:
      }
 }
 
-E_API void
+EINTERN void
 e_desk_deskshow(E_Zone *zone)
 {
    E_Client *ec;
@@ -465,7 +465,7 @@ e_desk_deskshow(E_Zone *zone)
    _e_desk_event_simple_add(desk, E_EVENT_DESK_DESKSHOW);
 }
 
-E_API E_Client *
+EINTERN E_Client *
 e_desk_last_focused_focus(E_Desk *desk)
 {
    Eina_List *l = NULL;
@@ -524,25 +524,25 @@ e_desk_last_focused_focus(E_Desk *desk)
    return NULL;
 }
 
-E_API void
+EINTERN void
 e_desk_row_add(E_Zone *zone)
 {
    e_zone_desk_count_set(zone, zone->desk_x_count, zone->desk_y_count + 1);
 }
 
-E_API void
+EINTERN void
 e_desk_row_remove(E_Zone *zone)
 {
    e_zone_desk_count_set(zone, zone->desk_x_count, zone->desk_y_count - 1);
 }
 
-E_API void
+EINTERN void
 e_desk_col_add(E_Zone *zone)
 {
    e_zone_desk_count_set(zone, zone->desk_x_count + 1, zone->desk_y_count);
 }
 
-E_API void
+EINTERN void
 e_desk_col_remove(E_Zone *zone)
 {
    e_zone_desk_count_set(zone, zone->desk_x_count - 1, zone->desk_y_count);
@@ -557,7 +557,7 @@ e_desk_current_get(E_Zone *zone)
    return e_desk_at_xy_get(zone, zone->desk_x_current, zone->desk_y_current);
 }
 
-E_API E_Desk *
+EINTERN E_Desk *
 e_desk_at_xy_get(E_Zone *zone, int x, int y)
 {
    E_OBJECT_CHECK_RETURN(zone, NULL);
@@ -572,7 +572,7 @@ e_desk_at_xy_get(E_Zone *zone, int x, int y)
    return zone->desks[x + (y * zone->desk_x_count)];
 }
 
-E_API E_Desk *
+EINTERN E_Desk *
 e_desk_at_pos_get(E_Zone *zone, int pos)
 {
    int x, y;
@@ -589,7 +589,7 @@ e_desk_at_pos_get(E_Zone *zone, int pos)
    return zone->desks[x + (y * zone->desk_x_count)];
 }
 
-E_API void
+EINTERN void
 e_desk_xy_get(E_Desk *desk, int *x, int *y)
 {
    E_OBJECT_CHECK(desk);
@@ -599,7 +599,7 @@ e_desk_xy_get(E_Desk *desk, int *x, int *y)
    if (y) *y = desk->y;
 }
 
-E_API void
+EINTERN void
 e_desk_next(E_Zone *zone)
 {
    int x, y;
@@ -624,7 +624,7 @@ e_desk_next(E_Zone *zone)
    e_desk_show(e_desk_at_xy_get(zone, x, y));
 }
 
-E_API void
+EINTERN void
 e_desk_prev(E_Zone *zone)
 {
    int x, y;
@@ -648,7 +648,7 @@ e_desk_prev(E_Zone *zone)
    e_desk_show(e_desk_at_xy_get(zone, x, y));
 }
 
-E_API void
+EINTERN void
 e_desk_window_profile_set(E_Desk *desk,
                           const char *profile)
 {
@@ -660,7 +660,7 @@ e_desk_window_profile_set(E_Desk *desk,
    _e_desk_event_simple_add(desk, E_EVENT_DESK_WINDOW_PROFILE_CHANGE);
 }
 
-E_API void
+EINTERN void
 e_desk_window_profile_add(int zone,
                           int desk_x,
                           int desk_y,
@@ -679,7 +679,7 @@ e_desk_window_profile_add(int zone,
    e_config->desktop_window_profiles = eina_list_append(e_config->desktop_window_profiles, cfprof);
 }
 
-E_API void
+EINTERN void
 e_desk_window_profile_del(int zone,
                           int desk_x,
                           int desk_y)
@@ -702,7 +702,7 @@ e_desk_window_profile_del(int zone,
      }
 }
 
-E_API void
+EINTERN void
 e_desk_window_profile_update(void)
 {
    const Eina_List *z, *l;
@@ -744,14 +744,14 @@ e_desk_window_profile_update(void)
      }
 }
 
-E_API void
+EINTERN void
 e_desk_flip_cb_set(E_Desk_Flip_Cb cb, const void *data)
 {
    _e_desk_flip_cb = cb;
    _e_desk_flip_data = (void*)data;
 }
 
-E_API void
+EINTERN void
 e_desk_flip_end(E_Desk *desk)
 {
    E_Client *ec;
@@ -794,7 +794,7 @@ e_desk_flip_end(E_Desk *desk)
      }
 }
 
-E_API unsigned int
+EINTERN unsigned int
 e_desks_count(void)
 {
    Eina_List *l;
@@ -811,7 +811,7 @@ e_desks_count(void)
    return count;
 }
 
-E_API void
+EINTERN void
 e_desk_client_add(E_Desk *desk, E_Client *ec)
 {
    if (!e_config->use_desk_smart_obj)
@@ -1125,7 +1125,7 @@ e_desk_zoom_get(E_Desk *desk, double *zoomx, double *zoomy, int *cx, int *cy)
    return res;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_desk_zoom_get_center_coordinate(E_Desk *desk, double zoomx, double zoomy, int rectx, int recty, int *cx, int *cy)
 {
    E_Zone *zone = NULL;
@@ -1940,7 +1940,7 @@ e_desk_desk_area_del(E_Desk *desk, E_Desk_Area *eda)
    desk->desk_area.list[list_id] = eina_list_remove(desk->desk_area.list[list_id], eda);
 }
 
-E_API E_Desk_Area *
+EINTERN E_Desk_Area *
 e_desk_desk_area_get_by_id(E_Desk *desk, int id)
 {
    E_Desk_Area *eda = NULL;
@@ -1979,7 +1979,7 @@ _e_desk_desk_area_base_new(E_Desk *desk)
      return EINA_TRUE;
 }
 
-E_API E_Desk_Area *
+EINTERN E_Desk_Area *
 e_desk_desk_area_base_get(E_Desk *desk)
 {
    E_OBJECT_CHECK_RETURN(desk, NULL);
@@ -2004,7 +2004,7 @@ e_desk_desk_area_active_set(E_Desk *desk, E_Desk_Area *eda)
    _e_desk_hook_call(E_DESK_HOOK_DESK_AREA_ACTIVE_CHANGE, desk);
 }
 
-E_API E_Desk_Area *
+EINTERN E_Desk_Area *
 e_desk_desk_area_active_get(E_Desk *desk)
 {
    E_OBJECT_CHECK_RETURN(desk, NULL);

diff --git a/src/bin/e_desk.h b/src/bin/e_desk.h
index 5dcf147..16dc691 100644 (file)
--- a/src/bin/e_desk.h
+++ b/src/bin/e_desk.h
@@ -109,44 +109,44 @@ struct _E_Event_Desk_Geometry_Change
 
 EINTERN int          e_desk_init(void);
 EINTERN int          e_desk_shutdown(void);
-E_API E_Desk      *e_desk_new(E_Zone *zone, int x, int y);
-E_API void         e_desk_name_set(E_Desk *desk, const char *name);
-E_API void         e_desk_name_add(int zone, int desk_x, int desk_y, const char *name);
-E_API void         e_desk_name_del(int zone, int desk_x, int desk_y);
-E_API void         e_desk_name_update(void);
-E_API void         e_desk_show(E_Desk *desk);
-E_API void         e_desk_deskshow(E_Zone *zone);
-E_API E_Client    *e_desk_last_focused_focus(E_Desk *desk);
-E_API E_Client    *e_desk_client_top_visible_get(const E_Desk *desk);
+EINTERN E_Desk      *e_desk_new(E_Zone *zone, int x, int y);
+EINTERN void         e_desk_name_set(E_Desk *desk, const char *name);
+EINTERN void         e_desk_name_add(int zone, int desk_x, int desk_y, const char *name);
+EINTERN void         e_desk_name_del(int zone, int desk_x, int desk_y);
+EINTERN void         e_desk_name_update(void);
+EINTERN void         e_desk_show(E_Desk *desk);
+EINTERN void         e_desk_deskshow(E_Zone *zone);
+EINTERN E_Client    *e_desk_last_focused_focus(E_Desk *desk);
+EINTERN E_Client    *e_desk_client_top_visible_get(const E_Desk *desk);
 E_API E_Desk      *e_desk_current_get(E_Zone *zone);
-E_API E_Desk      *e_desk_at_xy_get(E_Zone *zone, int x, int y);
-E_API E_Desk      *e_desk_at_pos_get(E_Zone *zone, int pos);
-E_API void         e_desk_xy_get(E_Desk *desk, int *x, int *y);
-E_API void         e_desk_next(E_Zone *zone);
-E_API void         e_desk_prev(E_Zone *zone);
-E_API void         e_desk_row_add(E_Zone *zone);
-E_API void         e_desk_row_remove(E_Zone *zone);
-E_API void         e_desk_col_add(E_Zone *zone);
-E_API void         e_desk_col_remove(E_Zone *zone);
-E_API void         e_desk_window_profile_set(E_Desk *desk, const char *profile);
-E_API void         e_desk_window_profile_add(int zone, int desk_x, int desk_y, const char *profile);
-E_API void         e_desk_window_profile_del(int zone, int desk_x, int desk_y);
-E_API void         e_desk_window_profile_update(void);
-
-E_API void         e_desk_flip_cb_set(E_Desk_Flip_Cb cb, const void *data);
-E_API void         e_desk_flip_end(E_Desk *desk);
-
-E_API unsigned int e_desks_count(void);
+EINTERN E_Desk      *e_desk_at_xy_get(E_Zone *zone, int x, int y);
+EINTERN E_Desk      *e_desk_at_pos_get(E_Zone *zone, int pos);
+EINTERN void         e_desk_xy_get(E_Desk *desk, int *x, int *y);
+EINTERN void         e_desk_next(E_Zone *zone);
+EINTERN void         e_desk_prev(E_Zone *zone);
+EINTERN void         e_desk_row_add(E_Zone *zone);
+EINTERN void         e_desk_row_remove(E_Zone *zone);
+EINTERN void         e_desk_col_add(E_Zone *zone);
+EINTERN void         e_desk_col_remove(E_Zone *zone);
+EINTERN void         e_desk_window_profile_set(E_Desk *desk, const char *profile);
+EINTERN void         e_desk_window_profile_add(int zone, int desk_x, int desk_y, const char *profile);
+EINTERN void         e_desk_window_profile_del(int zone, int desk_x, int desk_y);
+EINTERN void         e_desk_window_profile_update(void);
+
+EINTERN void         e_desk_flip_cb_set(E_Desk_Flip_Cb cb, const void *data);
+EINTERN void         e_desk_flip_end(E_Desk *desk);
+
+EINTERN unsigned int e_desks_count(void);
 
 E_API void         e_desk_geometry_set(E_Desk *desk, int x, int y, int w, int h);
 E_API void         e_desk_zoom_set(E_Desk *desk, double zoomx, double zoomy, int cx, int cy);
 E_API Eina_Bool    e_desk_zoom_get(E_Desk *desk, double *zoomx, double *zoomy, int *cx, int *cy);
-E_API Eina_Bool    e_desk_zoom_get_center_coordinate(E_Desk *desk, double zoomx, double zoomy, int rectx, int recty, int *cx, int *cy);
+EINTERN Eina_Bool    e_desk_zoom_get_center_coordinate(E_Desk *desk, double zoomx, double zoomy, int rectx, int recty, int *cx, int *cy);
 E_API void         e_desk_zoom_unset(E_Desk *desk);
 
 E_API void         e_desk_smart_member_add(E_Desk *desk, Evas_Object *obj);
 E_API void         e_desk_smart_member_del(Evas_Object *obj);
-E_API void         e_desk_client_add(E_Desk *desk, E_Client *ec);
+EINTERN void         e_desk_client_add(E_Desk *desk, E_Client *ec);
 E_API void         e_desk_client_del(E_Desk *desk, E_Client *ec);
 
 E_API Eina_Bool    e_desk_client_zoom_skip_set(E_Desk *desk, E_Client *ec);
@@ -156,10 +156,10 @@ EINTERN void       e_desk_client_zoom_apply(E_Desk *desk, E_Client *ec);
 
 E_API E_Desk_Area *e_desk_desk_area_add(E_Desk *desk, int x, int y, int w, int h, E_Desk_Area_Layer layer);
 E_API void          e_desk_desk_area_del(E_Desk *desk, E_Desk_Area *eda);
-E_API E_Desk_Area *e_desk_desk_area_get_by_id(E_Desk *desk, int id);
-E_API E_Desk_Area *e_desk_desk_area_base_get(E_Desk *desk);
+EINTERN E_Desk_Area *e_desk_desk_area_get_by_id(E_Desk *desk, int id);
+EINTERN E_Desk_Area *e_desk_desk_area_base_get(E_Desk *desk);
 EINTERN void        e_desk_desk_area_active_set(E_Desk *desk, E_Desk_Area *eda);
-E_API E_Desk_Area *e_desk_desk_area_active_get(E_Desk *desk);
+EINTERN E_Desk_Area *e_desk_desk_area_active_get(E_Desk *desk);
 E_API Eina_Bool     e_desk_desk_area_enable(E_Desk *desk);
 E_API Eina_Bool     e_desk_desk_area_disable(E_Desk *desk);
 EINTERN void        e_desk_desk_area_raise(E_Desk *desk, E_Desk_Area *eda);
@@ -181,12 +181,12 @@ E_API Eina_List * e_desk_visible_client_iconified_list_get(E_Desk *desk);
 
 EINTERN Eina_Bool e_desk_splitscreen_regions_all_generate(E_Desk *desk, struct wl_client *client, struct wl_resource *ss_res, uint32_t id);
 
-extern E_API int E_EVENT_DESK_SHOW;
-extern E_API int E_EVENT_DESK_BEFORE_SHOW;
-extern E_API int E_EVENT_DESK_AFTER_SHOW;
-extern E_API int E_EVENT_DESK_DESKSHOW;
-extern E_API int E_EVENT_DESK_NAME_CHANGE;
-extern E_API int E_EVENT_DESK_WINDOW_PROFILE_CHANGE;
+extern EINTERN int E_EVENT_DESK_SHOW;
+extern EINTERN int E_EVENT_DESK_BEFORE_SHOW;
+extern EINTERN int E_EVENT_DESK_AFTER_SHOW;
+extern EINTERN int E_EVENT_DESK_DESKSHOW;
+extern EINTERN int E_EVENT_DESK_NAME_CHANGE;
+extern EINTERN int E_EVENT_DESK_WINDOW_PROFILE_CHANGE;
 extern E_API int E_EVENT_DESK_GEOMETRY_CHANGE;
 extern E_API int E_EVENT_DESK_ZOOM_SET;
 extern E_API int E_EVENT_DESK_ZOOM_UNSET;