discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=6dd98df0d6ea1fbaadee56b20119eaa9ea8e28bb
commit 6dd98df0d6ea1fbaadee56b20119eaa9ea8e28bb
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Thu Mar 13 11:55:29 2014 -0400
remove all remaining efl version check defines
---
src/bin/e_config_data.c | 4 ----
src/bin/e_dnd.c | 2 --
src/bin/e_fm.c | 2 --
src/bin/e_int_menus.c | 4 ----
src/bin/e_start_main.c | 2 --
src/bin/e_startup.c | 4 ----
src/bin/e_thumb_main.c | 4 ----
src/bin/e_widget_filepreview.c | 4 ----
src/modules/access/e_mod_config.c | 4 ----
src/modules/access/e_mod_main.c | 12 ------------
src/modules/conf_display/e_int_config_desk.c | 12 ------------
src/modules/conf_display/e_int_config_desks.c | 13 +------------
src/modules/teamwork/e_mod_tw.c | 4 ----
src/modules/wizard/e_wizard.c | 6 ------
14 files changed, 1 insertion(+), 76 deletions(-)
diff --git a/src/bin/e_config_data.c b/src/bin/e_config_data.c
index 6b11172..66783fc 100644
--- a/src/bin/e_config_data.c
+++ b/src/bin/e_config_data.c
@@ -5,11 +5,7 @@ static Eina_Hash *config_hash = NULL;
EAPI void
e_config_descriptor_free(E_Config_DD *edd)
{
-#if (EET_VERSION_MAJOR > 1) || (EET_VERSION_MINOR >= 8)
eina_hash_del_by_key(config_hash,
eet_data_descriptor_name_get((Eet_Data_Descriptor*)edd));
-#else
- eina_hash_del_by_data(config_hash, edd);
-#endif
eet_data_descriptor_free((Eet_Data_Descriptor*)edd);
}
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 1b8ec3a..d7efb76 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -1421,7 +1421,6 @@ _e_dnd_cb_event_dnd_selection(void *data __UNUSED__, int
type __UNUSED__, void *
}
else if (_type_text_x_moz_url == _xdnd->type)
{
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
Ecore_X_Selection_Data_X_Moz_Url *sel;
E_Dnd_X_Moz_Url moz;
@@ -1430,7 +1429,6 @@ _e_dnd_cb_event_dnd_selection(void *data __UNUSED__, int
type __UNUSED__, void *
moz.link_names = sel->link_names;
_xdnd->data = &moz;
_e_drag_xdnd_end(ev->win, _xdnd->x, _xdnd->y);
-#endif
}
else
_e_drag_xdnd_end(ev->win, _xdnd->x, _xdnd->y);
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 3657165..5f454a2 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -6686,7 +6686,6 @@ _e_fm2_cb_dnd_selection_notify(void *data, const char
*type, void *event)
E_Fm2_Device_Mount_Op *mop = NULL;
if (!_e_fm2_dnd_type_implemented(type)) return;
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
if (type == _e_fm2_mime_xmozurl)
{
const char **name, *s;
@@ -6750,7 +6749,6 @@ _e_fm2_cb_dnd_selection_notify(void *data, const char
*type, void *event)
}
return;
}
-#endif
fsel = e_fm2_uri_path_list_get(ev->data);
fp = eina_list_data_get(fsel);
if (fp && sd->realpath && ((sd->drop_all) || (!sd->drop_icon)))
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 375f2e4..d6463b8 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -1496,11 +1496,7 @@ _e_int_menus_clients_title_abbrv(const char *title)
/* Advance to the end of the first half of the string. */
len = 0;
for (len2 = (max_len / 2); len2; len2--)
-#if (EINA_VERSION_MAJOR > 1) || (EINA_VERSION_MINOR >= 8)
if (!eina_unicode_utf8_next_get(title, &len)) break;
-#else
- eina_unicode_utf8_get_next(title, &len);
-#endif
strncat(abbvptr, title, len);
abbvptr += len;
diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c
index f4f5578..53a4b02 100644
--- a/src/bin/e_start_main.c
+++ b/src/bin/e_start_main.c
@@ -22,9 +22,7 @@
#include <Eina.h>
#include <Evas.h>
-#if (EVAS_VERSION_MAJOR > 1) || (EVAS_VERSION_MINOR >= 8)
# define E_CSERVE
-#endif
static Eina_Bool stop_ptrace = EINA_FALSE;
diff --git a/src/bin/e_startup.c b/src/bin/e_startup.c
index be3c331..d03cc61 100644
--- a/src/bin/e_startup.c
+++ b/src/bin/e_startup.c
@@ -78,16 +78,12 @@ static Eina_Bool
_e_startup_event_cb(void *data, int ev_type __UNUSED__, void *ev)
{
char *buf;
-#if (EFREET_VERSION_MAJOR > 1) || (EFREET_VERSION_MINOR >= 8)
Efreet_Event_Cache_Update *e;
e = ev;
/* TODO: Tell user he should fix his dbus setup */
if ((e) && (e->error))
fprintf(stderr, "E: efreet couldn't build cache\n");
-#else
- (void)ev;
-#endif
ecore_event_handler_del(desktop_cache_update_handler);
buf = data;
startup_apps = e_order_new(buf);
diff --git a/src/bin/e_thumb_main.c b/src/bin/e_thumb_main.c
index 64cc2d1..939ace2 100644
--- a/src/bin/e_thumb_main.c
+++ b/src/bin/e_thumb_main.c
@@ -394,9 +394,7 @@ _e_thumb_generate(E_Thumb *eth)
im = evas_object_text_add(evas);
evas_object_text_font_set(im, eth->file, hh / 4);
evas_object_color_set(im, 192, 192, 192, 255);
-#if ((EVAS_VERSION_MAJOR >= 1) && (EVAS_VERSION_MINOR >= 8))
evas_object_text_ellipsis_set(im, 0.0);
-#endif
evas_object_text_text_set(im, "ABCabc");
evas_object_geometry_get(im, NULL, NULL, &tw, &th);
if (tw > ww) tw = ww;
@@ -409,9 +407,7 @@ _e_thumb_generate(E_Thumb *eth)
im2 = evas_object_text_add(evas);
evas_object_text_font_set(im2, eth->file, hh / 4);
evas_object_color_set(im2, 255, 255, 255, 255);
-#if ((EVAS_VERSION_MAJOR >= 1) && (EVAS_VERSION_MINOR >= 8))
evas_object_text_ellipsis_set(im2, 0.0);
-#endif
evas_object_text_text_set(im2, "123!@?");
evas_object_geometry_get(im2, NULL, NULL, &tw, &th);
if (tw > ww) tw = ww;
diff --git a/src/bin/e_widget_filepreview.c b/src/bin/e_widget_filepreview.c
index 42f8294..6996741 100644
--- a/src/bin/e_widget_filepreview.c
+++ b/src/bin/e_widget_filepreview.c
@@ -330,11 +330,7 @@ _e_wid_fprev_preview_video_widgets(E_Widget_Data *wd)
wd->o_preview_preview = e_widget_preview_add(evas, 4, 4);
em = o =
emotion_object_add(e_widget_preview_evas_get(wd->o_preview_preview));
-#if (EMOTION_VERSION_MAJOR > 1) || (EMOTION_VERSION_MINOR >= 8)
emotion_object_init(o, "vlc");
-#else
- emotion_object_init(o, NULL);
-#endif
emotion_object_file_set(o, wd->path);
emotion_object_play_set(o, EINA_TRUE);
evas_object_size_hint_aspect_set(o, EVAS_ASPECT_CONTROL_BOTH, wd->w, wd->h);
diff --git a/src/modules/access/e_mod_config.c
b/src/modules/access/e_mod_config.c
index b57a0fa..21a1371 100644
--- a/src/modules/access/e_mod_config.c
+++ b/src/modules/access/e_mod_config.c
@@ -1,5 +1,3 @@
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
-
#include "e.h"
#include "e_mod_main.h"
@@ -77,5 +75,3 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__,
E_Config_Dialog_Data *cfdata __UNU
e_config_save_queue();
return 1;
}
-
-#endif
diff --git a/src/modules/access/e_mod_main.c b/src/modules/access/e_mod_main.c
index 3ea6a1b..5189fe4 100644
--- a/src/modules/access/e_mod_main.c
+++ b/src/modules/access/e_mod_main.c
@@ -1,5 +1,3 @@
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
-
#include "e.h"
#include "e_mod_main.h"
#define HISTORY_MAX 8
@@ -479,19 +477,11 @@ _mouse_wheel(Cover *cov __UNUSED__,
Ecore_Event_Mouse_Wheel *ev __UNUSED__)
{
if (ev->z == -1) // up
{
-#if ECORE_VERSION_MAJOR >= 1
-# if ECORE_VERSION_MINOR >= 8
ecore_x_e_illume_access_action_up_send(target_win);
-# endif
-#endif
}
else if (ev->z == 1) // down
{
-#if ECORE_VERSION_MAJOR >= 1
-# if ECORE_VERSION_MINOR >= 8
ecore_x_e_illume_access_action_down_send(target_win);
-# endif
-#endif
}
}
@@ -1045,5 +1035,3 @@ e_modapi_save(E_Module *m __UNUSED__)
e_config_domain_save("module.access", conf_edd, access_config);
return 1;
}
-
-#endif
diff --git a/src/modules/conf_display/e_int_config_desk.c
b/src/modules/conf_display/e_int_config_desk.c
index 18e8cf3..2a2da36 100644
--- a/src/modules/conf_display/e_int_config_desk.c
+++ b/src/modules/conf_display/e_int_config_desk.c
@@ -15,9 +15,7 @@ struct _E_Config_Dialog_Data
int desk_y;
Eina_Stringshare *bg;
char *name;
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
char *profile;
-#endif
Evas_Object *preview;
Ecore_Event_Handler *hdl;
};
@@ -62,9 +60,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
Eina_List *l;
char name[40];
int ok = 0;
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
E_Config_Desktop_Window_Profile *prof;
-#endif
cfdata->bg = e_bg_file_get(cfdata->man_num, cfdata->zone_num,
cfdata->desk_x, cfdata->desk_y);
for (l = e_config->desktop_names; l; l = l->next)
@@ -125,9 +121,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__,
E_Config_Dialog_Data *cfdata)
ecore_event_handler_del(cfdata->hdl);
eina_stringshare_del(cfdata->bg);
E_FREE(cfdata->name);
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
E_FREE(cfdata->profile);
-#endif
E_FREE(cfdata);
}
@@ -144,23 +138,19 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__,
E_Config_Dialog_Data *cfdata)
cfdata->name = strdup(name);
}
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
if (!cfdata->profile[0])
cfdata->profile = strdup(e_config->desktop_default_window_profile);
-#endif
e_desk_name_del(cfdata->man_num, cfdata->zone_num,
cfdata->desk_x, cfdata->desk_y);
e_desk_name_add(cfdata->man_num, cfdata->zone_num,
cfdata->desk_x, cfdata->desk_y, cfdata->name);
e_desk_name_update();
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
e_desk_window_profile_del(cfdata->man_num, cfdata->zone_num,
cfdata->desk_x, cfdata->desk_y);
e_desk_window_profile_add(cfdata->man_num, cfdata->zone_num,
cfdata->desk_x, cfdata->desk_y, cfdata->profile);
e_desk_window_profile_update();
-#endif
e_bg_del(cfdata->man_num, cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
e_bg_add(cfdata->man_num, cfdata->zone_num,
cfdata->desk_x, cfdata->desk_y, cfdata->bg);
@@ -186,7 +176,6 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
ob = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL);
e_widget_list_object_append(ol, ob, 1, 1, 0.5);
e_widget_list_object_append(o, ol, 1, 1, 0.5);
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
of = e_widget_frametable_add(evas, _("Desktop Window Profile"), 0);
ob = e_widget_label_add(evas, _("Profile name"));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 0, 0);
@@ -194,7 +183,6 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
e_widget_disabled_set(ob, !(e_config->use_desktop_window_profile));
e_widget_frametable_object_append(of, ob, 1, 0, 2, 1, 1, 1, 1, 0);
e_widget_list_object_append(o, of, 1, 1, 0.5);
-#endif
of = e_widget_frametable_add(evas, _("Wallpaper"), 0);
ob = e_widget_preview_add(evas, 240, (240 * zone->h) / zone->w);
cfdata->preview = ob;
diff --git a/src/modules/conf_display/e_int_config_desks.c
b/src/modules/conf_display/e_int_config_desks.c
index af6c5c2..6a78957 100644
--- a/src/modules/conf_display/e_int_config_desks.c
+++ b/src/modules/conf_display/e_int_config_desks.c
@@ -16,9 +16,7 @@ struct _E_Config_Dialog_Data
int y;
int edge_flip_dragging;
int flip_wrap;
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
int use_desktop_window_profile;
-#endif
int flip_mode;
int flip_interp;
@@ -65,9 +63,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->y = e_config->zone_desks_y_count;
cfdata->edge_flip_dragging = e_config->edge_flip_dragging;
cfdata->flip_wrap = e_config->desk_flip_wrap;
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
cfdata->use_desktop_window_profile = e_config->use_desktop_window_profile;
-#endif
cfdata->flip_interp = e_config->desk_flip_animate_interpolation;
cfdata->flip_mode = 0;
@@ -138,13 +134,11 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__,
E_Config_Dialog_Data *cfdata)
e_config->edge_flip_dragging = cfdata->edge_flip_dragging;
e_config->desk_flip_wrap = cfdata->flip_wrap;
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
if (e_config->use_desktop_window_profile !=
cfdata->use_desktop_window_profile)
{
e_config->use_desktop_window_profile =
cfdata->use_desktop_window_profile;
e_desk_window_profile_update();
}
-#endif
e_config_save_queue();
return 1; /* Apply was OK */
}
@@ -169,11 +163,8 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__,
E_Config_Dialog_Data *cfda
return ((e_util_strcasecmp(eina_list_nth(cfdata->comp_effects,
cfdata->flip_mode), e_config->desk_flip_animate_type)) ||
(e_config->desk_flip_animate_interpolation != cfdata->flip_interp) ||
(e_config->edge_flip_dragging != cfdata->edge_flip_dragging) ||
- (e_config->desk_flip_wrap != cfdata->flip_wrap)
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
- ||
+ (e_config->desk_flip_wrap != cfdata->flip_wrap) ||
(e_config->use_desktop_window_profile !=
cfdata->use_desktop_window_profile)
-#endif
);
}
@@ -223,7 +214,6 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas
*evas, E_Config_Dial
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 0, 0.5);
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
of = e_widget_framelist_add(evas, _("Desktop Window Profile"), 0);
ob = e_widget_check_add(evas, _("Use desktop window profile"),
@@ -231,7 +221,6 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas
*evas, E_Config_Dial
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 0, 0.5);
-#endif
e_widget_toolbook_page_append(otb, NULL, _("Desktops"), o, 1, 1, 1, 1,
0.5, 0.0);
diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c
index c1e718f..a06b81e 100644
--- a/src/modules/teamwork/e_mod_tw.c
+++ b/src/modules/teamwork/e_mod_tw.c
@@ -904,11 +904,7 @@ tw_show_video(Evas_Object *prev, const char *uri)
Evas_Object *o;
o = emotion_object_add(e_livethumb_evas_get(prev));
-#if (EMOTION_VERSION_MAJOR > 1) || (EMOTION_VERSION_MINOR >= 8)
emotion_object_init(o, "vlc");
-#else
- emotion_object_init(o, NULL);
-#endif
emotion_object_file_set(o, uri);
emotion_object_play_set(o, EINA_TRUE);
evas_object_smart_callback_add(o, "frame_decode", tw_video_opened_cb, prev);
diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index 05bc452..ed309f8 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -225,9 +225,7 @@ e_wizard_dir_get(void)
EAPI void
e_wizard_xdg_desktops_reset(void)
{
-#if (EFREET_VERSION_MAJOR > 1) || (EFREET_VERSION_MINOR >= 8)
if (xdg_error) return;
-#endif
got_desktops = EINA_FALSE;
}
@@ -396,16 +394,12 @@ _e_wizard_cb_next_page(void *data __UNUSED__)
static Eina_Bool
_e_wizard_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__,
void *ev)
{
-#if (EFREET_VERSION_MAJOR > 1) || (EFREET_VERSION_MINOR >= 8)
Efreet_Event_Cache_Update *e;
e = ev;
/* TODO: Tell user he should fix his dbus setup */
if ((e) && (e->error))
xdg_error = EINA_TRUE;
-#else
- (void)ev;
-#endif
got_desktops = EINA_TRUE;
if (_e_wizard_check_xdg())
_e_wizard_next_xdg();
--
