rpms/firefox/FC-3 firefox-1.0-candidate-window.patch, NONE, 1.1 firefox-1.0-imgloader-comarray.patch, NONE, 1.1 firefox.spec, 1.49, 1.50 sources, 1.9, 1.10

[fedora-cvs-commits redhat com]

Author: caillon

Update of /cvs/dist/rpms/firefox/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv5134

Modified Files:
	firefox.spec sources 
Added Files:
	firefox-1.0-candidate-window.patch 
	firefox-1.0-imgloader-comarray.patch 
Log Message:
* Mon Jul 18 2005 Christopher Aillon <caillon redhat com> 0:1.0.6-0.1.fc3
- 1.0.6 Candidate Release


firefox-1.0-candidate-window.patch:
 nsWindow.cpp |   46 ++++++++++++++++++++++++++++++++++++++++------
 nsWindow.h   |    1 +
 2 files changed, 41 insertions(+), 6 deletions(-)

--- NEW FILE firefox-1.0-candidate-window.patch ---
--- mozilla-1.7.5.orig/widget/src/gtk2/nsWindow.cpp	2005-02-07 14:07:33.000000000 +0900
+++ mozilla-1.7.5/widget/src/gtk2/nsWindow.cpp	2005-02-07 15:21:18.000000000 +0900
@@ -211,6 +211,7 @@
                                        nsWindow *aWindow);
 static void IM_set_text_range         (const PRInt32 aLen,
                                        const gchar *aPreeditString,
+                                       const gint aCursorPos,
                                        const PangoAttrList *aFeedback,
                                        PRUint32 *aTextRangeListLengthResult,
                                        nsTextRangeArray *aTextRangeListResult);
@@ -3954,12 +3955,28 @@
 
     nsEventStatus status;
     DispatchEvent(&compEvent, status);
+
+    gint x1, y1, x2, y2;
+    GtkWidget *widget =
+        get_gtk_widget_for_gdk_window(this->mDrawingarea->inner_window);
+
+    gdk_window_get_origin(widget->window, &x1, &y1);
+    gdk_window_get_origin(this->mDrawingarea->inner_window, &x2, &y2);
+
+    GdkRectangle area;
+    area.x = compEvent.theReply.mCursorPosition.x + (x2 - x1);
+    area.y = compEvent.theReply.mCursorPosition.y + (y2 - y1);
+    area.width  = 0;
+    area.height = compEvent.theReply.mCursorPosition.height;
+
+    gtk_im_context_set_cursor_location(IMEGetContext(), &area);
 }
 
 void
 nsWindow::IMEComposeText (const PRUnichar *aText,
                           const PRInt32 aLen,
                           const gchar *aPreeditString,
+                          const gint aCursorPos,
                           const PangoAttrList *aFeedback)
 {
     // Send our start composition event if we need to
@@ -3973,7 +3990,7 @@
         textEvent.theText = (PRUnichar*)aText;
 
         if (aPreeditString && aFeedback && (aLen > 0)) {
-            IM_set_text_range(aLen, aPreeditString, aFeedback,
+            IM_set_text_range(aLen, aPreeditString, aCursorPos, aFeedback,
                               &(textEvent.rangeCount),
                               &(textEvent.rangeArray));
         }
@@ -3985,6 +4002,21 @@
     if (textEvent.rangeArray) {
         delete[] textEvent.rangeArray;
     }
+
+    gint x1, y1, x2, y2;
+    GtkWidget *widget =
+        get_gtk_widget_for_gdk_window(this->mDrawingarea->inner_window);
+
+    gdk_window_get_origin(widget->window, &x1, &y1);
+    gdk_window_get_origin(this->mDrawingarea->inner_window, &x2, &y2);
+
+    GdkRectangle area;
+    area.x = textEvent.theReply.mCursorPosition.x + (x2 - x1);
+    area.y = textEvent.theReply.mCursorPosition.y + (y2 - y1);
+    area.width  = 0;
+    area.height = textEvent.theReply.mCursorPosition.height;
+
+    gtk_im_context_set_cursor_location(IMEGetContext(), &area);
 }
 
 void
@@ -4075,6 +4107,7 @@
         return;
   
     // Should use cursor_pos ?
+    // Of course!!!
     gtk_im_context_get_preedit_string(aContext, &preedit_string,
                                       &feedback_list, &cursor_pos);
   
@@ -4083,7 +4116,7 @@
 
     if (!preedit_string || !*preedit_string) {
         LOGIM(("preedit ended\n"));
-        window->IMEComposeText(NULL, 0, NULL, NULL);
+        window->IMEComposeText(NULL, 0, NULL, 0, NULL);
         window->IMEComposeEnd();
         return;
     }
@@ -4107,7 +4140,7 @@
 
     if (uniStrLen) {
         window->IMEComposeText(NS_STATIC_CAST(const PRUnichar *, uniStr),
-                               uniStrLen, preedit_string, feedback_list);
+                               uniStrLen, preedit_string, cursor_pos, feedback_list);
     }
 
     g_free(preedit_string);
