fixed warnings

Change-Id: I43fc1d6878daddfee37a859fbc91ad8c5a0bde27

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index e37f6cd..f628b4d 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -97,6 +97,7 @@ static Eina_Inlist *_e_client_hooks[] =
 
 ///////////////////////////////////////////
 
+#ifndef ENABLE_QUICK_INIT
 static Eina_Bool
 _e_client_cb_efreet_cache_update(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev EINA_UNUSED)
 {
@@ -113,6 +114,7 @@ _e_client_cb_efreet_cache_update(void *data EINA_UNUSED, int type EINA_UNUSED, v
      }
    return ECORE_CALLBACK_RENEW;
 }
+#endif
 
 static Eina_Bool
 _e_client_cb_config_icon_theme(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev EINA_UNUSED)

diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index 2cdc8e6..51423f2 100644 (file)
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -622,7 +622,6 @@ e_comp_canvas_client_layer_map_nearest(int layer)
 EAPI void
 e_comp_post_update_add(E_Client *ec)
 {
-   Eina_List *l, *ll;
    E_Client *ec2;
 
    if (!e_comp) return;

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index ab47ede..b04b434 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -727,7 +727,6 @@ _e_comp_wl_evas_handle_mouse_move_to_touch(E_Client *ec, uint32_t timestamp, int
 {
    Eina_List *l;
    struct wl_client *wc;
-   uint32_t serial;
    struct wl_resource *res;
    wl_fixed_t x, y;
 
@@ -2464,7 +2463,7 @@ static const struct wl_compositor_interface _e_comp_interface =
 };
 
 static void
-_e_comp_wl_pname_get(pid_t pid, char* name, int size)
+_e_comp_wl_pname_get(pid_t pid, char *name, int size)
 {
    if (!name) return;
 
@@ -2593,7 +2592,7 @@ _e_comp_wl_compositor_cb_bind(struct wl_client *client, void *data, uint32_t ver
 
    _e_comp_wl_pname_print(pid);
 
-   char *name[512];
+   char name[512];
    _e_comp_wl_pname_get(pid, name, sizeof(name));
 
    E_Comp_Connected_Client_Info *cinfo;

diff --git a/src/bin/e_comp_wl_tbm.c b/src/bin/e_comp_wl_tbm.c
index 5616b5e..94e13c5 100644 (file)
--- a/src/bin/e_comp_wl_tbm.c
+++ b/src/bin/e_comp_wl_tbm.c
@@ -7,7 +7,7 @@ EINTERN Eina_Bool
 e_comp_wl_tbm_init(void)
 {
    struct wayland_tbm_server *tbm_server = NULL;
-   Eina_List *devs;
+   const Eina_List *devs;
    Ecore_Drm_Device *dev;
    int drm_fd = -1;
    const char *dev_name;

diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index c2afb8f..c6ba0cb 100644 (file)
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1323,14 +1323,15 @@ e_config_load(void)
           }
         CONFIG_VERSION_CHECK(15)
           {
-             E_Config_Module *em;
-             Eina_List *l;
-             Eina_Bool found = EINA_FALSE;
-
              CONFIG_VERSION_UPDATE_INFO(15);
              if (e_config->desklock_use_custom_desklock)
                e_config->desklock_auth_method = E_DESKLOCK_AUTH_METHOD_EXTERNAL;
+
 #if USE_MODULE_LOKKER
+             E_Config_Module *em;
+             Eina_List *l;
+             Eina_Bool found = EINA_FALSE;
+
              EINA_LIST_FOREACH(e_config->modules, l, em)
                if (!strcmp(em->name, "lokker"))
                  {

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index de14d7b..1f7d2ac 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -223,7 +223,7 @@ e_desk_show(E_Desk *desk)
    Edje_Message_Int_Set *msg;
    Eina_List *l;
    E_Shelf *es;
-   int was_zone = 0, x, y, dx = 0, dy = 0;
+   int x, y, dx = 0, dy = 0;
 
    E_OBJECT_CHECK(desk);
    E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
@@ -286,7 +286,10 @@ e_desk_show(E_Desk *desk)
    if (desk->zone->bg_object)
      edje_object_message_send(desk->zone->bg_object, EDJE_MESSAGE_INT_SET, 0, msg);
 
+#ifndef ENABLE_QUICK_INIT
+   int was_zone = 0;
    if (desk->zone->bg_object) was_zone = 1;
+#endif
    _e_desk_show_begin(desk, dx, dy);
    if (!e_config->desk_flip_animate_type)
      {

diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 55bb3e6..031798d 100644 (file)
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -2,15 +2,17 @@
 
 /* local subsystem functions */
 
-static void           _e_drag_move(E_Drag *drag, int x, int y);
 static void           _e_drag_coords_update(const E_Drop_Handler *h, int *dx, int *dy);
 static Ecore_X_Window _e_drag_win_get(const E_Drop_Handler *h, int xdnd);
 static int            _e_drag_win_matches(E_Drop_Handler *h, Ecore_X_Window win, int xdnd);
-static void           _e_drag_win_show(E_Drop_Handler *h);
 static void           _e_drag_win_hide(E_Drop_Handler *h);
+#ifndef HAVE_WAYLAND_ONLY
+static void           _e_drag_win_show(E_Drop_Handler *h);
+static void           _e_drag_move(E_Drag *drag, int x, int y);
 static int            _e_drag_update(Ecore_X_Window root, int x, int y, Ecore_X_Atom action);
-static void           _e_drag_end(int x, int y);
 static void           _e_drag_xdnd_end(Ecore_X_Window root, int x, int y);
+#endif
+static void           _e_drag_end(int x, int y);
 static void           _e_drag_free(E_Drag *drag);
 
 static Eina_Bool      _e_dnd_cb_key_down(void *data, int type, void *event);
@@ -50,7 +52,9 @@ static Ecore_X_Window _drag_win_root = 0;
 static Eina_List *_drag_list = NULL;
 static E_Drag *_drag_current = NULL;
 
+#ifndef HAVE_WAYLAND_ONLY
 static XDnd *_xdnd = NULL;
+#endif
 static Ecore_X_Atom _text_atom = 0;
 
 static Eina_Stringshare *_type_text_uri_list = NULL;
@@ -58,6 +62,7 @@ static Eina_Stringshare *_type_xds = NULL;
 static Eina_Stringshare *_type_text_x_moz_url = NULL;
 static Eina_Stringshare *_type_enlightenment_x_file = NULL;
 
+#ifndef HAVE_WAYLAND_ONLY
 static Eina_Stringshare **_e_dnd_types[] =
 {
    &_type_text_uri_list,
@@ -66,6 +71,7 @@ static Eina_Stringshare **_e_dnd_types[] =
    //&_type_enlightenment_x_file,
    NULL
 };
+#endif
 
 static Eina_Hash *_drop_handlers_responsives;
 static Ecore_X_Atom _action;
@@ -634,6 +640,7 @@ e_dnd_util_text_uri_list_convert(char *data, int size)
 
 /* local subsystem functions */
 
+#ifndef HAVE_WAYLAND_ONLY
 static Eina_Stringshare *
 _e_dnd_type_implemented(const char *type)
 {
@@ -661,6 +668,7 @@ _e_drag_move(E_Drag *drag, int x, int y)
    drag->y = y - drag->dy;
    evas_object_move(drag->comp_object, drag->x, drag->y);
 }
+#endif
 
 static void
 _e_drag_coords_update(const E_Drop_Handler *h, int *dx, int *dy)
@@ -773,6 +781,7 @@ _e_drag_win_matches(E_Drop_Handler *h, Ecore_X_Window win, int xdnd)
    return 0;
 }
 
+#ifndef HAVE_WAYLAND_ONLY
 static void
 _e_drag_win_show(E_Drop_Handler *h)
 {
@@ -799,6 +808,7 @@ _e_drag_win_show(E_Drop_Handler *h)
           }
      }
 }
+#endif
 
 static void
 _e_drag_win_hide(E_Drop_Handler *h)
@@ -827,6 +837,7 @@ _e_drag_win_hide(E_Drop_Handler *h)
      }
 }
 
+#ifndef HAVE_WAYLAND_ONLY
 static unsigned int
 _e_dnd_object_layer_get(E_Drop_Handler *h)
 {
@@ -976,6 +987,7 @@ _e_drag_update(Ecore_X_Window root, int x, int y, Ecore_X_Atom action)
 //   double t2 = ecore_time_get() - t1; ////
 //   printf("DND UPDATE %3.7f\n", t2); ////
 }
+#endif
 
 static void
 _e_drag_end(int x, int y)
@@ -1089,6 +1101,7 @@ _e_drag_end(int x, int y)
    e_object_del(E_OBJECT(_drag_current));
 }
 
+#ifndef HAVE_WAYLAND_ONLY
 static void
 _e_drag_xdnd_end(Ecore_X_Window win, int x, int y)
 {
@@ -1118,6 +1131,7 @@ _e_drag_xdnd_end(Ecore_X_Window win, int x, int y)
      }
    if (_drag_current) e_object_del(E_OBJECT(_drag_current));
 }
