Merge branch 'master' into 2.1

Conflicts:
	CMakeLists.txt
	include/sg-debug.h
	include/sg-keys.h
	include/ug-setting-gallery.h
	packaging/ug-setting-gallery-efl.spec
	src/sg-keys.c
	src/ug-setting-gallery.c

Change-Id: I9758e63ca1962bcf4243e5b4ad28d39de7b858d1

diff --cc include/sg-keys.h
index c250ba3,956ab8d..def8b81
--- 1/include/sg-keys.h
--- 2/include/sg-keys.h
+++ b/include/sg-keys.h
@@@ -22,11 -22,11 +22,12 @@@
  #include <vconf-keys.h>\r
  #include <stdbool.h>\r
  \r
- #define VCONFKEY_GALLERY_INTERVAL_TIME                "db/setting/gallery/interval_time"  //int\r
 +\r
- #define VCONFKEY_GALLERY_REPEAT_STATE         "db/setting/gallery/repeat_state" //boolean\r
+ #define VCONFKEY_GALLERY_INTERVAL_TIME                "db/gallery/setting/interval_time"  //int\r
  \r
- #define VCONFKEY_GALLERY_SHUFFLE_STATE                "db/setting/gallery/shuffle_state" //boolean\r
+ #define VCONFKEY_GALLERY_REPEAT_STATE         "db/gallery/setting/repeat_state" //boolean\r
+ \r
+ #define VCONFKEY_GALLERY_SHUFFLE_STATE                "db/gallery/setting/shuffle_state" //boolean\r
  \r
  \r
  int gallery_key_init_current_time(double *val);\r

diff --cc src/ug-setting-gallery.c
index c816a55,2c1a52a..cb77051
--- 1/src/ug-setting-gallery.c
--- 2/src/ug-setting-gallery.c
+++ b/src/ug-setting-gallery.c
@@@ -242,12 -242,13 +242,14 @@@ _gallery_genlist_icon_cb(void *data,  E
  \r
        int state = 0;\r
        int index = (int )data;\r
 +\r
+       bool bState = false;\r
+ \r
        if (index == GALLERY_MAIN_MENU_REPEAT)\r
        {\r
-               gallery_key_init_repeat_state(&state);\r
+               bState = elm_check_state_get(ugd->repeat_btn);\r
  \r
-               if (gallery_key_set_repeat_state(!state))\r
+               if (gallery_key_set_repeat_state(bState))\r
                {\r
                        gallery_key_text_popup(ugd,SGUG_TR_FAILED);\r
                }\r