From 4d4065169ad59c7bc7899a41c8e75a53d60a9524 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 23 Mar 2005 03:16:12 +0000 Subject: [PATCH] .edj SVN revision: 13868 --- legacy/emotion/data/Makefile.am | 8 ++++---- legacy/emotion/src/bin/emotion_test_main.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/legacy/emotion/data/Makefile.am b/legacy/emotion/data/Makefile.am index ea82a68082..8cf455c2a8 100644 --- a/legacy/emotion/data/Makefile.am +++ b/legacy/emotion/data/Makefile.am @@ -2,7 +2,7 @@ EDJE_CC = edje_cc EDJE_FLAGS = -v -id $(top_srcdir)/data -fd $(top_srcdir)/data filesdir = $(datadir)/emotion/data -files_DATA = theme.eet +files_DATA = theme.edj EXTRA_DIST = \ bpause.png \ @@ -30,11 +30,11 @@ whb.png \ window_inner_shadow.png \ theme.edc -theme.eet: Makefile +theme.edj: Makefile $(EDJE_CC) $(EDJE_FLAGS) \ $(top_srcdir)/data/theme.edc \ - $(top_builddir)/data/theme.eet + $(top_builddir)/data/theme.edj clean-local: - rm -f *.eet + rm -f *.edj diff --git a/legacy/emotion/src/bin/emotion_test_main.c b/legacy/emotion/src/bin/emotion_test_main.c index 0af70a7717..17bf210afb 100644 --- a/legacy/emotion/src/bin/emotion_test_main.c +++ b/legacy/emotion/src/bin/emotion_test_main.c @@ -161,7 +161,7 @@ bg_setup(void) Evas_Object *o; o = edje_object_add(evas); - edje_object_file_set(o, PACKAGE_DATA_DIR"/data/theme.eet", "background"); + edje_object_file_set(o, PACKAGE_DATA_DIR"/data/theme.edj", "background"); evas_object_move(o, 0, 0); evas_object_resize(o, startw, starth); evas_object_layer_set(o, -999); @@ -739,7 +739,7 @@ init_video_object(char *file) oe = edje_object_add(evas); evas_object_data_set(oe, "frame_data", fd); - edje_object_file_set(oe, PACKAGE_DATA_DIR"/data/theme.eet", "video_controller"); + edje_object_file_set(oe, PACKAGE_DATA_DIR"/data/theme.edj", "video_controller"); edje_extern_object_min_size_set(o, w, h); edje_object_part_swallow(oe, "video_swallow", o); edje_object_size_min_calc(oe, &w, &h);