[oe-commits] org.oe.dev merge of 'b5c2080b62dd6480fdd3b3687e291ee915379afd'

oe commit oe at amethyst.openembedded.net
Sat Mar 22 11:37:37 UTC 2008


merge of 'b5c2080b62dd6480fdd3b3687e291ee915379afd'
     and 'c49f478890b0d92c1c59e4c0cf0d74b6990e6745'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 5b214d5b98fc841f5638a7aae10346be791d4f6e
ViewMTN: http://monotone.openembedded.org/revision/info/5b214d5b98fc841f5638a7aae10346be791d4f6e
Files:
1
classes/efl_base.bbclass
packages/efl1/epsilon
packages/efl1/epsilon/compile-fix.patch
packages/efl1/epsilon/server-is-not-client.patch
packages/efl1/evas/fix-configure.patch
packages/efl1/evas/pagesize.patch
classes/efl_library.bbclass
classes/efl.bbclass
packages/efl1/imlib2_1.4.1.000.bb
packages/efl1/imlib2_cvs.bb
packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx
packages/linux/linux-2.6.24/ts72xx
packages/tetex
packages/nonworking/tetex
packages/twisted/twisted-2.5.0
packages/python/python-twisted-2.5.0
packages/twisted/twisted_2.5.0.bb
packages/python/python-twisted_2.5.0.bb
packages/linux/linux-omap1-2.6.24-omap1
packages/e17/e-wm/disable-e-cursor.patch
packages/efl1/epsilon/fix_alignment_error.patch
packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch
packages/linux/linux-omap1-2.6.24-omap1/binutils-buildid-arm.patch
packages/linux/linux-omap1-2.6.24-omap1/defconfig
packages/linux/linux-omap1_2.6.24-omap1.bb
packages/python/python-pygtk/prevent_to_get_display_during_import.patch
conf/distro/include/sane-srcdates.inc
conf/machine/ts72xx.conf
contrib/python/generate-manifest-2.5.py
packages/e17/e-wm_cvs.bb
packages/efl1/ecore.inc
packages/efl1/edb_cvs.bb
packages/efl1/edbus_cvs.bb
packages/efl1/edje_cvs.bb
packages/efl1/eet_cvs.bb
packages/efl1/eflpp_cvs.bb
packages/efl1/efreet_cvs.bb
packages/efl1/embryo_cvs.bb
packages/efl1/emotion_cvs.bb
packages/efl1/engrave_cvs.bb
packages/efl1/enhance_cvs.bb
packages/efl1/epdf_cvs.bb
packages/efl1/epeg_cvs.bb
packages/efl1/epsilon_cvs.bb
packages/efl1/esmart_cvs.bb
packages/efl1/etk-native_cvs.bb
packages/efl1/etk_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
packages/efl1/evolve_cvs.bb
packages/efl1/ewl_cvs.bb
packages/efl1/exml_cvs.bb
packages/linux/linux-2.6.24/ts72xx/ep93xx-gpio-interrupt-debounce.diff
packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c-bus.diff
packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c.diff
packages/linux/linux-2.6.24/ts72xx/ep93xx-leds.diff
packages/linux/linux-2.6.24/ts72xx/ep93xx-maverick-uniqid.patch
packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-clocks.diff
packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-uartbaud.diff
packages/linux/linux-2.6.24/ts72xx/ep93xx-timer-accuracy.diff
packages/linux/linux-2.6.24/ts72xx/series
packages/linux/linux-2.6.24/ts72xx/ts72xx-machine-id-fix.patch
packages/linux/linux-2.6.24/ts72xx/ts72xx-nfbit-fix.patch
packages/linux/linux-2.6.24/ts72xx/ts72xx-use-cpld-reset.patch
packages/linux/linux-2.6.24/ts72xx/ts72xx-watchdog.patch
packages/linux/linux_2.6.24.bb
packages/python/python-2.5-manifest.inc
packages/python/python-ecore_cvs.bb
packages/python/python-edbus_cvs.bb
packages/python/python-edje_cvs.bb
packages/python/python-epsilon_cvs.bb
packages/python/python-formencode_svn.bb
packages/python/python-pygtk_2.10.4.bb
packages/python/python-pysqlite2_2.4.0.bb
packages/python/python-sqlobject_0.9.1.bb
packages/tasks/task-python-everything.bb
packages/glib-2.0/glib-2.0_2.16.1.bb
Diffs:

