[gallery] Resolved build warnings 16/49816/2
authorRahul Dadhich <r.dadhich@samsung.com>
Tue, 20 Oct 2015 11:29:56 +0000 (16:59 +0530)
committerRahul Dadhich <r.dadhich@samsung.com>
Tue, 20 Oct 2015 11:34:23 +0000 (17:04 +0530)
Change-Id: Ie43c0e080a1cb26825d0afc88c6bcb22d0926026
Signed-off-by: Rahul Dadhich <r.dadhich@samsung.com>
12 files changed:
src/2dview/gl-albums-edit.c
src/2dview/gl-timeline.c
src/data/gl-data.c
src/features/gl-albums.c
src/features/gl-main.c
src/features/gl-thumbs-edit.c
src/features/gl-thumbs-sel.c
src/gallery.c
src/util/gl-ext-ug-load.c
src/util/gl-fs.c
src/widget/gl-thumb.c
widget/src/gl_widget_create.c

index 8ff6db46495be7a3368e70ed3472fd1cb04b72ae..d6a567c563779f329c3f1034d1a5a6d111f022b9 100644 (file)
@@ -133,6 +133,7 @@ static void __gl_albums_edit_check_grid_changed(void *data, Evas_Object *obj,
        __gl_albums_edit_update_check_state(ad, album_item, obj, false);
 }
 
+#if 0
 static void __gl_albums_edit_rename(gl_cluster *album)
 {
        GL_CHECK(album);
@@ -155,6 +156,7 @@ static void __gl_albums_edit_rename_btn_cb(void *data, Evas_Object *obj,
        _gl_ui_save_scroller_pos(ad->albuminfo.view);
        __gl_albums_edit_rename(album_item);
 }
+#endif
 
 static void __gl_albums_edit_del_cb(void *data, Evas_Object *obj,
                                    void *ei)
@@ -338,6 +340,7 @@ static void __gl_albums_edit_selall_cb(void *data, Evas_Object *obj, void *ei)
        _gl_ui_update_navi_title_text(ad->ctrlinfo.nf_it, sel_all_cnt, false);
 }
 
+#if 0
 static int __gl_albums_edit_ctxpopup_append(void *data, Evas_Object *parent)
 {
        gl_dbg("");
@@ -373,6 +376,7 @@ static void __gl_albums_edit_more_btn_cb(void *data, Evas_Object *obj, void *ei)
                return;
        _gl_ctxpopup_create(data, obj, __gl_albums_edit_ctxpopup_append);
 }
+#endif
 
 Evas_Object *_gl_albums_edit_add_content(void *data, Evas_Object *obj,
                                         const char *part)
index a4601d3f68ac21322c996fac23ca4b844ee9bed5..34ff60b010060a84753d05ed99151a893ca31161 100644 (file)
@@ -3774,6 +3774,7 @@ static void __gl_timeline_copy_cb(void *data, Evas_Object *obj, void *ei)
 #endif
 
 #ifdef _USE_ROTATE_BG
+#if 0
 static int __gl_timeline_rotate_op(void *data)
 {
 #define GL_ROTATE_DELAY 0.25
@@ -3893,6 +3894,7 @@ static void __gl_timeline_edit_rotate_right_cb(void *data, Evas_Object *obj,
        __gl_timeline_rotate_images(data, false);
 }
 #endif
+#endif
 
 /* Easy mode: New album/Edit/Slideshow */
 static int __gl_timeline_ctxpopup_append(void *data, Evas_Object *parent)
@@ -4753,7 +4755,7 @@ int _gl_ext_load_time_iv_selected_list(app_control_h service, void *data)
 
        if (count > 0) {
                app_control_add_extra_data_array(service, "Selected index",
-                               value, count);
+                               (const char **)value, count);
        }
 
        if (value) {
index 61dac98e7ae7bb9a07095c26449cb14be47fb9c9..d05ee01e68d42cec201a0fc4746f84c2ec0aeafe 100644 (file)
@@ -612,16 +612,6 @@ bool _gl_data_get_cluster_list_edit_mode(void *data)
        _gl_data_copy_cluster_list(ad, true, &list);
        if (!list ) {
                gl_dbg("list is null");
-       } else {
-               int count = eina_list_count(list);
-               gl_cluster *current = NULL;
-               int i;
-               for (i = 0; i < count; i++) {
-                       current = eina_list_nth(list, i);
-                       if (current) {
-                               int count1 = eina_list_count(current->elist);
-                       }
-               }
        }
        ad->albuminfo.elist = _gl_data_util_calloc_cluster_list();
        GL_CHECK_FALSE(ad->albuminfo.elist);
@@ -630,15 +620,6 @@ bool _gl_data_get_cluster_list_edit_mode(void *data)
                return false;
 
        _gl_update_album_selected_data(data, &list);
-       gl_cluster *current = NULL;
-       int i;
-       int count = eina_list_count(ad->albuminfo.elist->clist);
-       for (i = 0; i < count; i++) {
-               current = eina_list_nth(ad->albuminfo.elist->clist, i);
-               if (current) {
-                       int count1 = eina_list_count(current->elist);
-               }
-       }
        GL_PROFILE_OUT;
        return true;
 }