+#endif
 
 static void
 _e_drag_free(E_Drag *drag)

diff --git a/src/bin/e_dpms.c b/src/bin/e_dpms.c
index f600a96..cd77d32 100644 (file)
--- a/src/bin/e_dpms.c
+++ b/src/bin/e_dpms.c
@@ -19,7 +19,9 @@ e_dpms_update(void)
 {
    unsigned int standby = 0, suspend = 0, off = 0;
    int enabled;
+#ifndef HAVE_WAYLAND_ONLY
    Eina_Bool changed = EINA_FALSE;
+#endif
 
    enabled = ((e_config->screensaver_enable) &&
               (!e_config->mode.presentation) &&
@@ -45,17 +47,23 @@ e_dpms_update(void)
    if (_e_dpms_timeout_standby != standby)
      {
         _e_dpms_timeout_standby = standby;
+#ifndef HAVE_WAYLAND_ONLY
         changed = EINA_TRUE;
+#endif
      }
    if (_e_dpms_timeout_suspend != suspend)
      {
         _e_dpms_timeout_suspend = suspend;
+#ifndef HAVE_WAYLAND_ONLY
         changed = EINA_TRUE;
+#endif
      }
    if (_e_dpms_timeout_off != off)
      {
         _e_dpms_timeout_off = off;
+#ifndef HAVE_WAYLAND_ONLY
         changed = EINA_TRUE;
+#endif
      }
 #ifndef HAVE_WAYLAND_ONLY
    if (e_comp->comp_type == E_PIXMAP_TYPE_X)

diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 7b82826..bbbe754 100644 (file)
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -7108,7 +7108,7 @@ _e_fm2_cb_dnd_selection_notify(void *data, const char *type, void *event)
         if (((!mnt) || (!mop)) && (do_lnk || do_copy || do_move))
           free(args);
      }
-end:
+//end:
    _e_fm2_dnd_drop_hide(sd->obj);
    _e_fm2_dnd_drop_all_hide(sd->obj);
    _e_fm2_list_walking++;

diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index d15ece5..12dfc05 100644 (file)
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -1690,18 +1690,16 @@ e_hints_window_virtual_keyboard_get(E_Client *ec)
 #endif
 }
 
