Merge branch 'upstream'

Conflicts:
	po/sl.po
	src/lib/ecore_imf/Ecore_IMF.h

diff --cc po/sl.po
Simple merge

diff --cc src/lib/ecore_imf/Ecore_IMF.h
index 406423e,21df2a0..c6c4811
--- 1/src/lib/ecore_imf/Ecore_IMF.h
--- 2/src/lib/ecore_imf/Ecore_IMF.h
+++ b/src/lib/ecore_imf/Ecore_IMF.h
@@@ -421,33 -330,7 +421,34 @@@ struct _Ecore_IMF_Context_Clas
     Ecore_IMF_Input_Panel_Layout (*input_panel_layout_get) (Ecore_IMF_Context *ctx);
     void (*input_panel_language_set) (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Lang lang);
     Ecore_IMF_Input_Panel_Lang (*input_panel_language_get) (Ecore_IMF_Context *ctx);
+    void (*cursor_location_set) (Ecore_IMF_Context *ctx, int x, int y, int w, int h);
 +
 +   void (*input_panel_imdata_set)         (Ecore_IMF_Context *ctx, const char* data, int len);
 +   void (*input_panel_imdata_get)         (Ecore_IMF_Context *ctx, char* data, int *len);
 +
 +   void (*input_panel_use_effect_set)     (Ecore_IMF_Context *ctx, Eina_Bool use_effect);
 +   void (*input_panel_orient_set)         (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Orient orientation);
 +
 +   void (*input_panel_move) (Ecore_IMF_Context *ctx, int x, int y);
 +   void (*input_panel_geometry_get)       (Ecore_IMF_Context *ctx, int *x, int *y, int *w, int *h);
 +   void (*input_panel_private_key_set)    (Ecore_IMF_Context *ctx, int layout_index, int key_index, const char *img_path, const char* label, const char* value);
 +   void (*input_panel_key_disabled_set)   (Ecore_IMF_Context *ctx, int layout_index, int key_index, Eina_Bool disabled);
 +
 +   void (*input_panel_reset)              (Ecore_IMF_Context *ctx); /* Same as reset to default property*/
 +   Ecore_IMF_Input_Panel_State (*input_panel_state_get) (Ecore_IMF_Context *ctx);
 +
 +   /* CallBack APIs  */
 +   void (*input_panel_event_callback_add) (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Event type, void (*pEventCallBackFunc) (void *data, Ecore_IMF_Context *ctx, int value), void *data);
 +   void (*input_panel_event_callback_del) (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Event type, void (*pEventCallbackFunc) (void *data, Ecore_IMF_Context *ctx, int value));
 +
 +   /* ISF related APIs */
 +   int (*ise_get_ise_language)       (Ecore_IMF_Context *ctx, const char* input_panel_name, char*** langlist);
 +   int (*ise_set_isf_language)       (Ecore_IMF_Context *ctx, const char* lang);
 +   int (*ise_get_active_isename)     (Ecore_IMF_Context *ctx, char* name);       /**< will be deprecated */
 +   int (*ise_set_active_ise_by_name) (Ecore_IMF_Context *ctx, const char* name); /**< will be deprecated */
 +   int (*ise_set_active_ise_by_uuid) (Ecore_IMF_Context *ctx, const char* uuid); /**< will be deprecated */
 +   int (*ise_get_iselist)            (Ecore_IMF_Context *ctx, char*** iselist);  /**< will be deprecated */
 +   void (*input_panel_caps_mode_set) (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Caps_Mode mode);
  };
  
  struct _Ecore_IMF_Context_Info

diff --cc src/lib/ecore_imf/ecore_imf_context.c
Simple merge