diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2011-08-25 10:01:59 +0000 |
|---|---|---|
| committer | Carsten Haitzler <raster@rasterman.com> | 2011-08-25 10:01:59 +0000 |
| commit | a7d632573587ef5d1f714921baeac3c3fe59ec31 (patch) | |
| tree | 2e390b7d8ae6a50ff3effcf2d834200c77a16740 /src/bin/test_launcher.c | |
| parent | 7980b828c01cc99283df38f0e03f1a4be9597f93 (diff) | |
| download | elementary-a7d632573587ef5d1f714921baeac3c3fe59ec31.tar.gz | |
From: Jérémy Zurcher <jeremy@asynk.ch>
Subject: [E-devel] patch : eina_prefix + elementary_test
please find attached a small patch for eina_prefix
it prevent segfault when for instance
no elm_app_compile_*_dir_set is called prior to elm_app_info_set
and another one for elementary/src/bin/test*.c which tends to replace
usage of PACKAGE_DATA_DIR with elm_app_data_dir_get
SVN revision: 62796
Diffstat (limited to 'src/bin/test_launcher.c')
| -rw-r--r-- | src/bin/test_launcher.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/bin/test_launcher.c b/src/bin/test_launcher.c index 101684045..e9eac1b41 100644 --- a/src/bin/test_launcher.c +++ b/src/bin/test_launcher.c @@ -206,7 +206,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_win_autodel_set(win, EINA_TRUE); bg = elm_bg_add(win); - snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get()); 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); @@ -263,7 +263,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in { ic = elm_icon_add(win); elm_object_scale_set(ic, 0.5); - snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", PACKAGE_DATA_DIR, n); + snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", elm_app_data_dir_get(), n); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -389,7 +389,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i elm_win_autodel_set(win, EINA_TRUE); bg = elm_bg_add(win); - snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", elm_app_data_dir_get()); 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); @@ -402,7 +402,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i for (k = 0 ; k < 8; k++) { ly = elm_layout_add(win); - snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); elm_layout_file_set(ly, buf, "layout"); evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -737,7 +737,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i elm_win_autodel_set(win, EINA_TRUE); bg = elm_bg_add(win); - snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get()); 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); @@ -787,7 +787,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(mb); ly = elm_layout_add(win); - snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); elm_layout_file_set(ly, buf, "launcher_page"); evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -799,7 +799,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i for (i = 0; i < 4; i++) { ly2 = elm_layout_add(win); - snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); elm_layout_file_set(ly2, buf, "launcher_icon"); evas_object_size_hint_weight_set(ly2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ly2, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -807,7 +807,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i ic = elm_icon_add(win); elm_object_scale_set(ic, 0.5); - snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", PACKAGE_DATA_DIR, n); + snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", elm_app_data_dir_get(), n); elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |