Merge of Eunyoung Lee <ey928.lee@samsung.com> commit.submit/tizen/20160407.171147accepted/tizen/wearable/20160408.004435accepted/tizen/tv/20160408.004406accepted/tizen/mobile/20160408.004517accepted/tizen/ivi/20160408.004427accepted/tizen/common/20160408.184837accepted/tizen_mobile

The commit msg "Add notification privilege & Modify instant message"

Change-Id: If6e5c17e7902c1e8f085e5972c67cf376436b839
Signed-off-by: Radoslaw Czerski <r.czerski@samsung.com>

3 files changed, 11 insertions, 58 deletions

diff --git a/inc/main.h b/inc/main.h
index d31fca1..883f560 100644
--- a/inc/main.h
+++ b/inc/main.h
@@ -121,6 +121,7 @@ struct appdata {
 	telephony_info tel_info;
 	int prefered_data;	// Data prefered
 	Evas_Object* win_overlay;
+	Evas_Object *ticker_win;
 
 	/* FIXME */
 #if 0
diff --git a/inc/noti_win.h b/inc/noti_win.h
deleted file mode 100644
index 94bdd30..0000000
--- a/inc/noti_win.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-
-#ifndef __NOTI_WIN_H__
-#define __NOTI_WIN_H__
-
-#include <Evas.h>
-
-typedef enum _indicator_animated_icon_type {
-	INDICATOR_ANIMATED_ICON_NONE = -1,
-	INDICATOR_ANIMATED_ICON_DOWNLOAD = 1,
-	INDICATOR_ANIMATED_ICON_UPLOAD,
-	INDICATOR_ANIMATED_ICON_INSTALL,
-} indicator_animated_icon_type;
-
-typedef struct _QP_Module {
-	char *name;
-	/* func */
-	int (*init) (void *);
-	void (*init_job_cb) (void *);
-	int (*fini) (void *);
-	int (*suspend) (void *);
-	int (*resume) (void *);
-	int (*hib_enter) (void *);
-	int (*hib_leave) (void *);
-	void (*lang_changed) (void *);
-	void (*refresh) (void *);
-	unsigned int (*get_height) (void *);
-	void (*qp_opened) (void *);
-	void (*qp_closed) (void *);
-	void (*mw_enabled) (void *);
-	void (*mw_disabled) (void *);
-
-	/* do not modify this area */
-	/* internal data */
-	Eina_Bool state;
-} QP_Module;
-
-extern Evas_Object *noti_win_add(Evas_Object *parent, struct appdata *ad);
-extern void noti_win_content_set(Evas_Object *obj, Evas_Object *content);
-
-#endif
diff --git a/inc/ticker.h b/inc/ticker.h
index 7a2da2a..eb219d5 100644
--- a/inc/ticker.h
+++ b/inc/ticker.h
@@ -21,11 +21,20 @@
 #ifndef __INDICATOR_TICKER_H__
 #define __INDICATOR_TICKER_H__
 
+typedef enum _indicator_animated_icon_type {
+	INDICATOR_ANIMATED_ICON_NONE = -1,
+	INDICATOR_ANIMATED_ICON_DOWNLOAD = 1,
+	INDICATOR_ANIMATED_ICON_UPLOAD,
+	INDICATOR_ANIMATED_ICON_INSTALL,
+} indicator_animated_icon_type;
+
 typedef struct ticker {
-	Evas_Object *win;
 	Evas_Object *scroller;
+	Evas_Object *textblock;
 	Ecore_Timer *timer;
 	Eina_List *ticker_list;
+	int current_page;
+	int cursor_pos;
 } ticker_info_s;
 
 extern int ticker_init(void *data);