Merge branch 'tizen_2.4' of ssh://spin:29418/apps/widget/widget into tizen

Conflicts:
	src/snapshot_window.c

Change-Id: I6708a6664b69635011b243d6b244018fdcf79855

diff --git a/include/widget.h b/include/widget.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/widget_internal.h b/include/widget_internal.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/virtual_window.c b/src/virtual_window.c
index 2973a9f..e1b4ca1 100644 (file)
--- a/src/virtual_window.c
+++ b/src/virtual_window.c
@@ -658,7 +658,7 @@ static int pre_orientation_cb(const char *id, void *data)
        int orientation;
 
        /* Try provider_app first */
-       if (!info || info->state != VWIN_INFO_CREATED || !id) {
+       if (!info || info->state != VWIN_INFO_CREATED || !id || !info->id) {
                return WIDGET_ERROR_INVALID_PARAMETER;
        }