Elementary migration revision 69832

Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
	src/bin/test_genlist.c
	src/examples/anchorblock_example_01.c
	src/lib/elc_ctxpopup.c
	src/lib/elc_multibuttonentry.c
	src/lib/elm_entry.c
	src/lib/elm_genlist.c
	src/lib/elm_genlist.h
	src/lib/elm_map.c
	src/lib/elm_panes.c
	src/lib/elm_spinner.c
	src/lib/elm_toolbar.c
	src/lib/els_scroller.c

diff --cc .gitignore
Simple merge

diff --cc config/default/base.src
Simple merge

diff --cc config/illume/base.src
index 27a2857,2f01b06..bfba60a
--- 1/config/illume/base.src
--- 2/config/illume/base.src
+++ b/config/illume/base.src
@@@ -13,11 -13,10 +13,11 @@@ group "Elm_Config" struct 
    value "zoom_friction" double: 0.5;
    value "thumbscroll_border_friction" double: 0.5;
    value "thumbscroll_sensitivity_friction" double: 0.25;
 +  value "scroll_smooth_time_interval" double: 0.008;
    value "scroll_smooth_amount" double: 1.0;
-   value "scroll_smooth_history_weight" double: 0.3;
+   value "scroll_smooth_history_weight" double: 0.1;
    value "scroll_smooth_future_time" double: 0.0;
-   value "scroll_smooth_time_window" double: 0.2;
+   value "scroll_smooth_time_window" double: 0.01;
    value "scale" double: 1.0;
    value "bgpixmap" int: 0;
    value "compositing" int: 1;

diff --cc configure.ac
index 46d311b,6f24d20..22be3c5
mode 100755,100644..100755
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac

diff --cc data/edje_externals/Makefile.am
Simple merge

diff --cc data/edje_externals/icons.edc
index 3e6cbf5,34962c0..4964e99
--- 1/data/edje_externals/icons.edc
--- 2/data/edje_externals/icons.edc
+++ b/data/edje_externals/icons.edc
@@@ -33,5 -31,6 +33,4 @@@ ICON("slider"
  ICON("slideshow")
  ICON("spinner")
  ICON("thumb")
- ICON("toggle")
  ICON("toolbar")
 -ICON("slideshow")
 -

diff --cc debian/libelm.postinst
index 6e48905,0000000..ddf3789
mode 100755,000000..100755
--- 1/debian/libelm.postinst
--- /dev/null
+++ b/debian/libelm.postinst
@@@ -1,3 -1,0 +1,9 @@@
- exit 0;
 +#! /bin/sh
++cd /usr/lib
++if [ -e "libelementary-ver-pre-svn-09.so.0" ]; then
++        echo "libelm 09.so file exists"
++else
++        echo "creating libelm 09.so file"
++fi
 +
++ln -sf libelementary.so.1.0.0 libelementary-ver-pre-svn-09.so.0

diff --cc src/bin/test_dayselector.c
Simple merge

diff --cc src/bin/test_genlist.c
Simple merge

diff --cc src/bin/test_label.c
Simple merge

diff --cc src/bin/test_tooltip.c
Simple merge

diff --cc src/bin/test_win_plug.c
index 103dcc7,8d88bc4..8d88bc4
mode 100755,100644..100755
--- 1/src/bin/test_win_plug.c
--- 2/src/bin/test_win_plug.c
+++ b/src/bin/test_win_plug.c

diff --cc src/bin/test_win_socket.c
index 1a93ecb,d8b87ba..d8b87ba
mode 100755,100644..100755
--- 1/src/bin/test_win_socket.c
--- 2/src/bin/test_win_socket.c
+++ b/src/bin/test_win_socket.c

diff --cc src/lib/elc_multibuttonentry.c
index de95033,ab34839..22eadb3
--- 1/src/lib/elc_multibuttonentry.c
--- 2/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@@ -704,10 -703,10 +703,10 @@@ _button_clicked(void *data, Evas_Objec
     Elm_Multibuttonentry_Item *item = NULL;
     if (!wd || wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) return;
  
 -   _change_current_button(data, obj);
 +   _select_button(data, obj);
  
-    if (wd->current)
-      if ((item = eina_list_data_get(wd->current)) != NULL)
+    if (wd->selected_it)
+      if ((item = (Elm_Multibuttonentry_Item *)wd->selected_it) != NULL)
         {
            evas_object_smart_callback_call(data, SIG_ITEM_CLICKED, item);
            _select_button(data, item->button);

diff --cc src/lib/elc_popup.c
Simple merge

diff --cc src/lib/elm_cnp.c
index d44e8ba,6c9728a..b705e04
--- 1/src/lib/elm_cnp.c
--- 2/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@@ -724,9 -715,8 +724,9 @@@ notify_handler_targets(Cnp_Selection *s
                    if ((j == CNP_ATOM_text_uri) ||
                        (j == CNP_ATOM_text_urilist))
                      {
-                       if(!is_uri_type_data(sel, notify)) continue;
+                       if (!is_uri_type_data(sel, notify)) continue;
                      }
 +#endif
                    cnp_debug("Atom %s matches\n",atoms[j].name);
                    goto done;
                 }

diff --cc src/lib/elm_config.c
Simple merge

diff --cc src/lib/elm_config.h
Simple merge

diff --cc src/lib/elm_datetime.c
Simple merge

diff --cc src/lib/elm_diskselector.c
Simple merge

diff --cc src/lib/elm_entry.c
index 20a0b69,740c8db..a538d93
--- 1/src/lib/elm_entry.c
--- 2/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@@ -1653,7 -1399,8 +1652,8 @@@ _long_press(void *data
  {
     Widget_Data *wd = elm_widget_data_get(data);
     if (!wd) return ECORE_CALLBACK_CANCEL;
-    //_menu_press(data);  /////// TIZEN ONLY
 -   if (!_elm_config->desktop_entry)
 -     _menu_press(data);
++   /*if (!_elm_config->desktop_entry)
++     _menu_press(data);*/ /////// TIZEN ONLY
     wd->longpress_timer = NULL;
     evas_object_smart_callback_call(data, SIG_LONGPRESSED, NULL);
     return ECORE_CALLBACK_CANCEL;

diff --cc src/lib/elm_entry.h
Simple merge

diff --cc src/lib/elm_genlist.h
Simple merge

diff --cc src/lib/elm_index.c
Simple merge

diff --cc src/lib/elm_index.h
Simple merge

diff --cc src/lib/elm_map.c
Simple merge

diff --cc src/lib/elm_panes.c
Simple merge

diff --cc src/lib/elm_plug.h
index 8196d9a,01afbbd..01afbbd
mode 100755,100644..100755
--- 1/src/lib/elm_plug.h
--- 2/src/lib/elm_plug.h
+++ b/src/lib/elm_plug.h

diff --cc src/lib/elm_removed.h
Simple merge

diff --cc src/lib/elm_slider.c
Simple merge

diff --cc src/lib/elm_spinner.c
Simple merge

diff --cc src/lib/elm_toolbar.c
Simple merge

diff --cc src/lib/elm_widget.h
Simple merge

diff --cc src/lib/elm_win.c
Simple merge

diff --cc src/lib/elm_win.h
Simple merge

diff --cc src/lib/els_scroller.c
Simple merge