+#ifndef HAVE_WAYLAND_ONLY
 static void
 e_hints_openoffice_gnome_fake(Ecore_Window root)
 {
-#ifdef HAVE_WAYLAND_ONLY
-   (void)root;
-#else
    const char *string = "ATM_GNOME_SM_PROXY";
 
    ecore_x_window_prop_property_set(root, ATM_GNOME_SM_PROXY, ECORE_X_ATOM_STRING,
                                     8, (void *)string, strlen(string));
-#endif
 }
+#endif
 
 #if 0
 static void

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index acb4c54..ab974ed 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -77,7 +77,9 @@ static int       _e_main_dirs_init(void);
 static int       _e_main_dirs_shutdown(void);
 static int       _e_main_path_init(void);
 static int       _e_main_path_shutdown(void);
+#ifndef DISABLE_FORMAT_TEST
 static void      _e_main_test_formats(void);
+#endif
 static int       _e_main_screens_init(void);
 static int       _e_main_screens_shutdown(void);
 static void      _e_main_desk_save(void);
@@ -311,10 +313,8 @@ _e_main_deferred_job_schedule(void *d EINA_UNUSED, int type EINA_UNUSED, void *e
 int
 main(int argc, char **argv)
 {
-   Eina_Bool nostartup = EINA_FALSE;
    Eina_Bool safe_mode = EINA_FALSE;
    Eina_Bool after_restart = EINA_FALSE;
-   Eina_Bool waslocked = EINA_FALSE;
    double t = 0.0, tstart = 0.0;
    char *s = NULL, buff[32];
    struct sigaction action;
@@ -505,6 +505,9 @@ main(int argc, char **argv)
    _e_main_shutdown_push(ecore_file_shutdown);
 
 #ifndef ENABLE_QUICK_INIT
+   Eina_Bool nostartup = EINA_FALSE;
+   Eina_Bool waslocked = EINA_FALSE;
+
    TS("Ecore_Con Init");
    if (!ecore_con_init())
      {
@@ -1226,9 +1229,6 @@ main(int argc, char **argv)
    ecore_exe_run_priority_set(e_config->priority);
    locked |= e_config->desklock_start_locked;
 
-   s = getenv("E_DESKLOCK_LOCKED");
-   if ((s) && (!strcmp(s, "locked"))) waslocked = EINA_TRUE;
-
    TS("E Paths Init");
    if (!_e_main_path_init())
      {
@@ -1872,6 +1872,7 @@ _e_main_path_shutdown(void)
    return 1;
 }
 
+#ifndef DISABLE_FORMAT_TEST
 static void
 _e_main_test_formats(void)
 {
@@ -1948,6 +1949,7 @@ _e_main_test_formats(void)
    evas_object_del(txt);
    ecore_evas_free(ee);
 }
+#endif
 
 static int
 _e_main_screens_init(void)