Sync magnolia to RSA.

Change-Id: I52a4c4a047dae68e06fbceb0a8caaf5c4ec10deb

diff --git a/src/_logic.c b/src/_logic.c
index a589a0f..62a6168 100755 (executable)
--- a/src/_logic.c
+++ b/src/_logic.c
@@ -237,9 +237,11 @@ int _grab_key(struct appdata *ad)
 
        ret = utilx_grab_key(disp, xwin, KEY_VOLUMEDOWN, TOP_POSITION_GRAB);
        retvm_if(ret < 0, -1, "Failed to grab key down\n");
+       retvm_if(ret == 1, -1, "Already grab\n");
 
        ret = utilx_grab_key(disp, xwin, KEY_VOLUMEUP, TOP_POSITION_GRAB);
        retvm_if(ret < 0, -1, "Failed to grab key up\n");
+       retvm_if(ret == 1, -1, "Already grab\n");
 
        ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _key_press_cb, ad);
        ecore_event_handler_add(ECORE_EVENT_KEY_UP, _key_release_cb, ad);
@@ -692,7 +694,7 @@ int _app_reset(bundle *b, void *data)
        if (status == 0) {
                if(ad->win){
                        _D("window exists", __func__);
-                       _grab_key(ad);
+                       if(_grab_key(ad)==-1)return -1;
                        _handle_bundle(b, ad);
                        _rotate_func(ad);
                        elm_win_indicator_mode_set(ad->win, ELM_WIN_INDICATOR_HIDE);

diff --git a/src/_sound.c b/src/_sound.c
index 645f492..305bd45 100755 (executable)
--- a/src/_sound.c
+++ b/src/_sound.c
@@ -153,6 +153,9 @@ int _insert_message_ticker_notification(void)
        noti = notification_new(NOTIFICATION_TYPE_NOTI, NOTIFICATION_GROUP_ID_NONE, NOTIFICATION_PRIV_ID_NONE);
        retvm_if(noti == NULL, 0, "notification_new is failed\n");
 
+       noti_err = notification_set_display_applist(noti, NOTIFICATION_DISPLAY_APP_TICKER);
+       retvm_if(noti == NULL, 0, "notification_set_display_applist\n");
+
        noti_err = notification_set_application(noti, PKGNAME);
        retvm_if(noti_err != NOTIFICATION_ERROR_NONE, 0, "Fail to notification_set_application : %d\n", noti_err);
 

diff --git a/src/volume.c b/src/volume.c
index 2168a22..7dbdb63 100755 (executable)
--- a/src/volume.c
+++ b/src/volume.c
@@ -97,7 +97,11 @@ static int app_reset(bundle *b, void *data)
        }
        ad->flag_launching = EINA_TRUE;
 
-       _app_reset(b, data);
+       if(_app_reset(b, data) == -1){
+               _D("_app_reset() if failed\n");
+               ad->flag_launching = EINA_FALSE;
+               return -1;
+       }
        /* appcore measure time example */
        printf("from AUL to %s(): %d msec\n", __func__,
                        appcore_measure_time_from("APP_START_TIME"));
@@ -121,6 +125,7 @@ int main(int argc, char *argv[])
                .reset = app_reset,
        };
 
+
        /* appcore measure time example */
        printf("from AUL to %s(): %d msec\n", __func__,
                        appcore_measure_time_from("APP_START_TIME"));

diff --git a/src/volume.h b/src/volume.h
index 91843aa..0b1f82e 100755 (executable)
--- a/src/volume.h
+++ b/src/volume.h
@@ -31,7 +31,7 @@
 #endif
 
 #if !defined(RESDIR)
-#  define RESDIR "/usr/apps/org.samsung.volume/res"
+#  define RESDIR "/usr/apps/org.tizen.volume/res"
 #endif
 
 #if !defined(LOCALEDIR)