mozilla-kde.patch
changeset 409 ff30593d2daa
parent 400 6a1811ef3174
child 419 f6b055dd94bc
--- a/mozilla-kde.patch	Tue Mar 13 08:06:57 2012 +0100
+++ b/mozilla-kde.patch	Thu Mar 15 10:33:22 2012 +0100
@@ -3247,9 +3247,9 @@
  #endif
  
    // Now look up our extensions
-diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
---- a/widget/src/gtk2/Makefile.in
-+++ b/widget/src/gtk2/Makefile.in
+diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
+--- a/widget/gtk2/Makefile.in
++++ b/widget/gtk2/Makefile.in
 @@ -135,11 +135,14 @@ DEFINES		+= -DCAIRO_GFX
  
  INCLUDES	+= \
@@ -3265,9 +3265,9 @@
  ifdef MOZ_X11
  INCLUDES   	+= -I$(srcdir)/../shared/x11
  endif
-diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp
---- a/widget/src/gtk2/nsFilePicker.cpp
-+++ b/widget/src/gtk2/nsFilePicker.cpp
+diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
+--- a/widget/gtk2/nsFilePicker.cpp
++++ b/widget/gtk2/nsFilePicker.cpp
 @@ -33,16 +33,17 @@
   * the provisions above, a recipient may use your version of this file under
   * the terms of any one of the MPL, the GPL or the LGPL.
@@ -3580,9 +3580,9 @@
 +        }
 +    return NS_OK;
 +    }
-diff --git a/widget/src/gtk2/nsFilePicker.h b/widget/src/gtk2/nsFilePicker.h
---- a/widget/src/gtk2/nsFilePicker.h
-+++ b/widget/src/gtk2/nsFilePicker.h
+diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
+--- a/widget/gtk2/nsFilePicker.h
++++ b/widget/gtk2/nsFilePicker.h
 @@ -89,11 +89,17 @@ protected:
    nsString  mDefault;
    nsString  mDefaultExtension;