From 5022c6391c387e6f3b3d9758962b48a585f46de4 Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <friedrich@kogmbh.com>
Date: Wed, 2 Oct 2013 00:22:05 +0200
Subject: [PATCH] Fixup patches against upstream

---
 src/patches/MemberListView-OCavatar.patch | 15 ++++++++++++---
 src/patches/hideCaretAvatar.patch         |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/patches/MemberListView-OCavatar.patch b/src/patches/MemberListView-OCavatar.patch
index 0b3d7b00..9b655eb4 100644
--- a/src/patches/MemberListView-OCavatar.patch
+++ b/src/patches/MemberListView-OCavatar.patch
@@ -1,8 +1,8 @@
 diff --git a/js/3rdparty/webodf/editor/MemberListView.js b/js/3rdparty/webodf/editor/MemberListView.js
-index cbab8ec..a6381aa 100644
+index cbab8ec..f51aec3 100644
 --- a/js/3rdparty/webodf/editor/MemberListView.js
 +++ b/js/3rdparty/webodf/editor/MemberListView.js
-@@ -73,6 +73,10 @@ define("webodf/editor/MemberListView",
+@@ -73,6 +73,9 @@ define("webodf/editor/MemberListView",
                              node.src = memberDetails.imageurl;
                              // update border color
                              node.style.borderColor = memberDetails.color;
@@ -12,7 +12,7 @@ index cbab8ec..a6381aa 100644
                          } else if (node.localName === "div") {
                              node.setAttribute('fullname', memberDetails.fullname);
                          }
-@@ -92,7 +96,7 @@ define("webodf/editor/MemberListView",
+@@ -92,7 +95,7 @@ define("webodf/editor/MemberListView",
              var doc = memberListDiv.ownerDocument,
                  htmlns = doc.documentElement.namespaceURI,
                  avatarDiv = doc.createElementNS(htmlns, "div"),
@@ -21,3 +21,12 @@ index cbab8ec..a6381aa 100644
                  fullnameNode = doc.createElement("div");
  
              avatarDiv.className = "memberListButton";
+@@ -110,7 +113,7 @@ define("webodf/editor/MemberListView",
+             avatarDiv.onclick = function () {
+                 var caret = editorSession.sessionView.getCaret(memberId);
+                 if (caret) {
+-                    caret.toggleHandleVisibility();
++                    //caret.toggleHandleVisibility();
+                 }
+             };
+             memberListDiv.appendChild(avatarDiv);
diff --git a/src/patches/hideCaretAvatar.patch b/src/patches/hideCaretAvatar.patch
index 0ff36198..dcf5d7d9 100644
--- a/src/patches/hideCaretAvatar.patch
+++ b/src/patches/hideCaretAvatar.patch
@@ -10,4 +10,4 @@ index 644f4b5..50881a2 100644
 +                            caretAvatarsInitiallyVisible: false,
                              caretBlinksOnRangeSelect: true
                          };
- 
\ No newline at end of file
+