Merge remote-tracking branch 'origin/upstream'

Conflicts:
	src/lib/ecore_file/ecore_file_download.c

diff --combined src/lib/ecore_con/ecore_con_url.c
index 56c2f0b,26a8284..48628bc
--- 1/src/lib/ecore_con/ecore_con_url.c
--- 2/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@@ -21,6 -21,10 +21,10 @@@
  # include <ws2tcpip.h>
  #endif
  
+ #ifdef HAVE_ESCAPE
+ # include <Escape.h>
+ #endif
+ 
  #include "Ecore.h"
  #include "ecore_private.h"
  #include "Ecore_Con.h"
@@@ -277,7 -281,6 +281,7 @@@ ecore_con_url_new(const char *url
      * FIXME: Check that these timeouts are sensible defaults
      * FIXME: Provide a means to change these timeouts
      */
 +   curl_easy_setopt(url_con->curl_easy, CURLOPT_FORBID_REUSE, 1);
     curl_easy_setopt(url_con->curl_easy, CURLOPT_CONNECTTIMEOUT, 30);
     curl_easy_setopt(url_con->curl_easy, CURLOPT_FOLLOWLOCATION, 1);
  
@@@ -1370,7 -1373,7 +1374,7 @@@ _ecore_con_url_perform(Ecore_Con_Url *u
     url_con->active = EINA_TRUE;
     curl_multi_add_handle(_curlm, url_con->curl_easy);
     curl_multi_perform(_curlm, &still_running);
 -   
 +
     completed_immediately = _ecore_con_url_process_completed_jobs(url_con);
  
     if (!completed_immediately)

diff --combined src/lib/ecore_x/Ecore_X.h
index 1b26534,6588a75..dfbb62e
--- 1/src/lib/ecore_x/Ecore_X.h
--- 2/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@@ -385,6 -385,13 +385,13 @@@ typedef struct _Ecore_X_Event_Xdnd_Fini
  typedef struct _Ecore_X_Event_Client_Message               Ecore_X_Event_Client_Message;
  typedef struct _Ecore_X_Event_Window_Shape                 Ecore_X_Event_Window_Shape;
  typedef struct _Ecore_X_Event_Screensaver_Notify           Ecore_X_Event_Screensaver_Notify;
+ typedef struct _Ecore_X_Event_Gesture_Notify_Flick         Ecore_X_Event_Gesture_Notify_Flick;
+ typedef struct _Ecore_X_Event_Gesture_Notify_Pan           Ecore_X_Event_Gesture_Notify_Pan;
+ typedef struct _Ecore_X_Event_Gesture_Notify_PinchRotation Ecore_X_Event_Gesture_Notify_PinchRotation;
+ typedef struct _Ecore_X_Event_Gesture_Notify_Tap           Ecore_X_Event_Gesture_Notify_Tap;
+ typedef struct _Ecore_X_Event_Gesture_Notify_TapNHold      Ecore_X_Event_Gesture_Notify_TapNHold;
+ typedef struct _Ecore_X_Event_Gesture_Notify_Hold          Ecore_X_Event_Gesture_Notify_Hold;
+ typedef struct _Ecore_X_Event_Gesture_Notify_Group         Ecore_X_Event_Gesture_Notify_Group;
  typedef struct _Ecore_X_Event_Sync_Counter                 Ecore_X_Event_Sync_Counter;
  typedef struct _Ecore_X_Event_Sync_Alarm                   Ecore_X_Event_Sync_Alarm;
  typedef struct _Ecore_X_Event_Screen_Change                Ecore_X_Event_Screen_Change;
@@@ -837,63 -844,6 +844,63 @@@ struct _Ecore_X_Event_Window_Delete_Req
     Ecore_X_Time   time;
  };
  
 +struct _Ecore_X_Event_Window_Prop_Title_Change
 +{
 +   Ecore_X_Window win;
 +   char          *title;
 +   Ecore_X_Time   time;
 +};
 +
 +struct _Ecore_X_Event_Window_Prop_Visible_Title_Change
 +{
 +   Ecore_X_Window win;
 +   char          *title;
 +   Ecore_X_Time   time;
 +};
 +
 +struct _Ecore_X_Event_Window_Prop_Icon_Name_Change
 +{
 +   Ecore_X_Window win;
 +   char          *name;
 +   Ecore_X_Time   time;
 +};
 +
 +struct _Ecore_X_Event_Window_Prop_Visible_Icon_Name_Change
 +{
 +   Ecore_X_Window win;
 +   char          *name;
 +   Ecore_X_Time   time;
 +};
 +
 +struct _Ecore_X_Event_Window_Prop_Client_Machine_Change
 +{
 +   Ecore_X_Window win;
 +   char          *name;
 +   Ecore_X_Time   time;
 +};
 +
 +struct _Ecore_X_Event_Window_Prop_Name_Class_Change
 +{
 +   Ecore_X_Window win;
 +   char          *name;
 +   char          *clas;
 +   Ecore_X_Time   time;
 +};
 +
 +struct _Ecore_X_Event_Window_Prop_Pid_Change
 +{
 +   Ecore_X_Window win;
 +   pid_t          pid;
 +   Ecore_X_Time   time;
 +};
 +
 +struct _Ecore_X_Event_Window_Prop_Desktop_Change
 +{
 +   Ecore_X_Window win;
 +   long           desktop;
 +   Ecore_X_Time   time;
 +};
 +
  struct _Ecore_X_Event_Startup_Sequence
  {
     Ecore_X_Window win;
@@@ -978,6 -928,13 +985,13 @@@ EAPI extern int ECORE_X_EVENT_FIXES_SEL
  EAPI extern int ECORE_X_EVENT_CLIENT_MESSAGE;
  EAPI extern int ECORE_X_EVENT_WINDOW_SHAPE;
  EAPI extern int ECORE_X_EVENT_SCREENSAVER_NOTIFY;
+ EAPI extern int ECORE_X_EVENT_GESTURE_NOTIFY_FLICK;
+ EAPI extern int ECORE_X_EVENT_GESTURE_NOTIFY_PAN;
+ EAPI extern int ECORE_X_EVENT_GESTURE_NOTIFY_PINCHROTATION;
+ EAPI extern int ECORE_X_EVENT_GESTURE_NOTIFY_TAP;
+ EAPI extern int ECORE_X_EVENT_GESTURE_NOTIFY_TAPNHOLD;
+ EAPI extern int ECORE_X_EVENT_GESTURE_NOTIFY_HOLD;
+ EAPI extern int ECORE_X_EVENT_GESTURE_NOTIFY_GROUP;
  EAPI extern int ECORE_X_EVENT_SYNC_COUNTER;
  EAPI extern int ECORE_X_EVENT_SYNC_ALARM;
  EAPI extern int ECORE_X_EVENT_SCREEN_CHANGE;
@@@ -2088,6 -2045,9 +2102,9 @@@ EAPI voi
  ecore_x_netwm_desk_workareas_set(Ecore_X_Window root,
                                   unsigned int *areas,
                                   unsigned int n_desks);
+ EAPI unsigned int *
+ ecore_x_netwm_desk_workareas_get(Ecore_X_Window root,
+                                  unsigned int *n_desks);
  EAPI void
  ecore_x_netwm_desk_current_set(Ecore_X_Window root,
                                 unsigned int desk);
@@@ -2436,25 -2396,6 +2453,25 @@@ EAPI voi
  EAPI void
   ecore_x_e_illume_quickpanel_position_update_send(Ecore_X_Window win);
  
 +/* added by doyoun.kang - for sliding window */
 +EAPI void
 + ecore_x_e_illume_sliding_win_state_set(Ecore_X_Window win,
 +                                       unsigned int is_visible);
 +EAPI int
 + ecore_x_e_illume_sliding_win_state_get(Ecore_X_Window win);
 +EAPI void
 + ecore_x_e_illume_sliding_win_geometry_set(Ecore_X_Window win,
 +                                          int x,
 +                                          int y,
 +                                          int w,
 +                                          int h);
 +EAPI int
 + ecore_x_e_illume_sliding_win_geometry_get(Ecore_X_Window win,
 +                                          int *x,
 +                                          int *y,
 +                                          int *w,
 +                                          int *h);
 +
  EAPI void
  ecore_x_e_comp_sync_counter_set(Ecore_X_Window win,
                                  Ecore_X_Sync_Counter counter);
@@@ -3519,6 -3460,158 +3536,158 @@@ ecore_x_input_multi_select(Ecore_X_Wind
  EAPI Eina_Bool
  ecore_x_vsync_animator_tick_source_set(Ecore_X_Window win);
  
+ typedef enum _Ecore_X_Gesture_Event_Mask
+ {
+    ECORE_X_GESTURE_EVENT_MASK_NONE = 0L,
+    ECORE_X_GESTURE_EVENT_MASK_FLICK = (1L << 0),
+    ECORE_X_GESTURE_EVENT_MASK_PAN = (1L << 1),
+    ECORE_X_GESTURE_EVENT_MASK_PINCHROTATION = (1L << 2),
+    ECORE_X_GESTURE_EVENT_MASK_TAP = (1L << 3),
+    ECORE_X_GESTURE_EVENT_MASK_TAPNHOLD = (1L << 4),
+    ECORE_X_GESTURE_EVENT_MASK_HOLD = (1L << 5),
+    ECORE_X_GESTURE_EVENT_MASK_GROUP = (1L << 6)
+ } Ecore_X_Gesture_Event_Mask;
+ 
+ typedef enum _Ecore_X_Gesture_Event_Type
+ {
+    ECORE_X_GESTURE_EVENT_FLICK,
+    ECORE_X_GESTURE_EVENT_PAN,
+    ECORE_X_GESTURE_EVENT_PINCHROTATION,
+    ECORE_X_GESTURE_EVENT_TAP,
+    ECORE_X_GESTURE_EVENT_TAPNHOLD,
+    ECORE_X_GESTURE_EVENT_HOLD,
+    ECORE_X_GESTURE_EVENT_GROUP
+ } Ecore_X_Gesture_Event_Type;
+ 
+ typedef enum _Ecore_X_Gesture_Event_Subtype
+ {
+    ECORE_X_GESTURE_END,
+    ECORE_X_GESTURE_BEGIN,
+    ECORE_X_GESTURE_UPDATE,
+    ECORE_X_GESTURE_DONE
+ } Ecore_X_Gesture_Event_Subtype;
+ 
+ typedef enum _Ecore_X_Gesture_Group_Subtype
+ {
+    ECORE_X_GESTURE_GROUP_REMOVED,
+    ECORE_X_GESTURE_GROUP_ADDED,
+    ECORE_X_GESTURE_GROUP_CURRENT
+ } Ecore_X_Gesture_Group_Subtype;
+ 
+ typedef enum _Ecore_X_Gesture_Direction
+ {
+    ECORE_X_GESTURE_NORTHWARD,
+    ECORE_X_GESTURE_NORTHEASTWARD,
+    ECORE_X_GESTURE_EASTWARD,
+    ECORE_X_GESTURE_SOUTHEASTWARD,
+    ECORE_X_GESTURE_SOUTHWARD,
+    ECORE_X_GESTURE_SOUTHWESTWARD,
+    ECORE_X_GESTURE_WESTWARD,
+    ECORE_X_GESTURE_NORTHWESTWARD
+ } Ecore_X_Gesture_Direction;
+ 
+ struct _Ecore_X_Event_Gesture_Notify_Flick
+ {
+    Ecore_X_Window win;
+    Ecore_X_Time time;
+    Ecore_X_Gesture_Event_Subtype subtype;
+    int num_fingers;
+    int distance;
+    Ecore_X_Time duration;
+    Ecore_X_Gesture_Direction direction;
+    double angle;
+ };
+    
+ struct _Ecore_X_Event_Gesture_Notify_Pan
+ {
+    Ecore_X_Window win;
+    Ecore_X_Time time;
+    Ecore_X_Gesture_Event_Subtype subtype;
+    int num_fingers;
+    int dx;
+    int dy;
+    int distance;
+    Ecore_X_Time duration;
+    Ecore_X_Gesture_Direction direction;
+ };
+ 
+ struct _Ecore_X_Event_Gesture_Notify_PinchRotation
+ {
+    Ecore_X_Window win;
+    Ecore_X_Time time;
+    Ecore_X_Gesture_Event_Subtype subtype;
+    int num_fingers;
+    int distance;
+    int cx;
+    int cy;
+    double zoom;
+    double angle;
+ };
+ 
+ struct _Ecore_X_Event_Gesture_Notify_Tap
+ {
+   Ecore_X_Window win;
+   Ecore_X_Time time;
+   Ecore_X_Gesture_Event_Subtype subtype;
+   int num_fingers;
+   int cx;
+   int cy;
+   int tap_repeat;
+   Ecore_X_Time interval;
+ };
+ 
+ struct _Ecore_X_Event_Gesture_Notify_TapNHold
+ {
+   Ecore_X_Window win;
+   Ecore_X_Time time;
+   Ecore_X_Gesture_Event_Subtype subtype;
+   int num_fingers;
+   int cx;
+   int cy;
+   Ecore_X_Time interval;
+   Ecore_X_Time hold_time;
+ };
+ 
+ struct _Ecore_X_Event_Gesture_Notify_Hold
+ {
+   Ecore_X_Window win;
+   Ecore_X_Time time;
+   Ecore_X_Gesture_Event_Subtype subtype;
+   int num_fingers;
+   int cx;
+   int cy;
+   Ecore_X_Time hold_time;
+ };
+ 
+ struct _Ecore_X_Event_Gesture_Notify_Group
+ {
+    Ecore_X_Window win;
+    Ecore_X_Time time;
+    Ecore_X_Gesture_Group_Subtype subtype;
+    int num_groups;
+    int group_id;
+ };
+ 
+ EAPI Eina_Bool
+ ecore_x_gesture_supported(void);
+ 
+ EAPI Eina_Bool
+ ecore_x_gesture_events_select(Ecore_X_Window win,
+                               Ecore_X_Gesture_Event_Mask mask);
+ 
+ EAPI Ecore_X_Gesture_Event_Mask
+ ecore_x_gesture_events_selected_get(Ecore_X_Window win);
+ 
+ EAPI Eina_Bool
+ ecore_x_gesture_event_grab(Ecore_X_Window win,
+                            Ecore_X_Gesture_Event_Type type,
+                            int num_fingers);
+ 
+ EAPI Eina_Bool
+ ecore_x_gesture_event_ungrab(Ecore_X_Window win,
+                              Ecore_X_Gesture_Event_Type type,
+                              int num_fingers);
+ 
  #ifdef __cplusplus
  }
  #endif // ifdef __cplusplus