@@ -4168,7 +4201,7 @@
 
     if (uniStrLen) {
         window->IMEComposeText((const PRUnichar *)uniStr,
-                               (PRInt32)uniStrLen, NULL, NULL);
+                               (PRInt32)uniStrLen, NULL, 0, NULL);
         window->IMEComposeEnd();
     }
 
@@ -4187,6 +4220,7 @@
 void
 IM_set_text_range(const PRInt32 aLen,
                   const gchar *aPreeditString,
+                  const gint aCursorPos,
                   const PangoAttrList *aFeedback,
                   PRUint32 *aTextRangeListLengthResult,
                   nsTextRangeArray *aTextRangeListResult)
@@ -4216,8 +4250,8 @@
     
     // Set caret's postion
     SET_FEEDBACKTYPE(0, NS_TEXTRANGE_CARETPOSITION);
-    START_OFFSET(0) = aLen;
-    END_OFFSET(0) = aLen;
+    START_OFFSET(0) = aCursorPos;
+    END_OFFSET(0) = aCursorPos;
 
     int count = 0;
     PangoAttribute * aPangoAttr;
--- mozilla-1.7.5.orig/widget/src/gtk2/nsWindow.h	2005-02-07 14:07:33.000000000 +0900
+++ mozilla-1.7.5/widget/src/gtk2/nsWindow.h	2005-02-07 15:21:18.000000000 +0900
@@ -258,6 +258,7 @@
     void               IMEComposeText    (const PRUnichar *aText,
                                           const PRInt32 aLen,
                                           const gchar *aPreeditString,
+                                          const gint aCursorPos,
                                           const PangoAttrList *aFeedback);
     void               IMEComposeEnd     (void);
     GtkIMContext*      IMEGetContext     (void);

firefox-1.0-imgloader-comarray.patch:
 imgLoader.cpp |   16 +++++-----------
 imgLoader.h   |    4 ++--
 2 files changed, 7 insertions(+), 13 deletions(-)

--- NEW FILE firefox-1.0-imgloader-comarray.patch ---
Index: modules/libpr0n/src/imgLoader.cpp
===================================================================
RCS file: /cvsroot/mozilla/modules/libpr0n/src/imgLoader.cpp,v
retrieving revision 1.78.2.2
diff -d -u -p -r1.78.2.2 imgLoader.cpp
--- modules/libpr0n/src/imgLoader.cpp	16 Aug 2004 18:06:37 -0000	1.78.2.2
+++ modules/libpr0n/src/imgLoader.cpp	15 Jul 2005 04:31:06 -0000
@@ -896,7 +896,7 @@ void imgCacheValidator::AddProxy(imgRequ
   // the network.
   aProxy->AddToLoadGroup();
 
-  mProxies.AppendElement(aProxy);
+  mProxies.AppendObject(aProxy);
 }
 
 /** nsIRequestObserver methods **/