#
# mt diff -rb5c2080b62dd6480fdd3b3687e291ee915379afd -r5b214d5b98fc841f5638a7aae10346be791d4f6e
#
#
#
# delete "classes/efl_base.bbclass"
# 
# delete "packages/efl1/epsilon"
# 
# delete "packages/efl1/epsilon/compile-fix.patch"
# 
# delete "packages/efl1/epsilon/server-is-not-client.patch"
# 
# delete "packages/efl1/evas/fix-configure.patch"
# 
# delete "packages/efl1/evas/pagesize.patch"
# 
# rename "classes/efl_library.bbclass"
#     to "classes/efl.bbclass"
# 
# rename "packages/efl1/imlib2_1.4.1.000.bb"
#     to "packages/efl1/imlib2_cvs.bb"
# 
# rename "packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx"
#     to "packages/linux/linux-2.6.24/ts72xx"
# 
# rename "packages/tetex"
#     to "packages/nonworking/tetex"
# 
# rename "packages/twisted/twisted-2.5.0"
#     to "packages/python/python-twisted-2.5.0"
# 
# rename "packages/twisted/twisted_2.5.0.bb"
#     to "packages/python/python-twisted_2.5.0.bb"
# 
# add_dir "packages/efl1/epsilon"
# 
# add_dir "packages/linux/linux-omap1-2.6.24-omap1"
# 
# add_file "packages/e17/e-wm/disable-e-cursor.patch"
#  content [691fa1b1366b7b2dc2e4f8dabd0ecba62406d407]
# 
# add_file "packages/efl1/epsilon/fix_alignment_error.patch"
#  content [57859821302f8bd1520f50df76cdb4e75d71d8e0]
# 
# add_file "packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch"
#  content [8ffef06194b29e2b22abed7edb6044a5ad4316d7]
# 
# add_file "packages/linux/linux-omap1-2.6.24-omap1/binutils-buildid-arm.patch"
#  content [450eaeee5ad06f6a335498a5d3c8cf6a0d6465d1]
# 
# add_file "packages/linux/linux-omap1-2.6.24-omap1/defconfig"
#  content [9f1536c5f2c793aa250eaf70e845ce53baae9521]
# 
# add_file "packages/linux/linux-omap1_2.6.24-omap1.bb"
#  content [4a6c582a9685167ac03820d31261bc5c2ed4d475]
# 
# add_file "packages/python/python-pygtk/prevent_to_get_display_during_import.patch"
#  content [f9fd2d212befeeeec03b1fa306b56cc23f02f0f3]
# 
# patch "classes/efl.bbclass"
#  from [9f05c0b66273f55a4febe214ee17814ca010f922]
#    to [812d079a9b429c552508ab74839a4404eb45a0df]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [3dd1a196e482da03ba4107a6b06975fd0f997875]
#    to [f95a0a7a90230afcb63264eef972e31be7d8622f]
# 
# patch "conf/machine/ts72xx.conf"
#  from [9b366e974ba4cab6f20f48c9c94e5b4e7f4dbb0a]
#    to [8fd67aab0a2a5d0c9f09e07b6b98973bce905c27]
# 
# patch "contrib/python/generate-manifest-2.5.py"
#  from [52d051dca521630ef1ef4e37f1e346503652bcae]
#    to [16126e312062487bf91b7314da2178b5146d04f0]
# 
# patch "packages/e17/e-wm_cvs.bb"
#  from [2257fc48c13eef3f9a2d015680eee7ed70c6b167]
#    to [30e8a7e80783fa3d3c697eaa85a84f9109988105]
# 
# patch "packages/efl1/ecore.inc"
#  from [c4d7e192157f599c231b67a6298d08da551f9cd2]
#    to [2ebb4427d05c26ac7aeea4cc122ac019813f57bb]
# 
# patch "packages/efl1/edb_cvs.bb"
#  from [54392dfc853fbcd20b44803de6c5f3b91f488074]
#    to [8dbf42fc209cfd4e3abc970b18a7225533056354]
# 
# patch "packages/efl1/edbus_cvs.bb"
#  from [3c44c1091be07a94b0aeebd75bf2d9693bdb0298]
#    to [45f56ca80c3ce2f61d98980e32989c248e15a909]
# 
# patch "packages/efl1/edje_cvs.bb"
#  from [651ab5e3265e556ae79b9f809c4a345f3b87739b]
#    to [7fd344e45307e880572dab5a4ab2d8f8467ba1df]
# 
# patch "packages/efl1/eet_cvs.bb"
#  from [0540f3c9a184c0016866cf3e28d6cf60612c548d]
#    to [eada78b9148d3a22f1b46d69d3aabbdfe747410c]
# 
# patch "packages/efl1/eflpp_cvs.bb"
#  from [2d95e8b0fc6b9dc8aca0b07ec27251d0eb4d9839]
#    to [d4bd7d99d11b2047b25e820fdf0c47acd70d4260]
# 
# patch "packages/efl1/efreet_cvs.bb"
#  from [eafca9ec13aa035e7d425da3addbff7c5274c705]
#    to [4b80740afd5106d5bc474fa4921c6522ca473d30]
# 
# patch "packages/efl1/embryo_cvs.bb"
#  from [79c4589004660f326e476191a6a522f75318fbba]
#    to [54dc755d8be69024d06ad360043068177617795e]
# 
# patch "packages/efl1/emotion_cvs.bb"
#  from [455d6b3619396ffdc95940c2c7bd52705fd508fd]
#    to [07bb0f3a78b355b1d80ffc58470ee989fb34b92f]
# 
# patch "packages/efl1/engrave_cvs.bb"
#  from [bec559cdd998186f53c02ed352d159987b2b2e41]
#    to [752c8bb49b03d223c3d8e0d2f6f77b54e450f100]
# 
# patch "packages/efl1/enhance_cvs.bb"
#  from [98e5f9a53bbca75e2b369d6556728f366b26ade6]
#    to [3c3ac34bd582b0b09e2895e72b03c256f214da63]
# 
# patch "packages/efl1/epdf_cvs.bb"
#  from [cc4469584c9d183ecc4e0a17b9f37d7f77df098c]
#    to [cf9b3d50ac3aaff3dfc89a7dc654af20369399cc]
# 
# patch "packages/efl1/epeg_cvs.bb"
#  from [fceb3b23bf774810acb12e16ce0a0e7d904868a0]
#    to [f6daf317074d6c4a1975daf882557beacc576d98]
# 
# patch "packages/efl1/epsilon_cvs.bb"
#  from [0a73ef6a0168069d9d5f62492b4fdee938f9aa9a]
#    to [7ec5c502b536c6c127630cb9fb7208aa661fef65]
# 
# patch "packages/efl1/esmart_cvs.bb"
#  from [cacbf3b70f73a7e32bcb35bd2ce022641432b9ea]
#    to [6502bab7ea2f2d0380e49644e4204603a1395ff1]
# 
# patch "packages/efl1/etk-native_cvs.bb"
#  from [24762ce075076d9dcc7feea45c57ad02ea43ea76]
#    to [a3658eeb40a0ab13cb3f4738bf070b308faedd27]
# 
# patch "packages/efl1/etk_cvs.bb"
#  from [74244567bcd7506fb878b7e1e0b5e527e5a6fbe6]
#    to [1c4ad62955a3041ca60b191f4f46f758a4a45cb4]
# 
# patch "packages/efl1/evas.inc"
#  from [f4bea097c84b09f97ff301ce61d6fedfa3111605]
#    to [13da3a3288def60746b06f49f1e6bf070fb91d53]
# 
# patch "packages/efl1/evas_cvs.bb"
#  from [e5ac12c8a85a913c0003451c4a2c123294ac0f81]
#    to [698aa57979dcff374e859909316b7b53c0a2b985]
# 
# patch "packages/efl1/evolve_cvs.bb"
#  from [28b3b6d8799b62cf4ed73c7cce33e729e5eb548c]
#    to [8aa01b6c728b2a3f2b4327d628ddf5d6595cbbdb]
# 
# patch "packages/efl1/ewl_cvs.bb"
#  from [4b95b18bfd82af00f7025839e31897d752b42ee1]
#    to [4b58bff160ea1363790f37cde48a9303c7129239]
# 
# patch "packages/efl1/exml_cvs.bb"
#  from [36dc5bf1bc769d147967195abcd043d4bce849c6]
#    to [7ae5127036e12c4f7b4225f0136bc6647f68a96b]
# 
# patch "packages/efl1/imlib2_cvs.bb"
#  from [35e237b0b8c615f5fe4ad44272e7f65610fb9f12]
#    to [90324b9d8bfadfca430da3b72c2b1f9c7089ee52]
# 
# patch "packages/linux/linux-2.6.24/ts72xx/ep93xx-gpio-interrupt-debounce.diff"
#  from [3e856dd2c7992a018c6cb8fe9a26191c17a6e055]
#    to [510939f3dffa0076cb444533c2a9fcc73e77e608]
# 
# patch "packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c-bus.diff"
#  from [1db06a0347ad0160a6262ef05705db0c5db1e4b6]
#    to [8aa79d024361dbb1705a3abecbba82dbaea22cbc]
# 
# patch "packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c.diff"
#  from [137d7f8d63547f61d6b83c319f260209db9d8f91]
#    to [7bb762ed416f965a879963a0e227f9cd328b22fa]
# 
# patch "packages/linux/linux-2.6.24/ts72xx/ep93xx-leds.diff"
#  from [1427a72d12b9661f072f0d54c9b801e3c079eb50]
#    to [ac5718455988f990195c37157db138cfb7fb7209]
# 
# patch "packages/linux/linux-2.6.24/ts72xx/ep93xx-maverick-uniqid.patch"
#  from [ca670dd52e2c733c74f0863ea0aa40cd30e62180]
#    to [dd8628ed8d80f173fcfe3797e6fa5f8915542293]
# 
# patch "packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-clocks.diff"
#  from [766f51c6987da4d9c623468750b1c4456062845a]
#    to [caaf55febda10de0c622ad77a1a1b9147c2eb243]
# 
# patch "packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-uartbaud.diff"
#  from [5758d57c8c7c76884797a233fe28d30603f21144]
#    to [001e398bd2f0f0f366c51f297fb08b4103354f53]
# 
# patch "packages/linux/linux-2.6.24/ts72xx/ep93xx-timer-accuracy.diff"
#  from [2f46ef27261aabeb1d84d31eb18b0cbb08dd6463]
#    to [2d31e748fffbb5f188bbdeaf78db63965c0a38a4]
# 
# patch "packages/linux/linux-2.6.24/ts72xx/series"
#  from [677eccc1d3ac7717e78e9bc5992d2c439f5456ee]
#    to [da9eaa908db1f3c3d7df01953b8b968e004cfa0d]
# 
# patch "packages/linux/linux-2.6.24/ts72xx/ts72xx-machine-id-fix.patch"
#  from [f1caea79bc8de4ba601ad32b282407e46fe3bb3b]
#    to [d1f57ca232c66197a97d2740e04e4450e42fb8a9]
# 
# patch "packages/linux/linux-2.6.24/ts72xx/ts72xx-nfbit-fix.patch"
#  from [400b246da270e51a298d5ae7783d015fca9eaa1b]
#    to [b2905e1fb9eb74198a2f22046bf61f0a0a454f47]
# 
# patch "packages/linux/linux-2.6.24/ts72xx/ts72xx-use-cpld-reset.patch"
#  from [9c102624e4f524146326a4649de5897da0f3aa92]
#    to [8f624609c2ed156f3533e582d89bac28ce798a3e]
# 
# patch "packages/linux/linux-2.6.24/ts72xx/ts72xx-watchdog.patch"
#  from [e59a839378c989516a1a37d3b6a09efe43b59df3]
#    to [cea9a7836589ce7be2bcf9154bed281ffe535fe5]
# 
# patch "packages/linux/linux_2.6.24.bb"
#  from [0b77562c24e62555c0952e5c6a0ebce85aaa1a43]
#    to [3a65f5f434a205d1dd49627ecc559afbd538e97d]
# 
# patch "packages/python/python-2.5-manifest.inc"
#  from [e0702c0a123bad512850c3846b66ef177cad94ad]
#    to [173662ecbf40b201a0b75f4180dd8d97c2f50227]
# 
# patch "packages/python/python-ecore_cvs.bb"
#  from [b6e5ba00d6b809a3e441d6dc27d125164f78dacb]
#    to [295b506ca49ac388cae093ccba64b02d1f6b2716]
# 
# patch "packages/python/python-edbus_cvs.bb"
#  from [d5e8bad1f13826a22bcd975f9899d3048049d345]
#    to [84a39a7d332d8aa54046abcac66077f4ba5eb935]
# 
# patch "packages/python/python-edje_cvs.bb"
#  from [46da9e504d792e8cd17a35cec8ebeea2f9a49c58]
#    to [ef6e8f44e5b801745baea7c2b97b971af0d44178]
# 
# patch "packages/python/python-epsilon_cvs.bb"
#  from [ba4915bb31b83045d2be815f9b219c081c2701e1]
#    to [9f5c98bb51edd45539997c8b10d02f82fd752abf]
# 
# patch "packages/python/python-formencode_svn.bb"
#  from [fade2e233328120a69f7b22dd50ef7e4e4cd24ef]
#    to [995ce038699f2d5945763364f9771367d6620600]
# 
# patch "packages/python/python-pygtk_2.10.4.bb"
#  from [fea6fa33b56f90fb6590ac797faea3276a26a642]
#    to [f60288eea0692b27b7b07ff9273844bfc4e49051]
# 
# patch "packages/python/python-pysqlite2_2.4.0.bb"
#  from [617a7751e48a571c7049118a1ddff35a47317af5]
#    to [439b12ac31b2ea0c8628abd2ba75d8468432f5fb]
# 
# patch "packages/python/python-sqlobject_0.9.1.bb"
#  from [18fd8fad77d7ed01e3bd8016f6b2cebc9b5a903b]
#    to [4a2fce26ddc66216c05c3991860fd20ed7dac9e6]
# 
# patch "packages/python/python-twisted_2.5.0.bb"
#  from [57c038114b0b4ffa18a4791796f8d3ff6aa97b96]
#    to [a918b7400f29ab63d4dab26793a19ad016e04ace]
# 
# patch "packages/tasks/task-python-everything.bb"
#  from [f571afc0d386839fce66445019667bf7edf84284]
#    to [b5a47ec309aff31f780978156e341ad708eae74a]
#
============================================================
--- packages/e17/e-wm/disable-e-cursor.patch	691fa1b1366b7b2dc2e4f8dabd0ecba62406d407
+++ packages/e17/e-wm/disable-e-cursor.patch	691fa1b1366b7b2dc2e4f8dabd0ecba62406d407
@@ -0,0 +1,277 @@
+Index: e/src/bin/e_config.c
+===================================================================
+--- e.orig/src/bin/e_config.c
++++ e/src/bin/e_config.c
+@@ -461,6 +461,7 @@ e_config_init(void)
+    E_CONFIG_VAL(D, T, focus_last_focused_per_desktop, INT); /**/
+    E_CONFIG_VAL(D, T, focus_revert_on_hide_or_close, INT); /**/
+    E_CONFIG_VAL(D, T, pointer_slide, INT); /**/
++   E_CONFIG_VAL(D, T, show_cursor, INT); /**/
+    E_CONFIG_VAL(D, T, use_e_cursor, INT); /**/
+    E_CONFIG_VAL(D, T, cursor_size, INT); /**/
+    E_CONFIG_VAL(D, T, menu_autoscroll_margin, INT); /**/
+@@ -705,6 +706,7 @@ e_config_init(void)
+    e_config->focus_last_focused_per_desktop = 1;
+    e_config->focus_revert_on_hide_or_close = 1;
+    e_config->pointer_slide = 1;
++   e_config->show_cursor = 1;
+    e_config->use_e_cursor = 1;
+    e_config->cursor_size = 32;
+    e_config->menu_autoscroll_margin = 0;
+@@ -1570,6 +1572,7 @@ e_config_init(void)
+    E_CONFIG_LIMIT(e_config->focus_last_focused_per_desktop, 0, 1);
+    E_CONFIG_LIMIT(e_config->focus_revert_on_hide_or_close, 0, 1);
+    E_CONFIG_LIMIT(e_config->pointer_slide, 0, 1);
++   E_CONFIG_LIMIT(e_config->show_cursor, 0, 1);
+    E_CONFIG_LIMIT(e_config->use_e_cursor, 0, 1);
+    E_CONFIG_LIMIT(e_config->cursor_size, 0, 1024);
+    E_CONFIG_LIMIT(e_config->menu_autoscroll_margin, 0, 50);
+Index: e/src/modules/conf_mouse_cursor/e_int_config_cursor.c
+===================================================================
+--- e.orig/src/modules/conf_mouse_cursor/e_int_config_cursor.c
++++ e/src/modules/conf_mouse_cursor/e_int_config_cursor.c
+@@ -3,16 +3,25 @@
+ static void        *_create_data(E_Config_Dialog *cfd);
+ static void        _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+ static int         _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
++static void        _basic_show_cursor_cb_change(void *data, Evas_Object *obj);
+ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+ static int         _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
++static void        _advanced_show_cursor_cb_change(void *data, Evas_Object *obj);
+ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+ 
+ struct _E_Config_Dialog_Data 
+ {
++   int show_cursor;
+    int use_e_cursor;
+ 
+    /* Advanced */
+    int cursor_size;
++
++   struct
++     {
++         Evas_Object *radio_use_e_cursor;
++         Evas_Object *slider_cursor_size;
++     } gui;
+ };
+ 
+ EAPI E_Config_Dialog *
+@@ -41,6 +50,7 @@ e_int_config_cursor(E_Container *con, co
+ static void
+ _fill_data(E_Config_Dialog_Data *cfdata) 
+ {
++   cfdata->show_cursor = e_config->show_cursor;
+    cfdata->use_e_cursor = e_config->use_e_cursor;
+    cfdata->cursor_size = e_config->cursor_size;
+ }
+@@ -66,9 +76,11 @@ _basic_apply_data(E_Config_Dialog *cfd, 
+ {
+    int changed = 0;
+    
++   if (e_config->show_cursor != cfdata->show_cursor) changed = 1;
+    if (e_config->use_e_cursor != cfdata->use_e_cursor) changed = 1;
+    
+    e_config->use_e_cursor = cfdata->use_e_cursor;
++   e_config->show_cursor = cfdata->show_cursor;
+    e_config_save_queue();
+    
+    if (changed) 
+@@ -79,6 +91,11 @@ _basic_apply_data(E_Config_Dialog *cfd, 
+ 	  {
+ 	     E_Manager *man;
+ 	     man = l->data;
++         if (man->pointer && !e_config->show_cursor)
++           {
++               e_pointer_hide(man->pointer);
++               continue;
++           }
+ 	     if (man->pointer) e_object_del(E_OBJECT(man->pointer));
+ 	     man->pointer = e_pointer_window_new(man->root, 1);
+ 	  }
+@@ -86,6 +103,17 @@ _basic_apply_data(E_Config_Dialog *cfd, 
+    return 1;
+ }
+ 
++static void
++_basic_show_cursor_cb_change(void *data, Evas_Object *obj)
++{
++   E_Config_Dialog_Data *cfdata;
++
++   cfdata = data;
++   if (!cfdata) return;
++
++   e_widget_disabled_set(cfdata->gui.radio_use_e_cursor, !cfdata->show_cursor);
++}
++
+ static Evas_Object *
+ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+ {
+@@ -94,8 +122,14 @@ _basic_create_widgets(E_Config_Dialog *c
+    
+    o = e_widget_list_add(evas, 0, 0);
+       
++   ob = e_widget_check_add(evas, _("Show Cursor"), &(cfdata->show_cursor));
++   e_widget_on_change_hook_set(ob, _basic_show_cursor_cb_change, cfdata);
++   e_widget_list_object_append(o, ob, 1, 1, 0.5);
++
+    of = e_widget_framelist_add(evas, _("Cursor Settings"), 0);
+    rg = e_widget_radio_group_new(&cfdata->use_e_cursor);
++   cfdata->gui.radio_use_e_cursor = rg;
++
+    ob = e_widget_radio_add(evas, _("Use Enlightenment Cursor"), 1, rg);   
+    e_widget_framelist_object_append(of, ob);
+    ob = e_widget_radio_add(evas, _("Use X Cursor"), 0, rg);   
+@@ -111,9 +145,11 @@ _advanced_apply_data(E_Config_Dialog *cf
+ {
+    int changed = 0;
+    
++   if (e_config->show_cursor != cfdata->show_cursor) changed = 1;
+    if (e_config->use_e_cursor != cfdata->use_e_cursor) changed = 1;
+    if (e_config->cursor_size != cfdata->cursor_size) changed = 1;
+-   
++
++   e_config->show_cursor = cfdata->show_cursor;
+    e_config->use_e_cursor = cfdata->use_e_cursor;
+    if (cfdata->cursor_size <= 0) cfdata->cursor_size = 1;
+    e_config->cursor_size = cfdata->cursor_size;
+@@ -128,6 +164,11 @@ _advanced_apply_data(E_Config_Dialog *cf
+ 	  {
+ 	     E_Manager *man;
+ 	     man = l->data;
++         if (man->pointer && !e_config->show_cursor)
++           {
++               e_pointer_hide(man->pointer);
++               continue;
++           }
+ 	     if (man->pointer) e_object_del(E_OBJECT(man->pointer));
+ 	     man->pointer = e_pointer_window_new(man->root, 1);
+ 	  }	
+@@ -135,6 +176,18 @@ _advanced_apply_data(E_Config_Dialog *cf
+    return 1;
+ }
+ 
++static void
++_advanced_show_cursor_cb_change(void *data, Evas_Object *obj)
++{
++   E_Config_Dialog_Data *cfdata;
++
++   cfdata = data;
++   if (!cfdata) return;
++
++   e_widget_disabled_set(cfdata->gui.radio_use_e_cursor, !cfdata->show_cursor);
++   e_widget_disabled_set(cfdata->gui.slider_cursor_size, !cfdata->show_cursor);
++}
++
+ static Evas_Object *
+ _advanced_create_widgets(E_Config_Dialog *cfd,%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rc49f478890b0d92c1c59e4c0cf0d74b6990e6745 -r5b214d5b98fc841f5638a7aae10346be791d4f6e
#
#
#
# patch "packages/glib-2.0/glib-2.0_2.16.1.bb"
#  from [d529224930628fa212035aa5d6d59d7868e6caf4]
#    to [3a48d903a74285a67c66bab7fd96be2bf1e1270a]
#
============================================================
--- packages/glib-2.0/glib-2.0_2.16.1.bb	d529224930628fa212035aa5d6d59d7868e6caf4
+++ packages/glib-2.0/glib-2.0_2.16.1.bb	3a48d903a74285a67c66bab7fd96be2bf1e1270a
@@ -1,5 +1,7 @@ require glib.inc
 require glib.inc
 
+PR = "r3"
+
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1 \






More information about the Openembedded-commits mailing list