Hello community,
here is the log from the commit of package mozilla-xulrunner191 for openSUSE:Factory
checked in at Wed Nov 18 11:32:51 CET 2009.
--------
--- mozilla-xulrunner191/mozilla-xulrunner191.changes 2009-11-07 11:28:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/mozilla-xulrunner191/mozilla-xulrunner191.changes 2009-11-16 20:19:06.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Nov 16 16:06:20 CET 2009 - llunak@novell.com
+
+- fix KDE filepicker (bnc#548267,bnc#555438)
+
+-------------------------------------------------------------------
+Fri Nov 13 22:50:53 CET 2009 - llunak@novell.com
+
+- avoid possible deadlock with KDE integration (bnc#555202)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-xulrunner191.spec ++++++
--- /var/tmp/diff_new_pack.w6dDtT/_old 2009-11-18 11:30:02.000000000 +0100
+++ /var/tmp/diff_new_pack.w6dDtT/_new 2009-11-18 11:30:02.000000000 +0100
@@ -37,7 +37,7 @@
#%endif
License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
Version: 1.9.1.5
-Release: 1
+Release: 2
Summary: Mozilla Runtime Environment 1.9.1
Url: http://www.mozilla.org
Group: Productivity/Other
++++++ mozilla-kde.patch ++++++
--- /var/tmp/diff_new_pack.w6dDtT/_old 2009-11-18 11:30:04.000000000 +0100
+++ /var/tmp/diff_new_pack.w6dDtT/_new 2009-11-18 11:30:04.000000000 +0100
@@ -1,5 +1,5 @@
---- mozilla/chrome/src/Makefile.in.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/chrome/src/Makefile.in 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/chrome/src/Makefile.in.sav 2009-11-05 20:08:57.000000000 +0100
++++ mozilla/chrome/src/Makefile.in 2009-11-16 15:37:59.000000000 +0100
@@ -86,6 +86,7 @@ EXTRA_DSO_LDOPTS = \
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
@@ -8,8 +8,8 @@
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
---- mozilla/chrome/src/nsChromeRegistry.cpp.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/chrome/src/nsChromeRegistry.cpp 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/chrome/src/nsChromeRegistry.cpp.sav 2009-11-05 20:08:57.000000000 +0100
++++ mozilla/chrome/src/nsChromeRegistry.cpp 2009-11-16 15:37:59.000000000 +0100
@@ -114,6 +114,7 @@
#include "nsIXULAppInfo.h"
#include "nsIXULRuntime.h"
@@ -230,16 +230,16 @@
continue;
nsDependentCString host(package);
---- mozilla/modules/libpref/src/Makefile.in.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/modules/libpref/src/Makefile.in 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/modules/libpref/src/Makefile.in.sav 2009-11-05 20:09:08.000000000 +0100
++++ mozilla/modules/libpref/src/Makefile.in 2009-11-16 15:37:59.000000000 +0100
@@ -97,3 +97,5 @@ nsPrefService.$(OBJ_SUFFIX): nsPrefServi
@$(MAKE_DEPS_AUTO_CXX)
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS:-O2=-O1) $(_VPATH_SRCS)
endif
+
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
---- mozilla/modules/libpref/src/nsPrefService.cpp.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/modules/libpref/src/nsPrefService.cpp 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/modules/libpref/src/nsPrefService.cpp.sav 2009-11-05 20:09:08.000000000 +0100
++++ mozilla/modules/libpref/src/nsPrefService.cpp 2009-11-16 15:37:59.000000000 +0100
@@ -51,6 +51,7 @@
#include "nsCOMArray.h"
#include "nsXPCOMCID.h"
@@ -300,15 +300,15 @@
NS_ENSURE_SUCCESS(rv, rv);
NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID,
---- mozilla/toolkit/components/downloads/src/Makefile.in.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/toolkit/components/downloads/src/Makefile.in 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/toolkit/components/downloads/src/Makefile.in.sav 2009-11-05 20:09:12.000000000 +0100
++++ mozilla/toolkit/components/downloads/src/Makefile.in 2009-11-16 15:37:59.000000000 +0100
@@ -100,3 +100,4 @@ include $(topsrcdir)/config/rules.mk
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
---- mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp.sav 2009-11-16 15:26:47.000000000 +0100
++++ mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp 2009-11-16 15:37:59.000000000 +0100
@@ -85,6 +85,7 @@
#include "nsDocShellCID.h"
#include "nsIPrivateBrowsingService.h"
@@ -317,7 +317,7 @@
#if defined(XP_WIN) && !defined(WINCE)
#include
-@@ -2299,6 +2300,15 @@ nsDownload::SetState(DownloadState aStat
+@@ -2308,6 +2309,15 @@ nsDownload::SetState(DownloadState aStat
pref->GetBoolPref(PREF_BDM_SHOWALERTONCOMPLETE, &showTaskbarAlert);
if (showTaskbarAlert) {
@@ -333,7 +333,7 @@
PRInt32 alertInterval = 2000;
if (pref)
pref->GetIntPref(PREF_BDM_SHOWALERTINTERVAL, &alertInterval);
-@@ -2334,6 +2344,7 @@ nsDownload::SetState(DownloadState aStat
+@@ -2343,6 +2353,7 @@ nsDownload::SetState(DownloadState aStat
EmptyString());
}
}
@@ -341,8 +341,8 @@
}
#if defined(XP_WIN) && !defined(WINCE)
nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
---- mozilla/toolkit/content/jar.mn.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/toolkit/content/jar.mn 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/toolkit/content/jar.mn.sav 2009-11-05 20:09:13.000000000 +0100
++++ mozilla/toolkit/content/jar.mn 2009-11-16 15:37:59.000000000 +0100
@@ -43,6 +43,8 @@ toolkit.jar:
*+ content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
*+ content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml)
@@ -361,8 +361,8 @@
*+ content/global/bindings/progressmeter.xml (widgets/progressmeter.xml)
*+ content/global/bindings/radio.xml (widgets/radio.xml)
*+ content/global/bindings/resizer.xml (widgets/resizer.xml)
---- mozilla/toolkit/content/widgets/dialog-kde.xml.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/toolkit/content/widgets/dialog-kde.xml 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/toolkit/content/widgets/dialog-kde.xml.sav 2009-11-05 20:09:13.000000000 +0100
++++ mozilla/toolkit/content/widgets/dialog-kde.xml 2009-11-16 15:37:59.000000000 +0100
@@ -19,7 +19,7 @@
---- mozilla/toolkit/content/widgets/preferences-kde.xml.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/toolkit/content/widgets/preferences-kde.xml 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/toolkit/content/widgets/preferences-kde.xml.sav 2009-11-05 20:09:13.000000000 +0100
++++ mozilla/toolkit/content/widgets/preferences-kde.xml 2009-11-16 15:37:59.000000000 +0100
@@ -573,7 +573,7 @@
@@ -415,17 +415,19 @@
#else
pack="end">
---- mozilla/toolkit/system/unixproxy/Makefile.in.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/toolkit/system/unixproxy/Makefile.in 2009-09-14 10:04:14.000000000 +0200
-@@ -64,4 +64,6 @@ CPPSRCS = \
- nsUnixSystemProxySettings.cpp \
+--- mozilla/toolkit/system/unixproxy/Makefile.in.sav 2009-11-16 15:26:00.000000000 +0100
++++ mozilla/toolkit/system/unixproxy/Makefile.in 2009-11-16 15:37:59.000000000 +0100
+@@ -59,6 +59,8 @@ REQUIRES = \
+ mozgnome \
$(NULL)
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+
- include $(topsrcdir)/config/rules.mk
---- mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 2009-09-14 10:04:14.000000000 +0200
+ EXTRA_DSO_LDOPTS += \
+ $(MOZ_LIBPROXY_LIBS) \
+ $(MOZ_COMPONENT_LIBS) \
+--- mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.sav 2009-11-16 15:26:15.000000000 +0100
++++ mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 2009-11-16 15:37:59.000000000 +0100
@@ -49,6 +49,8 @@
#include "nsPrintfCString.h"
#include "nsNetUtil.h"
@@ -482,8 +484,8 @@
+ aResult = *result[ 0 ];
+ return NS_OK;
+}
---- mozilla/toolkit/xre/Makefile.in.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/toolkit/xre/Makefile.in 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/toolkit/xre/Makefile.in.sav 2009-11-05 20:09:14.000000000 +0100
++++ mozilla/toolkit/xre/Makefile.in 2009-11-16 15:37:59.000000000 +0100
@@ -98,6 +98,7 @@ endif
EXPORTS = \
xrecore.h \
@@ -501,9 +503,9 @@
else
CPPSRCS += nsNativeAppSupportDefault.cpp
endif
---- mozilla/toolkit/xre/nsKDEUtils.cpp.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/toolkit/xre/nsKDEUtils.cpp 2009-09-14 10:04:14.000000000 +0200
-@@ -0,0 +1,329 @@
+--- mozilla/toolkit/xre/nsKDEUtils.cpp.sav 2009-11-16 15:37:59.000000000 +0100
++++ mozilla/toolkit/xre/nsKDEUtils.cpp 2009-11-16 15:37:59.000000000 +0100
+@@ -0,0 +1,335 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -705,6 +707,12 @@
+ {
+ if( !startHelper())
+ return false;
++ // if Gtk has meanwhile gotten a grab (bnc#555202, somehow the file dialog
++ // is called with a delay), then do not do anything, as this app would keep
++ // the grabs but block waiting for the helper, which would be unable to do
++ // anything because of the grab
++ if( blockUi && gdk_pointer_is_grabbed())
++ return false;
+ feedCommand( command );
+ // do not store the data in 'this' but in extra structure, just in case there
+ // is reentrancy (can there be? the event loop is re-entered)
@@ -833,8 +841,8 @@
+ fputs( "\\E\n", commandFile ); // done as \E, so it cannot happen in normal data
+ fflush( commandFile );
+ }
---- mozilla/toolkit/xre/nsKDEUtils.h.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/toolkit/xre/nsKDEUtils.h 2009-09-14 10:04:15.000000000 +0200
+--- mozilla/toolkit/xre/nsKDEUtils.h.sav 2009-11-16 15:37:59.000000000 +0100
++++ mozilla/toolkit/xre/nsKDEUtils.h 2009-11-16 15:37:59.000000000 +0100
@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
@@ -913,8 +921,8 @@
+ };
+
+#endif // nsKDEUtils
---- mozilla/uriloader/exthandler/Makefile.in.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/uriloader/exthandler/Makefile.in 2009-09-14 10:04:15.000000000 +0200
+--- mozilla/uriloader/exthandler/Makefile.in.sav 2009-11-05 20:09:14.000000000 +0100
++++ mozilla/uriloader/exthandler/Makefile.in 2009-11-16 15:37:59.000000000 +0100
@@ -109,8 +109,9 @@ endif
LOCAL_INCLUDES = -I$(srcdir)
@@ -926,8 +934,8 @@
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
---- mozilla/uriloader/exthandler/unix/nsCommonRegistry.cpp.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/uriloader/exthandler/unix/nsCommonRegistry.cpp 2009-09-14 10:04:15.000000000 +0200
+--- mozilla/uriloader/exthandler/unix/nsCommonRegistry.cpp.sav 2009-11-16 15:37:59.000000000 +0100
++++ mozilla/uriloader/exthandler/unix/nsCommonRegistry.cpp 2009-11-16 15:37:59.000000000 +0100
@@ -0,0 +1,87 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@@ -1016,8 +1024,8 @@
+ return nsKDERegistry::GetFromType( aMIMEType );
+ return nsGNOMERegistry::GetFromType( aMIMEType );
+}
---- mozilla/uriloader/exthandler/unix/nsCommonRegistry.h.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/uriloader/exthandler/unix/nsCommonRegistry.h 2009-09-14 10:04:15.000000000 +0200
+--- mozilla/uriloader/exthandler/unix/nsCommonRegistry.h.sav 2009-11-16 15:37:59.000000000 +0100
++++ mozilla/uriloader/exthandler/unix/nsCommonRegistry.h 2009-11-16 15:37:59.000000000 +0100
@@ -0,0 +1,56 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -1075,8 +1083,8 @@
+
+ static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType);
+};
---- mozilla/uriloader/exthandler/unix/nsKDERegistry.cpp.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/uriloader/exthandler/unix/nsKDERegistry.cpp 2009-09-14 10:04:15.000000000 +0200
+--- mozilla/uriloader/exthandler/unix/nsKDERegistry.cpp.sav 2009-11-16 15:37:59.000000000 +0100
++++ mozilla/uriloader/exthandler/unix/nsKDERegistry.cpp 2009-11-16 15:37:59.000000000 +0100
@@ -0,0 +1,119 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@@ -1197,8 +1205,8 @@
+ }
+ return nsnull;
+}
---- mozilla/uriloader/exthandler/unix/nsKDERegistry.h.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/uriloader/exthandler/unix/nsKDERegistry.h 2009-09-14 10:04:15.000000000 +0200
+--- mozilla/uriloader/exthandler/unix/nsKDERegistry.h.sav 2009-11-16 15:37:59.000000000 +0100
++++ mozilla/uriloader/exthandler/unix/nsKDERegistry.h 2009-11-16 15:37:59.000000000 +0100
@@ -0,0 +1,61 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -1261,8 +1269,8 @@
+ static already_AddRefed<nsMIMEInfoBase> GetFromHelper(const nsCStringArray& command);
+
+};
---- mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp.sav 2009-09-14 10:02:42.000000000 +0200
-+++ mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 2009-09-14 10:07:10.000000000 +0200
+--- mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp.sav 2009-11-16 15:25:58.000000000 +0100
++++ mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 2009-11-16 15:37:59.000000000 +0100
@@ -44,18 +44,19 @@
@@ -1328,8 +1336,8 @@
if (mimeInfo) {
nsCAutoString type;
mimeInfo->GetType(type);
---- mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp.sav 2009-09-14 10:02:42.000000000 +0200
-+++ mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp 2009-09-14 10:04:15.000000000 +0200
+--- mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp.sav 2009-11-16 15:25:58.000000000 +0100
++++ mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp 2009-11-16 15:37:59.000000000 +0100
@@ -44,7 +44,7 @@
#include "nsOSHelperAppService.h"
#include "nsMIMEInfoUnix.h"
@@ -1375,8 +1383,8 @@
if (gnomeInfo && gnomeInfo->HasExtensions()) {
LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
return gnomeInfo;
---- mozilla/widget/src/gtk2/Makefile.in.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/widget/src/gtk2/Makefile.in 2009-09-14 10:04:15.000000000 +0200
+--- mozilla/widget/src/gtk2/Makefile.in.sav 2009-11-05 20:09:14.000000000 +0100
++++ mozilla/widget/src/gtk2/Makefile.in 2009-11-16 15:37:59.000000000 +0100
@@ -182,6 +182,8 @@ INCLUDES += \
-I$(topsrcdir)/other-licenses/atk-1.0 \
$(NULL)
@@ -1386,8 +1394,8 @@
test_container: mozdrawingarea.o mozcontainer.o test_container.c
$(CC) $(MOZ_GTK2_CFLAGS) -o test_container test_container.c \
mozdrawingarea.o mozcontainer.o \
---- mozilla/widget/src/gtk2/nsFilePicker.cpp.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/widget/src/gtk2/nsFilePicker.cpp 2009-09-14 10:04:15.000000000 +0200
+--- mozilla/widget/src/gtk2/nsFilePicker.cpp.sav 2009-11-05 20:09:14.000000000 +0100
++++ mozilla/widget/src/gtk2/nsFilePicker.cpp 2009-11-16 15:59:10.000000000 +0100
@@ -40,6 +40,7 @@
#include
#include
@@ -1428,17 +1436,18 @@
GET_LIBGTK_FUNC(gtk_file_chooser_set_select_multiple);
GET_LIBGTK_FUNC_OPT(gtk_file_chooser_set_do_overwrite_confirmation);
GET_LIBGTK_FUNC(gtk_file_chooser_set_current_name);
-@@ -442,7 +447,8 @@ nsFilePicker::AppendFilter(const nsAStri
+@@ -442,7 +447,9 @@ nsFilePicker::AppendFilter(const nsAStri
{
if (aFilter.EqualsLiteral("..apps")) {
// No platform specific thing we can do here, really....
- return NS_OK;
++ // Unless it's KDE.
+ if( mMode != modeOpen || !nsKDEUtils::kdeSupport())
+ return NS_OK;
}
nsCAutoString filter, name;
-@@ -590,6 +596,9 @@ confirm_overwrite_file (GtkWidget *paren
+@@ -590,6 +597,9 @@ confirm_overwrite_file (GtkWidget *paren
NS_IMETHODIMP
nsFilePicker::Show(PRInt16 *aReturn)
{
@@ -1448,7 +1457,7 @@
NS_ENSURE_ARG_POINTER(aReturn);
nsXPIDLCString title;
-@@ -605,6 +614,12 @@ nsFilePicker::Show(PRInt16 *aReturn)
+@@ -605,6 +615,12 @@ nsFilePicker::Show(PRInt16 *aReturn)
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
accept_button, GTK_RESPONSE_ACCEPT,
NULL);
@@ -1461,7 +1470,7 @@
if (mAllowURLs) {
_gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), FALSE);
}
-@@ -727,3 +742,221 @@ nsFilePicker::Show(PRInt16 *aReturn)
+@@ -727,3 +743,229 @@ nsFilePicker::Show(PRInt16 *aReturn)
return NS_OK;
}
@@ -1619,7 +1628,15 @@
+ }
+ else
+ {
-+ mFileURL = output.Count() > 0 ? *output[ 0 ] : nsCString();
++ if( output.Count() == 0 )
++ mFileURL = nsCString();
++ else if( mAllowURLs )
++ mFileURL = *output[ 0 ];
++ else // GetFile() actually requires it to be url even for local files :-/
++ {
++ mFileURL = nsCString( "file://" );
++ mFileURL.Append( *output[ 0 ] );
++ }
+ }
+ // Remember last used directory.
+ nsCOMPtr<nsILocalFile> file;
@@ -1683,8 +1700,8 @@
+ }
+ return NS_OK;
+ }
---- mozilla/widget/src/gtk2/nsFilePicker.h.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/widget/src/gtk2/nsFilePicker.h 2009-09-14 10:04:15.000000000 +0200
+--- mozilla/widget/src/gtk2/nsFilePicker.h.sav 2009-11-05 20:09:14.000000000 +0100
++++ mozilla/widget/src/gtk2/nsFilePicker.h 2009-11-16 15:37:59.000000000 +0100
@@ -98,6 +98,12 @@ protected:
private:
static nsILocalFile *mPrevDisplayDirectory;
@@ -1698,8 +1715,8 @@
};
#endif
---- mozilla/widget/src/gtk2/nsPrintDialogGTK.cpp.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/widget/src/gtk2/nsPrintDialogGTK.cpp 2009-09-14 10:04:15.000000000 +0200
+--- mozilla/widget/src/gtk2/nsPrintDialogGTK.cpp.sav 2009-11-05 20:09:14.000000000 +0100
++++ mozilla/widget/src/gtk2/nsPrintDialogGTK.cpp 2009-11-16 15:37:59.000000000 +0100
@@ -145,6 +145,10 @@ ShowCustomDialog(GtkComboBox *changed_bo
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
NULL);
@@ -1711,15 +1728,15 @@
printBundle->GetStringFromName(NS_LITERAL_STRING("customHeaderFooterPrompt").get(), getter_Copies(intlString));
GtkWidget* custom_label = gtk_label_new(NS_ConvertUTF16toUTF8(intlString).get());
---- mozilla/xpcom/io/Makefile.in.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/xpcom/io/Makefile.in 2009-09-14 10:04:15.000000000 +0200
+--- mozilla/xpcom/io/Makefile.in.sav 2009-11-05 20:09:14.000000000 +0100
++++ mozilla/xpcom/io/Makefile.in 2009-11-16 15:37:59.000000000 +0100
@@ -199,3 +199,4 @@ endif
endif
LOCAL_INCLUDES = -I..
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
---- mozilla/xpcom/io/nsLocalFileUnix.cpp.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/xpcom/io/nsLocalFileUnix.cpp 2009-09-14 10:04:15.000000000 +0200
+--- mozilla/xpcom/io/nsLocalFileUnix.cpp.sav 2009-11-05 20:09:14.000000000 +0100
++++ mozilla/xpcom/io/nsLocalFileUnix.cpp 2009-11-16 15:37:59.000000000 +0100
@@ -84,6 +84,7 @@
#ifdef MOZ_WIDGET_GTK2
@@ -1728,7 +1745,7 @@
#endif
#include "nsNativeCharsetUtils.h"
-@@ -1666,16 +1667,13 @@ NS_IMETHODIMP
+@@ -1648,16 +1649,13 @@ NS_IMETHODIMP
nsLocalFile::Reveal()
{
#ifdef MOZ_WIDGET_GTK2
@@ -1747,7 +1764,7 @@
} else {
nsCOMPtr<nsIFile> parentDir;
nsCAutoString dirPath;
-@@ -1684,8 +1682,21 @@ nsLocalFile::Reveal()
+@@ -1666,8 +1664,21 @@ nsLocalFile::Reveal()
if (NS_FAILED(parentDir->GetNativePath(dirPath)))
return NS_ERROR_FAILURE;
@@ -1770,7 +1787,7 @@
#else
return NS_ERROR_FAILURE;
#endif
-@@ -1695,6 +1706,13 @@ NS_IMETHODIMP
+@@ -1677,6 +1688,13 @@ NS_IMETHODIMP
nsLocalFile::Launch()
{
#ifdef MOZ_WIDGET_GTK2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org