index 4c4e010cd776ff81022fb6c189c96ea4adcc2da7..e697a79e506516791927ade5288ea06e7ba90f86 100644 (file)
@@ -1364,7 +1364,6 @@ int gl_albums_open_album(gl_cluster *album)
                char *i18n_name = _gl_get_i18n_album_name(album->cluster);
                gl_sdbg("Album: %s, UUID: %s", i18n_name, album->cluster->uuid);
                _gl_albums_set_current(ad, album);
-               Eina_List *sel_id_list = NULL;
 
                Eina_List *medias_elist = NULL;
                _gl_data_get_items_album(ad, album, GL_FIRST_VIEW_START_POS,
index bbf0537ea2238b60d533625bff81af257291ccf1..1cade114140da9652e4aed18f0f0b8e828557fd6 100644 (file)
@@ -394,8 +394,6 @@ int _gl_main_create_view(gl_appdata *ad)
        /* Background. */
        ad->maininfo.bg = __gl_main_create_bg(ad->maininfo.win);
        GL_CHECK_VAL(ad->maininfo.bg, -1);
-       /*gallery should appear on phone side when target works on desktop mode*/
-       const char *str = "mobile";
 
        /*
         * Set Opacity before Conformant window create
index 7183fa3b09749b7a55537cd78da716e5f32d4cc7..99800964a2416fd4ec023079d184687e6dbbc83e 100644 (file)
@@ -565,6 +565,7 @@ int _gl_thumbs_edit_create_view(void *data)
        Evas_Object *gv = NULL;
        bool b_view = false;
        b_view = _gl_thumbs_get_view(ad, &gv);
+       gl_dbg("no content view is : %d.", b_view);
        GL_CHECK_FALSE(gv);
        _gl_thumbs_set_size(ad, gv);
 
index 2804c3856e3adefefcb6e408b23efde540c68523..55346e64741f5481bd667985d9bd4441b3302d56 100644 (file)
@@ -300,7 +300,6 @@ int _gl_thumbs_sel_create_view(void *data, gl_cluster *album_item)
        GL_CHECK_VAL(data, -1);
        gl_appdata *ad = (gl_appdata *)data;
        ad->gridinfo.is_append = false;
-       Eina_List *sel_id_list = NULL;
        gl_item *gitem = NULL;
        EINA_LIST_FREE(album_item->elist, gitem) {
        }
@@ -468,8 +467,6 @@ int _gl_thumbs_sel_update_view(void *data)
                /* Get selected medias count */
                int sel_cnt = _gl_data_selected_list_count(ad);
 
-               int count = eina_list_count(ad->gridinfo.medias_elist);
-               int i;
                gl_item *gitem = NULL;
                gitem = eina_list_nth(ad->gridinfo.medias_elist, 0);
                int album_sel_count = eina_list_count(gitem->album->elist);
index 5677334d11e084521849e17fb7b9f63f3090c376..de491bcddb44851ab7d3b2bb5ef1d77489dca07d 100644 (file)
@@ -201,11 +201,6 @@ static bool _gallery_create(void *data)
                signal(SIGTERM, SIG_IGN);
        }
        bindtextdomain(PACKAGE, "/usr/apps/org.tizen.gallery/res/locale");
