[meego-commits] 14715: Changes to Trunk:Testing/google-gadgets

[jieyang]

Hi,
I have made the following changes to google-gadgets in project Trunk:Testing. Please review and accept ASAP.

Thank You,
jieyang

[This message was auto-generated]

---

Request #14715:

  submit:   home:jieyang:branches:Trunk:Testing/google-gadgets(r2)(cleanup) -> Trunk:Testing/google-gadgets


Message:
    add patch to fix #BMC 8962.

State:   new          2011-03-11T22:33:54 jieyang
Comment: None



changes files:
--------------
--- google-gadgets.changes
+++ google-gadgets.changes
@@ -0,0 +1,3 @@
+* Sat Mar 12 2011 Jie yang <yang.jie at intel.com> - 0.11.2.1286_1.13
+- add patch to fix #BMC 8962, implement clipboard in search edit element.
+

new:
----
  clutter_edit_clipboard.patch

spec files:
-----------
--- google-gadgets.spec
+++ google-gadgets.spec
@@ -12,6 +12,9 @@
 Source0:        ggl-%{releaserev}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#patch for #BMC 8962, implement clutter edit clipboard. Keyon.
+Patch1:	clutter_edit_clipboard.patch
+
 # for SVN checkouts
 BuildRequires:  autoconf automake libtool
 
@@ -70,6 +73,7 @@
 # Permission fixes
 chmod -x ggadget/qt/utilities.h
 
+%patch1 -p1
 
 
 %build

other changes:
--------------

++++++ clutter_edit_clipboard.patch (new)
--- clutter_edit_clipboard.patch
+++ clutter_edit_clipboard.patch
+--- a/extensions/clutter_edit_element/clutter_edit_impl.cc	2010-03-09 10:13:17.000000000 +0800
++++ b/extensions/clutter_edit_element/clutter_edit_impl.cc	2011-03-11 17:17:09.565708495 +0800
+@@ -525,6 +525,9 @@
+       Delete();
+     } else if (keyval == CLUTTER_Insert && !shift && !ctrl) {
+       ToggleOverwrite();
++    } else if (keyval >=  CLUTTER_Shift_L && keyval <=  CLUTTER_Alt_R) {
++//control key, should skip. Keyon--20110311
++        return EVENT_RESULT_UNHANDLED;
+     } else {
+       char s[2] = { '\0', '\0' };
+ 
+@@ -1486,7 +1489,15 @@
+     DeleteText(start, end);
+ }
+ 
++static char text[256]={'\0'};//use as clipboard.
+ void ClutterEditImpl::CopyClipboard() {
++  int start, end, i;
++  if (GetSelectionBounds(&start, &end)) {
++	for(i=0;i<end-start;i++){
++      		text[i] = *(char *)(text_.c_str() + start +i);
++	}
++	text[i] = '\0';
++  }
+ }
+ 
+ void ClutterEditImpl::CutClipboard() {
+@@ -1495,6 +1506,8 @@
+ }
+ 
+ void ClutterEditImpl::PasteClipboard() {
++  /* paste */
++	EnterText(text);
+ }
+ 
+ void ClutterEditImpl::BackSpace() {