rpms/thunderbird/FC-3 firefox-1.0-candidate-window.patch, NONE, 1.1 firefox-1.0-g-application-name.patch, NONE, 1.1 firefox-1.0-imgloader-comarray.patch, NONE, 1.1 sources, 1.6, 1.7 thunderbird.spec, 1.23, 1.24 firefox-1.0-execshield-nspr.patch, 1.1, NONE firefox-1.0-execshield-xpcom.patch, 1.1, NONE firefox-1.0-nspr-s390.patch, 1.1, NONE firefox-1.0-xptcall-s390.patch, 1.1, NONE mozilla-1.7.3-xptcall-s390.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jul 18 22:28:05 UTC 2005
- Previous message (by thread): 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
- Next message (by thread): rpms/iiimf/devel xiiimp-pango.patch,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caillon
Update of /cvs/dist/rpms/thunderbird/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv10075
Modified Files:
sources thunderbird.spec
Added Files:
firefox-1.0-candidate-window.patch
firefox-1.0-g-application-name.patch
firefox-1.0-imgloader-comarray.patch
Removed Files:
firefox-1.0-execshield-nspr.patch
firefox-1.0-execshield-xpcom.patch firefox-1.0-nspr-s390.patch
firefox-1.0-xptcall-s390.patch
mozilla-1.7.3-xptcall-s390.patch
Log Message:
* Mon Jul 18 2005 Christopher Aillon <caillon at redhat.com> 1.0.6-0.1.fc3
- 1.0.6 Release Candidate
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-g-application-name.patch:
nsAppRunner.cpp | 18 ++++++++++++++++++
1 files changed, 18 insertions(+)
--- NEW FILE firefox-1.0-g-application-name.patch ---
Index: toolkit/xre/nsAppRunner.cpp
===================================================================
RCS file: /cvsroot/mozilla/toolkit/xre/nsAppRunner.cpp,v
retrieving revision 1.68
diff -d -u -p -r1.68 nsAppRunner.cpp
--- toolkit/xre/nsAppRunner.cpp 22 Feb 2005 21:49:43 -0000 1.68
+++ toolkit/xre/nsAppRunner.cpp 28 Feb 2005 04:28:58 -0000
@@ -1456,6 +1456,11 @@ public:
};
#endif
+#ifdef MOZ_WIDGET_GTK2
+#include "prlink.h"
+typedef void (*_g_set_application_name_fn)(const gchar *application_name);
+#endif
+
int xre_main(int argc, char* argv[], const nsXREAppData* aAppData)
{
nsresult rv;
@@ -1598,6 +1603,19 @@ int xre_main(int argc, char* argv[], con
#endif
gtk_init(&gArgc, &gArgv);
+#if defined(MOZ_WIDGET_GTK2)
+ // g_set_application_name () is only defined in glib2.2 and higher.
+ PRLibrary *glib2;
+ _g_set_application_name_fn _g_set_application_name =
+ (_g_set_application_name_fn)PR_FindFunctionSymbolAndLibrary("g_set_application_name", &glib2);
+ if (_g_set_application_name) {
+ _g_set_application_name(gAppData->appName);
+ }
+ if (glib2) {
+ PR_UnloadLibrary(glib2);
+ }
+#endif
+
gtk_widget_set_default_visual(gdk_rgb_get_visual());
gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
#endif /* MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 */
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: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 23 Mar 2005 16:41:58 -0000 1.6
+++ sources 18 Jul 2005 22:28:02 -0000 1.7
@@ -1 +1 @@
-9e5b8a3edb3ced400e769dc2faa45317 thunderbird-1.0.2-source.tar.bz2
+a0ddcc8bd5ee2c9be724b6963ad27111 thunderbird-1.0.6-source.tar.bz2
Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-3/thunderbird.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- thunderbird.spec 13 May 2005 21:30:43 -0000 1.23
+++ thunderbird.spec 18 Jul 2005 22:28:02 -0000 1.24
@@ -7,8 +7,8 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
-Version: 1.0.2
-Release: 1.3.3
+Version: 1.0.6
+Release: 0.1.fc3
Epoch: 0
URL: http://www.mozilla.org/projects/thunderbird/
License: MPL
@@ -53,14 +53,12 @@
# Already upstreamed
Patch101: thunderbird-0.8.0-pkgconfig.patch
-Patch103: mozilla-1.7.3-xptcall-s390.patch
-Patch104: firefox-1.0-xptcall-s390.patch
-Patch105: firefox-1.0-nspr-s390.patch
-Patch106: thunderbird-1.0-useragent.patch
-Patch107: firefox-1.0-execshield-nspr.patch
-Patch108: firefox-1.0-execshield-xpcom.patch
-Patch109: firefox-1.0-gtk-system-colors.patch
-Patch110: firefox-1.0-remote-intern-atoms.patch
+Patch102: thunderbird-1.0-useragent.patch
+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, gtk2-devel
@@ -112,14 +110,12 @@
%patch41 -p0
%patch90 -p0 -b .gtk-file-chooser-morefixes
%patch101 -p0 -b .pkgconfig
+%patch102 -p0
%patch103 -p0
-%patch104 -p1
+%patch104 -p0
%patch105 -p0
-%patch106 -p0
+%patch106 -p1
%patch107 -p0
-%patch108 -p0
-%patch109 -p0
-%patch110 -p0
#===============================================================================
@@ -193,6 +189,9 @@
#===============================================================================
%changelog
+* Mon Jul 18 2005 Christopher Aillon <caillon at redhat.com> 1.0.6-0.1.fc3
+- 1.0.6 Release Candidate
+
* Fri May 13 2005 Christopher Aillon <caillon at redhat.com> 1.0.2-1.3.3
- Respect MOZ_DISABLE_PANGO
- Update pango patches to include latest fixes, including for bidi justify
--- firefox-1.0-execshield-nspr.patch DELETED ---
--- firefox-1.0-execshield-xpcom.patch DELETED ---
--- firefox-1.0-nspr-s390.patch DELETED ---
--- firefox-1.0-xptcall-s390.patch DELETED ---
--- mozilla-1.7.3-xptcall-s390.patch DELETED ---
- Previous message (by thread): 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
- Next message (by thread): rpms/iiimf/devel xiiimp-pango.patch,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list