-#ifdef _USE_OPENGL_BACKEND
-       elm_config_preferred_engine_set("opengl_x11");
-#else
-       elm_config_preferred_engine_set("software_x11");
-#endif
        /* initialize gallery main view(layout) */
        if (_gl_main_create_view(data) != 0) {
                gl_dbgE("_gl_main_create_view failed");
index e243c55298535570fa50b19de6c553ead0903a2e..e7aa4a23d2ff9d091db6f1fe2b9e9e7713506500 100755 (executable)
@@ -173,7 +173,6 @@ static void __gl_appcontrol_select_result_cb(app_control_h request, app_control_
 
        data = eina_list_nth(ad->gridinfo.medias_elist, 0);
        if (data && data->album && data->album->item) {
-               char buf[GL_ALBUM_NAME_LEN_MAX] = { 0, };
                if (sel_count > 0) {
                        elm_object_item_signal_emit(data->album->item,
                                        "elm,state,elm.text.badge,visible",
@@ -576,11 +575,11 @@ static int _gl_ext_load_iv_selected_list(app_control_h service, void *data)
        }
        if (count > 0) {
                app_control_add_extra_data_array(service, "Selected index",
-                               value, count);
+                               (const char **)value, count);
        }
        if (count_fav > 0) {
                app_control_add_extra_data_array(service, "Selected index fav",
-                               value_fav, count_fav);
+                               (const char **)value_fav, count_fav);
        }
 
 
index 89bf5696430cab0e19b9db92e2fa8a983dc84eb3..6e80b9c25fdbc14bc5e748a7d03780dc8fca0e34 100644 (file)
@@ -235,14 +235,10 @@ static unsigned long long __gl_fs_sort_folders_by_mtime(char *path,
 unsigned long long gl_fs_get_free_space(int state)
 {
        struct statvfs info;
-       char *path = NULL;
 
-       if (state == GL_STORE_T_PHONE)
-               path = GL_ROOT_PATH_PHONE;
-       else if (state == GL_STORE_T_MMC)
-               path = GL_ROOT_PATH_MMC;
-       else
+       if (state != GL_STORE_T_PHONE && state != GL_STORE_T_MMC) {
                return 0;
+       }
 
        if (storage_get_internal_memory_size(&info) < 0) {
                return 0;
index 945db20e69471f1e29a50f911cfc5002b0c259c8..4266d3ad6bba6aba400099573a0c903ec285d0a6 100644 (file)
@@ -397,6 +397,7 @@ int _gl_thumb_set_size(void *data, Evas_Object *view, int *size_w, int *size_h)
        int win_h = 0;
        double scale = _gl_get_win_factor(ad->maininfo.win, &win_w, &win_h);
 
+       gl_dbg("Scale is : %lf", scale);
        if (gl_get_view_mode(ad) == GL_VIEW_THUMBS_EDIT) {
                ad->pinchinfo.zoom_level = GL_ZOOM_IN_ONE;
        }
index 8e564699d27d6557f4391c3e4004bae833a49854..dece81dcd2bf12fa9baea9cc63239ed71e898b87 100644 (file)
@@ -25,6 +25,7 @@
 #include "gl_widget_debug.h"
 #include "gl-data-type.h"
 #include "gl_widget.h"
+#include <glib.h>
 
 #define NUMBER_OF_ITERATION 4
 #define IMAGES_THRESHOLD 5
@@ -58,6 +59,7 @@ int loop_count = 0; //counter to the iteration number;
 static void gl_widget_on_no_image_cb(void *data,Evas_Object *obj,
        const char *emission, const char *source);
 static Eina_Bool gl_widget_timer_cb(void *data);
+void _gl_widget_create_edit_btn(_widget_data* widget_data);
 
 void gl_widget_win_del_cb(void *data, Evas *evas, Evas_Object *obj,
        void *event_info)
@@ -90,8 +92,8 @@ void _gl_launch_iv(void *data, Evas_Object *obj, void *event_info)
        }
 
        _widget_data *widget_data = (_widget_data *)data;
-       char *file_name = NULL;
-       char *group_name = NULL;
+       const char *file_name = NULL;
+       const char *group_name = NULL;
        elm_image_file_get (obj, &file_name, &group_name);
        if (file_name) {
                int ret;
@@ -347,7 +349,7 @@ char *_gl_widget_get_file_date(const char *filename)
        char *month[12] = { GL_STR_ID_JAN, GL_STR_ID_FEB, GL_STR_ID_MAR, GL_STR_ID_APR, GL_STR_ID_MAY, GL_STR_ID_JUN,
                        GL_STR_ID_JUL, GL_STR_ID_AUG, GL_STR_ID_SEP, GL_STR_ID_OCT, GL_STR_ID_NOV, GL_STR_ID_DEC};
 
-       char * str = g_strdup_printf("%s%02d, %s %d", "",
+       char * str = (char *)g_strdup_printf("%s%02d, %s %d", "",
                        tmtime.tm_mday, month[tmtime.tm_mon], 1900 + tmtime.tm_year);
        return str;
 }
@@ -394,11 +396,8 @@ static char *gl_widget_extract_album_path(char* pathInfo)
                return NULL;
        }
 
-       char* albumname = NULL;
        char *albumpath = NULL;
-       char *rootpath = NULL;
        char *refptr = NULL;
-       Eina_Bool useralbum = EINA_FALSE;
 
        refptr = strrchr(pathInfo, '/');
        if (!refptr) {
@@ -458,9 +457,7 @@ static char *gl_widget_extract_album_info(char* pathInfo)
 
        char* albumname = NULL;
        char *albumpath = NULL;
-       char *rootpath = NULL;
        char *refptr = NULL;
-       Eina_Bool useralbum = EINA_FALSE;
 
        refptr = strrchr(pathInfo, '/');
        if (!refptr) {
@@ -499,7 +496,6 @@ static char *gl_widget_extract_album_info(char* pathInfo)
 
 static char *gl_widget_extract_date_info(char** patharray, int count)
 {
-       int refcount = 0;
        if (!patharray || count <= 0) {
                dlog_print(DLOG_ERROR, LOG_TAG, "Invalid data!!");
                return NULL;
@@ -818,7 +814,6 @@ int gl_widget_create(_widget_data *widget_data, int w, int h)
                dlog_print(DLOG_ERROR, LOG_TAG, "Invalid userdata!!");
                return -1;
        }
-       char edj_path[PATH_MAX] = {0,};
        Evas_Object *layout = NULL;
        dlog_print(DLOG_ERROR, LOG_TAG, "here0 - %x", widget_data->win);
        layout = elm_layout_add(widget_data->win);