Migration with svn revision 66972

Merge remote branch 'origin/upstream'

Conflicts:
	.gitignore
	src/lib/ecore_con/Ecore_Con.h
	src/lib/ecore_con/ecore_con.c
	src/lib/ecore_con/ecore_con_private.h
	src/lib/ecore_con/ecore_con_socks.c
	src/lib/ecore_con/ecore_con_url.c

diff --cc .gitignore
index 018755d,1454d80..05282f7
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -88,29 -88,4 +88,30 @@@ Makefile.i
  /src/bin/ecore_test
  /src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h
  /src/util/makekeys
+ INSTALL
 +debian/*.debhelper.log
 +debian/*.substvars
 +debian/*.debhelper
 +debian/libecore-bin/
 +config.guess.cdbs-orig
 +config.sub.cdbs-orig
 +debian/files
 +debian/libecore-con/
 +debian/libecore-config/
 +debian/libecore-data/
 +debian/libecore-dbg/
 +debian/libecore-dev/
 +debian/libecore-doc/
 +debian/libecore-evas/
 +debian/libecore-fb/
 +debian/libecore-file/
 +debian/libecore-imf/
 +debian/libecore-input/
 +debian/libecore-ipc/
 +debian/libecore-x/
 +debian/libecore/
 +debian/stamp-*
 +debian/tmp/
 +doc/html/
 +doc/latex/
 +doc/man/

diff --cc ecore.spec.in
Simple merge

diff --cc po/cs.po
index b2aa554,9b39679..091e92d
--- 1/po/cs.po
--- 2/po/cs.po
+++ b/po/cs.po
@@@ -12,8 -13,10 +12,8 @@@ msgstr "
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
 -"X-Generator: Lokalize 1.2\n"
 -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
  
- #: src/lib/ecore/ecore_getopt.c:90
+ #: src/lib/ecore/ecore_getopt.c:91
  msgid "Version:"
  msgstr "Verze:"
  
@@@ -150,17 -153,17 +150,17 @@@ msgstr "CHYBA: nebyly poskytnuty argume
  msgid "ERROR: invalid options found."
  msgstr "CHYBA: nalezeny neplatné volby."
  
- #: src/lib/ecore/ecore_getopt.c:1830
+ #: src/lib/ecore/ecore_getopt.c:1831
  #, c-format
  msgid " See --%s.\n"
 -msgstr " Viz --%s.\n"
 +msgstr " viz. --%s.\n"
  
- #: src/lib/ecore/ecore_getopt.c:1832
+ #: src/lib/ecore/ecore_getopt.c:1833
  #, c-format
  msgid " See -%c.\n"
 -msgstr " Viz -%c.\n"
 +msgstr " viz. -%c.\n"
  
- #: src/lib/ecore/ecore_getopt.c:1873
+ #: src/lib/ecore/ecore_getopt.c:1874
  #, c-format
  msgid "ERROR: incorrect geometry value '%s'\n"
  msgstr "CHYBA: neplatná hodnota geometrie '%s'\n"

diff --cc src/lib/ecore/ecore_thread.c
Simple merge

diff --cc src/lib/ecore_con/Ecore_Con.h
index bf58f86,c37ff83..4915484
--- 1/src/lib/ecore_con/Ecore_Con.h
--- 2/src/lib/ecore_con/Ecore_Con.h
+++ b/src/lib/ecore_con/Ecore_Con.h
@@@ -1875,7 -1875,7 +1875,11 @@@ EAPI Eina_Bool ecore_con_url_proxy_set(
   *
   * @see ecore_con_url_proxy_set()
   *
++<<<<<<< HEAD
 + * @since 1.2 
++=======
+  * @since 1.2
++>>>>>>> origin/upstream
   */
  EAPI Eina_Bool ecore_con_url_proxy_username_set(Ecore_Con_Url *url_con, const char *username);
  

diff --cc src/lib/ecore_con/ecore_con_url.c
Simple merge

