Merge remote branch 'origin/upstream'

Conflicts:
	po/cs.po
	po/de.po
	po/fr.po
	po/it.po
	po/nl.po
	po/pt.po
	po/sl.po

diff --cc po/cs.po
Simple merge

diff --cc src/lib/ecore_x/Ecore_X.h
Simple merge

diff --cc src/lib/ecore_x/xlib/ecore_x_atoms.c
Simple merge

diff --cc src/lib/ecore_x/xlib/ecore_x_e.c
index 3e3e3f4,5966bbd..2f76dc9
--- 1/src/lib/ecore_x/xlib/ecore_x_e.c
--- 2/src/lib/ecore_x/xlib/ecore_x_e.c
+++ b/src/lib/ecore_x/xlib/ecore_x_e.c
@@@ -766,87 -766,10 +766,87 @@@ ecore_x_e_illume_quickpanel_position_up
                                   ECORE_X_ATOM_E_ILLUME_QUICKPANEL_POSITION_UPDATE,
                                   ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                   1, 0, 0, 0, 0);
- } /* ecore_x_e_illume_quickpanel_position_update_send */
+ }
  
 +/* 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)
 +{
 +   LOGFN(__FILE__, __LINE__, __FUNCTION__);
 +   ecore_x_window_prop_card32_set(win, 
 +                                  ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE, 
 +                                  &is_visible, 1);
 +} /* ecore_x_e_illume_sliding_win_state_set */
 +
 +EAPI int 
 +ecore_x_e_illume_sliding_win_state_get(Ecore_X_Window win)
 +{
 +   unsigned int is_visible = 0;
 +   
 +   LOGFN(__FILE__, __LINE__, __FUNCTION__);
 +   if (!ecore_x_window_prop_card32_get(win,
 +                                       ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE, 
 +                                       &is_visible, 1))
 +      return 0;
 +
 +   return is_visible;
 +}
 +
 +EAPI void
 +ecore_x_e_illume_sliding_win_geometry_set(Ecore_X_Window win,
 +                                          int            x,
 +                                          int            y,
 +                                          int            w,
 +                                          int            h)
 +{
 +   unsigned int geom[4];
 +
 +   LOGFN(__FILE__, __LINE__, __FUNCTION__);
 +   geom[0] = x;
 +   geom[1] = y;
 +   geom[2] = w;
 +   geom[3] = h;
 +   ecore_x_window_prop_card32_set(win,
 +                                  ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_GEOMETRY, 
 +                                  geom, 4);
 +} /* ecore_x_e_illume_sliding_win_geometry_set */
 +
 +EAPI int 
 +ecore_x_e_illume_sliding_win_geometry_get(Ecore_X_Window win,
 +                                          int           *x,
 +                                          int           *y,
 +                                          int           *w,
 +                                          int           *h)
 +{
 +   int ret = 0;
 +   unsigned int geom[4];
 +   
 +   LOGFN(__FILE__, __LINE__, __FUNCTION__);
 +   ret = 
 +     ecore_x_window_prop_card32_get(win, 
 +                                    ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_GEOMETRY, 
 +                                    geom, 4);
 +   if (ret != 4)
 +      return 0;
 +   
 +   if (x)
 +      *x = geom[0];
 +   
 +   if (y)
 +      *y = geom[1];
 +   
 +   if (w)
 +      *w = geom[2];
 +   
 +   if (h)
 +      *h = geom[3];
 +   
 +   return 1;
 +}/* ecore_x_e_illume_sliding_win_geometry_get */
 +
  EAPI void
- ecore_x_e_comp_sync_counter_set(Ecore_X_Window       win,
+ ecore_x_e_comp_sync_counter_set(Ecore_X_Window win,
                                  Ecore_X_Sync_Counter counter)
  {
     LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@@ -1133,59 -1056,5 +1133,59 @@@ ecore_x_e_comp_pixmap_get(Ecore_X_Windo
       return 0;
  
     return pixmap;
- } /* ecore_x_e_comp_pixmap_get */
+ }
  
 +EAPI void
 +ecore_x_e_comp_dri_buff_flip_supported_set(Ecore_X_Window root, Eina_Bool enabled)
 +{
 +  Ecore_X_Window win;
 +  
 +  if (!root) root = DefaultRootWindow(_ecore_x_disp);
 +  LOGFN(__FILE__, __LINE__, __FUNCTION__);
 +  if (enabled)
 +    {
 +      win = ecore_x_window_new(root, 1, 2, 3, 4);
 +      ecore_x_window_prop_xid_set(win, ECORE_X_ATOM_E_COMP_DRI_BUFF_FLIP_SUPPORTED,
 +                                  ECORE_X_ATOM_WINDOW, &win, 1);
 +      ecore_x_window_prop_xid_set(root, ECORE_X_ATOM_E_COMP_DRI_BUFF_FLIP_SUPPORTED,
 +                                  ECORE_X_ATOM_WINDOW, &win, 1);
 +    }
 +  else
 +    {
 +      int ret =
 +        ecore_x_window_prop_xid_get(root,
 +                                    ECORE_X_ATOM_E_COMP_DRI_BUFF_FLIP_SUPPORTED,
 +                                    ECORE_X_ATOM_WINDOW,
 +                                    &win, 1);
 +      if ((ret == 1) && (win))
 +        {
 +          ecore_x_window_prop_property_del(root, ECORE_X_ATOM_E_COMP_DRI_BUFF_FLIP_SUPPORTED);
 +          ecore_x_window_free(win);
 +        }
 +    }
 +}
 +
 +EAPI Eina_Bool
 +ecore_x_e_comp_dri_buff_flip_supported_get(Ecore_X_Window root)
 +{
 +  Ecore_X_Window win, win2;
 +  int ret;
 +  
 +  LOGFN(__FILE__, __LINE__, __FUNCTION__);
 +  if (!root) root = DefaultRootWindow(_ecore_x_disp);
 +  ret =
 +    ecore_x_window_prop_xid_get(root,
 +                                ECORE_X_ATOM_E_COMP_DRI_BUFF_FLIP_SUPPORTED,
 +                                ECORE_X_ATOM_WINDOW,
 +                                &win, 1);
 +  if ((ret == 1) && (win))
 +    {
 +      ret =
 +        ecore_x_window_prop_xid_get(win,
 +                                    ECORE_X_ATOM_E_COMP_DRI_BUFF_FLIP_SUPPORTED,
 +                                    ECORE_X_ATOM_WINDOW,
 +                                    &win2, 1);
 +      if ((ret == 1) && (win2 == win)) return EINA_TRUE;
 +    }
 +  return EINA_FALSE;
 +}