@@ -909,13 +909,10 @@ NS_IMETHODIMP imgCacheValidator::OnStart
     PRBool isFromCache;
     if (NS_SUCCEEDED(cacheChan->IsFromCache(&isFromCache)) && isFromCache) {
 
-      PRUint32 count;
-      mProxies.Count(&count);
+      PRUint32 count = mProxies.Count();
       for (PRInt32 i = count-1; i>=0; i--) {
-        imgRequestProxy *proxy;
-        mProxies.GetElementAt(i, (nsISupports**)&proxy);
+        imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
         mRequest->NotifyProxyListener(proxy);
-        NS_RELEASE(proxy);
       }
 
       mRequest->SetLoadId(mContext);
@@ -964,14 +961,11 @@ NS_IMETHODIMP imgCacheValidator::OnStart
 
   mDestListener = NS_STATIC_CAST(nsIStreamListener*, pl);
 
-  PRUint32 count;
-  mProxies.Count(&count);
+  PRUint32 count = mProxies.Count();
   for (PRInt32 i = count-1; i>=0; i--) {
-    imgRequestProxy *proxy;
-    mProxies.GetElementAt(i, (nsISupports**)&proxy);
+    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
     proxy->ChangeOwner(request);
     request->NotifyProxyListener(proxy);
-    NS_RELEASE(proxy);
   }
 
   NS_RELEASE(request);
Index: modules/libpr0n/src/imgLoader.h
===================================================================
RCS file: /cvsroot/mozilla/modules/libpr0n/src/imgLoader.h,v
retrieving revision 1.10.38.1
diff -d -u -p -r1.10.38.1 imgLoader.h
--- modules/libpr0n/src/imgLoader.h	16 Aug 2004 18:06:37 -0000	1.10.38.1
+++ modules/libpr0n/src/imgLoader.h	15 Jul 2005 04:31:06 -0000
@@ -90,7 +90,7 @@ private:
  * validate checker
  */
 
-#include "nsSupportsArray.h"
+#include "nsCOMArray.h"
 
 class imgCacheValidator : public nsIStreamListener
 {
@@ -109,7 +109,7 @@ private:
   nsCOMPtr<nsIStreamListener> mDestListener;
 
   imgRequest *mRequest;
-  nsSupportsArray mProxies;
+  nsCOMArray<imgIRequest> mProxies;
 
   void *mContext;
 };


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-3/firefox.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- firefox.spec	15 May 2005 14:52:43 -0000	1.49
+++ firefox.spec	18 Jul 2005 22:17:39 -0000	1.50
@@ -9,8 +9,8 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        1.0.4
-Release:        1.3.1
+Version:        1.0.6
+Release:        0.1.fc3
 Epoch:          0
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
@@ -60,6 +60,8 @@
 Patch103:       firefox-1.0-gtk-system-colors.patch
 Patch104:       firefox-1.0-remote-intern-atoms.patch
 Patch105:       firefox-1.0-g-application-name.patch
+Patch106:       firefox-1.0-candidate-window.patch
+Patch107:       firefox-1.0-imgloader-comarray.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libpng-devel, libjpeg-devel
@@ -118,6 +120,8 @@
 %patch103 -p0
 %patch104 -p0
 %patch105 -p0
+%patch106 -p1
+%patch107 -p0
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -276,6 +280,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Jul 18 2005 Christopher Aillon <caillon redhat com> 0:1.0.6-0.1.fc3
+- 1.0.6 Candidate Release
+
 * Sun May 15 2005 Christopher Aillon <caillon redhat com>
 - Re-enable jsd now that there are venkman versions that work with Firefox
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	13 May 2005 18:36:03 -0000	1.9
+++ sources	18 Jul 2005 22:17:39 -0000	1.10
@@ -1,2 +1,2 @@
 b742f86f641fd59d52acbb30e206195a  firefox-1.0-langpacks-3.tar.bz2
-0f5d0586750fde79ba98ecf3ee4425a7  firefox-1.0.4-source.tar.bz2
+7b4c1d10d478dcb4c52fbbe3e41745d9  firefox-1.0.6-source.tar.bz2