diff --cc src/lib/ecore_evas/ecore_evas_private.h
Simple merge

diff --cc src/lib/ecore_evas/ecore_evas_x.c
Simple merge

diff --cc src/lib/ecore_imf/Ecore_IMF.h
Simple merge

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

diff --cc src/modules/immodules/xim/ecore_imf_xim.c
index 7c40606,f2fd6a4..5317466
--- 1/src/modules/immodules/xim/ecore_imf_xim.c
--- 2/src/modules/immodules/xim/ecore_imf_xim.c
+++ b/src/modules/immodules/xim/ecore_imf_xim.c
@@@ -204,6 -226,43 +226,51 @@@ _ecore_imf_context_xim_preedit_string_g
  }
  
  static void
+ _ecore_imf_context_xim_preedit_string_with_attributes_get(Ecore_IMF_Context *ctx,
+                                           char             **str,
+                                           Eina_List        **attrs,
+                                           int               *cursor_pos)
+ {
+    EINA_LOG_DBG("in");
+ 
++#ifdef ENABLE_XIM
+    Ecore_IMF_Context_Data *imf_context_data = ecore_imf_context_data_get(ctx);
+ 
+    _ecore_imf_context_xim_preedit_string_get(ctx, str, cursor_pos);
+ 
+    if (!attrs) return;
+    if (!imf_context_data || !imf_context_data->feedbacks) return;
+ 
+    int i = 0;
+    XIMFeedback last_feedback = 0;
+    int start = -1;
+ 
+    for (i = 0; i < imf_context_data->preedit_length; i++)
+      {
+         XIMFeedback new_feedback = imf_context_data->feedbacks[i] & FEEDBACK_MASK;
+ 
+         if (new_feedback != last_feedback)
+           {
+              if (start >= 0)
+                add_feedback_attr (attrs, *str, last_feedback, start, i);
+ 
+              last_feedback = new_feedback;
+              start = i;
+           }
+      }
+ 
+    if (start >= 0)
+      add_feedback_attr (attrs, *str, last_feedback, start, i);
++#else
++   if(str)
++     *str = NULL;
++   *attrs = NULL;
++   if(cursor_pos)
++     *cursor_pos = 0;
++#endif
+ }
+ 
+ static void
  _ecore_imf_context_xim_focus_in(Ecore_IMF_Context *ctx)
  {
     EINA_LOG_DBG("in");
@@@ -332,6 -398,36 +406,38 @@@ _ecore_imf_context_xim_use_preedit_set(
  #endif
  }
  
++#ifdef ENABLE_XIM
+ static void
+ add_feedback_attr (Eina_List **attrs,
+                    const char   *str,
+                    XIMFeedback   feedback,
+                    int           start_pos,
+                    int           end_pos)
+ {
+    Ecore_IMF_Preedit_Attr *attr = NULL;
+ 
+    unsigned int start_index = utf8_offset_to_index (str, start_pos);
+    unsigned int end_index = utf8_offset_to_index (str, end_pos);
+ 
+    if (feedback & FEEDBACK_MASK)
+     {
+         attr = (Ecore_IMF_Preedit_Attr *)calloc(1, sizeof(Ecore_IMF_Preedit_Attr));
+         attr->start_index = start_index;
+         attr->end_index = end_index;
+         *attrs = eina_list_append(*attrs, (void *)attr);
+     }
+ 
+    if (feedback & XIMUnderline)
+      attr->preedit_type = ECORE_IMF_PREEDIT_TYPE_SUB1;
+ 
+    if (feedback & XIMReverse)
+      attr->preedit_type = ECORE_IMF_PREEDIT_TYPE_SUB2;
+ 
+    if (feedback & XIMHighlight)
+      attr->preedit_type = ECORE_IMF_PREEDIT_TYPE_SUB3;
+ }
++#endif
+ 
  static void
  _ecore_imf_context_xim_cursor_location_set (Ecore_IMF_Context   *ctx,
                                              int x, int y, int w, int h)