From: Jaehwan Kim <jae.hwan.kim@samsung.com>
Date: Fri, 15 Oct 2010 09:09:33 +0000 (+0900)
Subject: svn merge 51950
X-Git-Tag: origin~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0515122e6fba5e1837d71aad29ff172b780bf484;p=framework%2Fuifw%2Felementary.git

svn merge 51950
---

diff --git a/.gitignore b/.gitignore
index 1d0a9d5..6547b69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-*.o
 *.lo
+*.o
 *.la
 .libs
 .deps
@@ -18,3 +18,30 @@ elementary_quicklaunch
 elementary_run
 elementary_test
 elementary_testql
+/aclocal.m4
+/autom4te.cache/
+/config.guess
+/config.log
+/config.status
+/config.sub
+/configure
+/depcomp
+/elementary.spec
+/elementary_config.h
+/elementary_config.h.in
+/install-sh
+/libtool
+/ltmain.sh
+/missing
+/stamp-h1
+core
+cscope.out
+doc/elementary.dox
+elementary.spec
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+src/lib/Elementary.h
+tags
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1fac038..cf24724 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -80,7 +80,7 @@ test_multi.c \
 test_floating.c \
 test_launcher.c \
 test_anim.c \
-test_calendar.c
+test_calendar.c 
 
 elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
 elementary_test_LDFLAGS =
diff --git a/src/bin/test.c b/src/bin/test.c
index 4dac2f1..7a8ad4e 100644
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -66,7 +66,7 @@ void test_menu(void *data, Evas_Object *obj, void *event_info);
 void test_panel(void *data, Evas_Object *obj, void *event_info);
 void test_panes(void *data, Evas_Object *obj, void *event_info);
 void test_calendar(void *data, Evas_Object *obj, void *event_info);
-void test_calendar2(void *data, Evas_Object *obj, void *event_info); 
+void test_calendar2(void *data, Evas_Object *obj, void *event_info);
 void test_map(void *data, Evas_Object *obj, void *event_info);
 void test_weather(void *data, Evas_Object *obj, void *event_info);
 void test_flip(void *data, Evas_Object *obj, void *event_info);
@@ -81,7 +81,6 @@ void test_launcher2(void *data, Evas_Object *obj, void *event_info);
 void test_launcher3(void *data, Evas_Object *obj, void *event_info);
 void test_anim(void *data, Evas_Object *obj, void *event_info);
 
-
 struct elm_test
 {
    const char *name;
@@ -278,7 +277,7 @@ my_win_main(void)
    ADD_TEST("Launcher 2", test_launcher2);
    ADD_TEST("Launcher 3", test_launcher3);
    ADD_TEST("Animation", test_anim);
-   ADD_TEST("Calendar", test_calendar); 
+   ADD_TEST("Calendar", test_calendar);
    ADD_TEST("Calendar 2", test_calendar2);
 #undef ADD_TEST
 
diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index 9a3ecff..15d54f9 100644
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -123,7 +123,7 @@ test_gengrid(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win, *bg, *grid;
    static Testitem ti[144];
-   int i, j, n;
+   int i, n;
    char buf[PATH_MAX];
    const char *img[9] =
      {
diff --git a/src/edje_externals/elm_notify.c b/src/edje_externals/elm_notify.c
index afebf65..7a37a65 100644
--- a/src/edje_externals/elm_notify.c
+++ b/src/edje_externals/elm_notify.c
@@ -105,7 +105,7 @@ static Eina_Bool external_notify_param_set(void *data __UNUSED__,
 			&& param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
 	{
 		Elm_Notify_Orient set = _orient_get(param->s);
-		if (set == ELM_NOTIFY_ORIENT_LAST) return;
+		if (set == ELM_NOTIFY_ORIENT_LAST) return EINA_FALSE;
 		elm_notify_orient_set(obj, set);
 		return EINA_TRUE;
 	}