From 9d2fb4b4b5edcecf1fa74debd2ac83576a6636ad Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Wed, 28 Mar 2012 08:42:24 +0000 Subject: [PATCH] elm examples: Adjust directory names. SVN revision: 69699 --- .../elementary/src/examples/bg_example_02.c | 7 +++++-- .../elementary/src/examples/bg_example_03.c | 9 +++++--- .../src/examples/general_funcs_example.c | 12 +++++------ .../elementary/src/examples/gengrid_example.c | 4 ++-- .../elementary/src/examples/icon_example_01.c | 2 +- .../src/examples/image_example_01.c | 4 ++-- .../src/examples/index_example_02.c | 4 ++-- .../src/examples/layout_example_01.c | 4 ++-- .../src/examples/layout_example_03.c | 4 ++-- .../elementary/src/examples/map_example_02.c | 21 +++++++++++-------- .../src/examples/photocam_example_01.c | 7 +++++-- .../src/examples/popup_example_01.c | 2 +- .../src/examples/popup_example_02.c | 4 ++-- .../src/examples/popup_example_03.c | 4 ++-- .../src/examples/progressbar_example.c | 7 +++++-- .../src/examples/slideshow_example.c | 20 +++++++++--------- .../src/examples/thumb_example_01.c | 4 ++-- .../src/examples/transit_example_03.c | 7 +++++-- .../src/examples/transit_example_04.c | 9 +++++--- legacy/elementary/src/examples/win_example.c | 4 ++-- 20 files changed, 80 insertions(+), 59 deletions(-) diff --git a/legacy/elementary/src/examples/bg_example_02.c b/legacy/elementary/src/examples/bg_example_02.c index 9ebc73ccee..ea5905ca3d 100644 --- a/legacy/elementary/src/examples/bg_example_02.c +++ b/legacy/elementary/src/examples/bg_example_02.c @@ -1,8 +1,11 @@ //Compile with: -//gcc -o bg_example_02 bg_example_02.c -g `pkg-config --cflags --libs elementary` -DPACKAGE_DATA_DIR="\"\"" +//gcc -o bg_example_02 bg_example_02.c -g `pkg-config --cflags --libs elementary` -DDATA_DIR="\"\"" //where directory is the a path where images/plant_01.jpg can be found. #include +#ifndef DATA_DIR +# define DATA_DIR "/usr/share/elementary" +#endif static void on_done(void *data, Evas_Object *obj, void *event_info) @@ -25,7 +28,7 @@ elm_main(int argc, char **argv) bg = elm_bg_add(win); elm_bg_load_size_set(bg, 20, 20); elm_bg_option_set(bg, ELM_BG_OPTION_CENTER); - snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", DATA_DIR); elm_bg_file_set(bg, buf, NULL); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bg); diff --git a/legacy/elementary/src/examples/bg_example_03.c b/legacy/elementary/src/examples/bg_example_03.c index fa70a03b14..3c56a6a3de 100644 --- a/legacy/elementary/src/examples/bg_example_03.c +++ b/legacy/elementary/src/examples/bg_example_03.c @@ -1,8 +1,11 @@ //Compile with: -//gcc -o bg_example_03 bg_example_03.c -g `pkg-config --cflags --libs elementary` -DPACKAGE_DATA_DIR="\"\"" +//gcc -o bg_example_03 bg_example_03.c -g `pkg-config --cflags --libs elementary` -DDATA_DIR="\"\"" //where directory is the a path where images/plant_01.jpg can be found. #include +#ifndef DATA_DIR +# define DATA_DIR "/usr/share/elementary" +#endif static void on_done(void *data, Evas_Object *obj, void *event_info) @@ -29,7 +32,7 @@ _cb_overlay_changed(void *data, Evas_Object *obj, void *event) Evas_Object *parent, *over; char buff[PATH_MAX]; - snprintf(buff, sizeof(buff), "%s/objects/test.edj", PACKAGE_DATA_DIR); + snprintf(buff, sizeof(buff), "%s/objects/test.edj", DATA_DIR); parent = elm_object_parent_widget_get(o_bg); over = edje_object_add(evas_object_evas_get(parent)); edje_object_file_set(over, buff, "bg_overlay"); @@ -80,7 +83,7 @@ elm_main(int argc, char **argv) evas_object_show(box); o_bg = elm_bg_add(win); - snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", DATA_DIR); elm_bg_file_set(o_bg, buf, NULL); evas_object_size_hint_weight_set(o_bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(o_bg, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/legacy/elementary/src/examples/general_funcs_example.c b/legacy/elementary/src/examples/general_funcs_example.c index 97388095b3..a90c4d97c0 100644 --- a/legacy/elementary/src/examples/general_funcs_example.c +++ b/legacy/elementary/src/examples/general_funcs_example.c @@ -4,9 +4,9 @@ #include -#define PACKAGE_BIN_DIR "/usr/bin" -#define PACKAGE_LIB_DIR "/usr/lib" -#define PACKAGE_DATA_DIR "/usr/share/elementary" +#define BIN_DIR "/usr/bin" +#define LIB_DIR "/usr/lib" +#define DATA_DIR "/usr/share/elementary" #define WIDTH 300 #define HEIGHT 300 @@ -71,9 +71,9 @@ elm_main(int argc, Evas_Object *win, *bg, *box, *frame, *check, *b, *slider; /* tell elm about our app so it can figure out where to get files */ - elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); - elm_app_compile_data_dir_set(PACKAGE_DATA_DIR); - elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR); + elm_app_compile_bin_dir_set(BIN_DIR); + elm_app_compile_data_dir_set(DATA_DIR); + elm_app_compile_lib_dir_set(LIB_DIR); elm_app_info_set(elm_main, "elementary", "images/logo.png"); fprintf(stdout, "prefix was set to: %s\n", elm_app_prefix_dir_get()); diff --git a/legacy/elementary/src/examples/gengrid_example.c b/legacy/elementary/src/examples/gengrid_example.c index 7315d4c898..fd8f3402d0 100644 --- a/legacy/elementary/src/examples/gengrid_example.c +++ b/legacy/elementary/src/examples/gengrid_example.c @@ -10,7 +10,7 @@ */ #include -#define PACKAGE_DATA_DIR "../../data" +#define DATA_DIR "../../data" typedef struct _Example_Item { @@ -325,7 +325,7 @@ _grid_content_get(void *data, Evas_Object *icon = elm_bg_add(obj); char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, + snprintf(buf, sizeof(buf), "%s/images/%s", DATA_DIR, it->path); elm_bg_file_set(icon, buf, NULL); diff --git a/legacy/elementary/src/examples/icon_example_01.c b/legacy/elementary/src/examples/icon_example_01.c index 13902f1725..5bdaa14c3e 100644 --- a/legacy/elementary/src/examples/icon_example_01.c +++ b/legacy/elementary/src/examples/icon_example_01.c @@ -2,7 +2,7 @@ //gcc -g `pkg-config --cflags --libs elementary` image_example_01.c -o image_example_01 #include -#define PACKAGE_DATA_DIR "." +#define DATA_DIR "." EAPI_MAIN int elm_main(int argc, char **argv) diff --git a/legacy/elementary/src/examples/image_example_01.c b/legacy/elementary/src/examples/image_example_01.c index a6a3cde96a..0b358d8d2c 100644 --- a/legacy/elementary/src/examples/image_example_01.c +++ b/legacy/elementary/src/examples/image_example_01.c @@ -2,7 +2,7 @@ //gcc -g `pkg-config --cflags --libs elementary` image_example_01.c -o image_example_01 #include -#define PACKAGE_DATA_DIR "." +#define DATA_DIR "." int elm_main(int argc, char **argv) @@ -21,7 +21,7 @@ elm_main(int argc, char **argv) elm_win_resize_object_add(win, bg); evas_object_show(bg); - snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", DATA_DIR); image = elm_image_add(win); if (!elm_image_file_set(image, buf, NULL)) diff --git a/legacy/elementary/src/examples/index_example_02.c b/legacy/elementary/src/examples/index_example_02.c index 1dec070365..f8dd365951 100644 --- a/legacy/elementary/src/examples/index_example_02.c +++ b/legacy/elementary/src/examples/index_example_02.c @@ -10,7 +10,7 @@ */ #include -#define PACKAGE_DATA_DIR "../../data" +#define DATA_DIR "../../data" static const char *items[] = \ { @@ -57,7 +57,7 @@ _grid_content_get(void *data, if (!strcmp(part, "elm.swallow.icon")) { char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, + snprintf(buf, sizeof(buf), "%s/images/%s", DATA_DIR, "sky_01.jpg"); Evas_Object *icon = elm_bg_add(obj); diff --git a/legacy/elementary/src/examples/layout_example_01.c b/legacy/elementary/src/examples/layout_example_01.c index 8165d56507..5ddb8b69a0 100644 --- a/legacy/elementary/src/examples/layout_example_01.c +++ b/legacy/elementary/src/examples/layout_example_01.c @@ -2,7 +2,7 @@ //gcc -g `pkg-config --cflags --libs elementary` layout_example_01.c -o layout_example_01 #include -#define PACKAGE_DATA_DIR "." +#define DATA_DIR "." #define TABLE "example/table" #define BOX "example/box" @@ -73,7 +73,7 @@ elm_main(int argc, char **argv) evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, layout); elm_layout_file_set( - layout, PACKAGE_DATA_DIR "/examples/layout_example.edj", + layout, DATA_DIR "/examples/layout_example.edj", "example/mylayout"); evas_object_show(layout); diff --git a/legacy/elementary/src/examples/layout_example_03.c b/legacy/elementary/src/examples/layout_example_03.c index 9bed3465b9..9b49e6e0b7 100644 --- a/legacy/elementary/src/examples/layout_example_03.c +++ b/legacy/elementary/src/examples/layout_example_03.c @@ -2,7 +2,7 @@ //gcc -g `pkg-config --cflags --libs elementary` layout_example_03.c -o layout_example_03 #include -#define PACKAGE_DATA_DIR "." +#define DATA_DIR "." #define TITLE "example/title" #define SWALLOW "example/custom" @@ -60,7 +60,7 @@ elm_main(int argc, char **argv) evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, layout); elm_layout_file_set( - layout, PACKAGE_DATA_DIR "/examples/layout_example.edj", + layout, DATA_DIR "/examples/layout_example.edj", "example/mylayout3"); evas_object_show(layout); diff --git a/legacy/elementary/src/examples/map_example_02.c b/legacy/elementary/src/examples/map_example_02.c index 808f7295a2..404b568107 100644 --- a/legacy/elementary/src/examples/map_example_02.c +++ b/legacy/elementary/src/examples/map_example_02.c @@ -10,6 +10,9 @@ */ #include +#ifndef DATA_DIR +# define DATA_DIR "/usr/share/elementary" +#endif typedef struct _Overlay_Data { @@ -18,15 +21,15 @@ typedef struct _Overlay_Data } Overlay_Data; Overlay_Data data_argentina = {"Argentina", - PACKAGE_DATA_DIR"/images/rock_01.jpg"}; + DATA_DIR"/images/rock_01.jpg"}; Overlay_Data data_chile = {"Chile", - PACKAGE_DATA_DIR"/images/rock_02.jpg"}; + DATA_DIR"/images/rock_02.jpg"}; Overlay_Data data_sampa = {"São Paulo", - PACKAGE_DATA_DIR"/images/sky_01.jpg"}; + DATA_DIR"/images/sky_01.jpg"}; Overlay_Data data_rio = {"Rio de Janeiro", - PACKAGE_DATA_DIR"/images/sky_02.jpg"}; + DATA_DIR"/images/sky_02.jpg"}; Overlay_Data data_brasilia = {"Brasília", - PACKAGE_DATA_DIR"/images/sky_03.jpg"}; + DATA_DIR"/images/sky_03.jpg"}; static Elm_Map_Overlay *bubble; @@ -42,25 +45,25 @@ _icon_get(Evas_Object *obj, const char *file) static Evas_Object * _city_icon_get(Evas_Object *obj) { - return _icon_get(obj, PACKAGE_DATA_DIR"/images/icon_07.png"); + return _icon_get(obj, DATA_DIR"/images/icon_07.png"); } static Evas_Object * _clas_city_icon_get(Evas_Object *obj) { - return _icon_get(obj, PACKAGE_DATA_DIR"/images/icon_05.png"); + return _icon_get(obj, DATA_DIR"/images/icon_05.png"); } static Evas_Object * _country_icon_get(Evas_Object *obj) { - return _icon_get(obj, PACKAGE_DATA_DIR"/images/icon_06.png"); + return _icon_get(obj, DATA_DIR"/images/icon_06.png"); } static Evas_Object * _clas_country_icon_get(Evas_Object *obj) { - return _icon_get(obj, PACKAGE_DATA_DIR"/images/icon_04.png"); + return _icon_get(obj, DATA_DIR"/images/icon_04.png"); } static Evas_Object * diff --git a/legacy/elementary/src/examples/photocam_example_01.c b/legacy/elementary/src/examples/photocam_example_01.c index e7ec401e83..1dfdf7c3af 100644 --- a/legacy/elementary/src/examples/photocam_example_01.c +++ b/legacy/elementary/src/examples/photocam_example_01.c @@ -1,8 +1,11 @@ //Compile with: -//gcc -o photocam_example_01 photocam_example_01.c -g `pkg-config --cflags --libs elementary` -DPACKAGE_DATA_DIR="\"\"" +//gcc -o photocam_example_01 photocam_example_01.c -g `pkg-config --cflags --libs elementary` -DDATA_DIR="\"\"" //where directory is the path where images/insanely_huge_test_image.jpg can be found. #include +#ifndef DATA_DIR +# define DATA_DIR "/usr/share/elementary" +#endif static void _fit(void *data, Evas_Object *obj, void *event_info); static void _unfit(void *data, Evas_Object *obj, void *event_info); @@ -25,7 +28,7 @@ elm_main(int argc, char **argv) evas_object_show(bg); photocam = elm_photocam_add(win); - elm_photocam_file_set(photocam, PACKAGE_DATA_DIR"/images/insanely_huge_test_image.jpg"); + elm_photocam_file_set(photocam, DATA_DIR"/images/insanely_huge_test_image.jpg"); elm_photocam_bounce_set(photocam, EINA_FALSE, EINA_TRUE); evas_object_smart_callback_add(photocam, "loaded,detail", _bring_in, NULL); evas_object_resize(photocam, 500, 400); diff --git a/legacy/elementary/src/examples/popup_example_01.c b/legacy/elementary/src/examples/popup_example_01.c index 141317e5ff..fa8d9643f0 100644 --- a/legacy/elementary/src/examples/popup_example_01.c +++ b/legacy/elementary/src/examples/popup_example_01.c @@ -2,7 +2,7 @@ //gcc -o popup_example_01 popup_example_01.c -g `pkg-config --cflags --libs elementary` #include -#define PACKAGE_DATA_DIR "../../data" +#define DATA_DIR "../../data" static void _block_clicked(void *data, Evas_Object *obj, void *event_info); static void _timeout(void *data, Evas_Object *obj, void *event_info); diff --git a/legacy/elementary/src/examples/popup_example_02.c b/legacy/elementary/src/examples/popup_example_02.c index 2a5e0306bc..0f839d3e24 100644 --- a/legacy/elementary/src/examples/popup_example_02.c +++ b/legacy/elementary/src/examples/popup_example_02.c @@ -2,7 +2,7 @@ //gcc -o popup_example_02 popup_example_02.c -g `pkg-config --cflags --libs elementary` #include -#define PACKAGE_DATA_DIR "../../data" +#define DATA_DIR "../../data" static void _response_cb(void *data, Evas_Object *obj, void *event_info); @@ -34,7 +34,7 @@ elm_main(int argc, char **argv) elm_object_part_text_set(popup, "title,text", "Title"); icon1 = elm_icon_add(popup); - snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/logo_small.png", DATA_DIR); elm_icon_file_set(icon1, buf, NULL); //Setting popup title-icon elm_object_part_content_set(popup, "title,icon", icon1); diff --git a/legacy/elementary/src/examples/popup_example_03.c b/legacy/elementary/src/examples/popup_example_03.c index 44741ab34e..175a88427c 100644 --- a/legacy/elementary/src/examples/popup_example_03.c +++ b/legacy/elementary/src/examples/popup_example_03.c @@ -2,7 +2,7 @@ //gcc -o popup_example_03 popup_example_03.c -g `pkg-config --cflags --libs elementary` #include -#define PACKAGE_DATA_DIR "../../data" +#define DATA_DIR "../../data" static void _item_selected_cb(void *data, Evas_Object *obj, void *event_info); static void _response_cb(void *data, Evas_Object *obj, void *event_info); @@ -27,7 +27,7 @@ elm_main(int argc, char **argv) popup = elm_popup_add(win); icon1 = elm_icon_add(popup); - snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/logo_small.png", DATA_DIR); elm_icon_file_set(icon1, buf, NULL); //Seting popup title-text diff --git a/legacy/elementary/src/examples/progressbar_example.c b/legacy/elementary/src/examples/progressbar_example.c index 9d92312ae3..ccec197e9e 100644 --- a/legacy/elementary/src/examples/progressbar_example.c +++ b/legacy/elementary/src/examples/progressbar_example.c @@ -5,11 +5,14 @@ * See stdout/stderr for output. Compile with: * * @verbatim - * gcc -g `pkg-config --cflags --libs elementary` progressbar_example.c -o progressbar_example + * gcc -g `pkg-config --cflags --libs elementary` progressbar_example.c -o progressbar_example -DDATA_DIR="\"\'"" * @endverbatim */ #include +#ifndef DATA_DIR +# define DATA_DIR "/usr/share/elementary" +#endif typedef struct Progressbar_Example { @@ -131,7 +134,7 @@ elm_main(int argc, example_data.pb2 = pb; ic1 = elm_icon_add(win); - snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/logo_small.png", DATA_DIR); elm_icon_file_set(ic1, buf, NULL); evas_object_size_hint_aspect_set(ic1, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); diff --git a/legacy/elementary/src/examples/slideshow_example.c b/legacy/elementary/src/examples/slideshow_example.c index 1f092107be..ec4f5bf6db 100644 --- a/legacy/elementary/src/examples/slideshow_example.c +++ b/legacy/elementary/src/examples/slideshow_example.c @@ -10,7 +10,7 @@ */ #include -#define PACKAGE_DATA_DIR "../../data" +#define DATA_DIR "../../data" static void _on_done(void *data, @@ -23,15 +23,15 @@ _on_done(void *data, static Evas_Object *slideshow, *bt_start, *bt_stop; static Elm_Slideshow_Item_Class itc; -static const char *img1 = PACKAGE_DATA_DIR "/images/logo.png"; -static const char *img2 = PACKAGE_DATA_DIR "/images/plant_01.jpg"; -static const char *img3 = PACKAGE_DATA_DIR "/images/rock_01.jpg"; -static const char *img4 = PACKAGE_DATA_DIR "/images/rock_02.jpg"; -static const char *img5 = PACKAGE_DATA_DIR "/images/sky_01.jpg"; -static const char *img6 = PACKAGE_DATA_DIR "/images/sky_04.jpg"; -static const char *img7 = PACKAGE_DATA_DIR "/images/wood_01.jpg"; -static const char *img8 = PACKAGE_DATA_DIR "/images/mystrale.jpg"; -static const char *img9 = PACKAGE_DATA_DIR "/images/mystrale_2.jpg"; +static const char *img1 = DATA_DIR "/images/logo.png"; +static const char *img2 = DATA_DIR "/images/plant_01.jpg"; +static const char *img3 = DATA_DIR "/images/rock_01.jpg"; +static const char *img4 = DATA_DIR "/images/rock_02.jpg"; +static const char *img5 = DATA_DIR "/images/sky_01.jpg"; +static const char *img6 = DATA_DIR "/images/sky_04.jpg"; +static const char *img7 = DATA_DIR "/images/wood_01.jpg"; +static const char *img8 = DATA_DIR "/images/mystrale.jpg"; +static const char *img9 = DATA_DIR "/images/mystrale_2.jpg"; static void _notify_show(void *data, diff --git a/legacy/elementary/src/examples/thumb_example_01.c b/legacy/elementary/src/examples/thumb_example_01.c index 9061cade5d..9ffd7523d4 100644 --- a/legacy/elementary/src/examples/thumb_example_01.c +++ b/legacy/elementary/src/examples/thumb_example_01.c @@ -2,7 +2,7 @@ //gcc -g `pkg-config --cflags --libs elementary` thumb_example_01.c -o thumb_example_01 #include -#define PACKAGE_DATA_DIR "." +#define DATA_DIR "." static void _generation_started_cb(void *data, Evas_Object *o, void *event_info) @@ -57,7 +57,7 @@ elm_main(int argc, char **argv) evas_object_smart_callback_add(thumb, "generate,error", _generation_error_cb, NULL); elm_thumb_editable_set(thumb, EINA_FALSE); - snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", DATA_DIR); elm_thumb_file_set(thumb, buf, NULL); elm_thumb_reload(thumb); diff --git a/legacy/elementary/src/examples/transit_example_03.c b/legacy/elementary/src/examples/transit_example_03.c index 4a3fb36eb9..3ae256442f 100644 --- a/legacy/elementary/src/examples/transit_example_03.c +++ b/legacy/elementary/src/examples/transit_example_03.c @@ -1,8 +1,11 @@ //Compile with: -//gcc -o transit_example_03 transit_example_03.c `pkg-config --cflags --libs elementary` -DPACKAGE_DATA_DIR="\"\"" +//gcc -o transit_example_03 transit_example_03.c `pkg-config --cflags --libs elementary` -DDATA_DIR="\"\"" //where directory is the a path where images/icon_07.png can be found. #include +#ifndef DATA_DIR +# define DATA_DIR "/usr/share/elementary" +#endif /* structure to hold context for many callbacks */ struct Context { @@ -219,7 +222,7 @@ elm_main(int argc, char **argv) obj = elm_button_add(win); elm_object_text_set(obj, "Transformed object!"); icon = elm_icon_add(win); - snprintf(buf, sizeof(buf), "%s/images/icon_07.png", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/icon_07.png", DATA_DIR); elm_icon_file_set(icon, buf, NULL); elm_object_part_content_set(obj, "icon", icon); evas_object_move(obj, 160, 60); diff --git a/legacy/elementary/src/examples/transit_example_04.c b/legacy/elementary/src/examples/transit_example_04.c index 62af7dcc9e..c9a5aca693 100644 --- a/legacy/elementary/src/examples/transit_example_04.c +++ b/legacy/elementary/src/examples/transit_example_04.c @@ -1,8 +1,11 @@ //Compile with: -//gcc -o transit_example_04 transit_example_04.c `pkg-config --cflags --libs elementary` -DPACKAGE_DATA_DIR="\"\"" +//gcc -o transit_example_04 transit_example_04.c `pkg-config --cflags --libs elementary` -DDATA_DIR="\"\"" //where directory is the a path where images/icon_07.png can be found. #include +#ifndef DATA_DIR +# define DATA_DIR "/usr/share/elementary" +#endif static void _transit_flip(Elm_Transit *trans) @@ -123,7 +126,7 @@ elm_main(int argc, char **argv) obj = elm_button_add(win); elm_object_text_set(obj, "Transformed object!"); icon = elm_icon_add(win); - snprintf(buf, sizeof(buf), "%s/images/icon_07.png", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/icon_07.png", DATA_DIR); elm_icon_file_set(icon, buf, NULL); elm_object_part_content_set(obj, "icon", icon); evas_object_move(obj, 160, 60); @@ -136,7 +139,7 @@ elm_main(int argc, char **argv) obj = elm_button_add(win); elm_object_text_set(obj, "Another object!"); icon = elm_icon_add(win); - snprintf(buf, sizeof(buf), "%s/images/icon_08.png", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/icon_08.png", DATA_DIR); elm_icon_file_set(icon, buf, NULL); elm_object_part_content_set(obj, "icon", icon); evas_object_move(obj, 160, 60); diff --git a/legacy/elementary/src/examples/win_example.c b/legacy/elementary/src/examples/win_example.c index 8f0fa637fc..f97ec761d6 100644 --- a/legacy/elementary/src/examples/win_example.c +++ b/legacy/elementary/src/examples/win_example.c @@ -6,7 +6,7 @@ #endif #include -#define PACKAGE_DATA_DIR "../../data" +#define DATA_DIR "../../data" static void _btn_activate_cb(void *data, Evas_Object *obj, void *event) @@ -210,7 +210,7 @@ elm_main(int argc, char *argv[]) evas_object_smart_callback_add(win2, "focus,in", _win_focused_cb, "managed"); o = elm_icon_add(win2); - elm_icon_file_set(o, PACKAGE_DATA_DIR "/images/logo.png", NULL); + elm_icon_file_set(o, DATA_DIR "/images/logo.png", NULL); elm_icon_resizable_set(o, 0, 0); elm_icon_no_scale_set(o, EINA_TRUE); elm_win_resize_object_add(win2, o);