rpms/firefox/devel firefox-1.1-modal-filechooser.patch, NONE, 1.1 firefox-mozconfig, 1.1, 1.2 firefox-redhat-default-prefs.js, 1.4, 1.5 firefox.spec, 1.77, 1.78

[fedora-cvs-commits redhat com]

Author: caillon

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

Modified Files:
	firefox-mozconfig firefox-redhat-default-prefs.js firefox.spec 
Added Files:
	firefox-1.1-modal-filechooser.patch 
Log Message:
* Fri Jul 22 2005 Christopher Aillon <caillon redhat com> 1.1-0.2.4.deerpark.alpha2
- Add patch from Christian Persch to make the file chooser modal
- Change default behavior of opening links from external apps to: New Tab
- New build options:
  --enable-system-cairo
  --enable-svg
  --enable-canvas


firefox-1.1-modal-filechooser.patch:
 nsFilePicker.cpp |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE firefox-1.1-modal-filechooser.patch ---
Index: widget/src/gtk2/nsFilePicker.cpp
===================================================================
RCS file: /cvsroot/mozilla/widget/src/gtk2/nsFilePicker.cpp,v
retrieving revision 1.10
diff -p -u -u -p -U10 -r1.10 nsFilePicker.cpp
--- widget/src/gtk2/nsFilePicker.cpp	1 Jul 2005 04:40:30 -0000	1.10
+++ widget/src/gtk2/nsFilePicker.cpp	16 Jul 2005 08:39:26 -0000
@@ -457,28 +457,32 @@ confirm_overwrite_file (GtkWidget *paren
     leafName.get()
   };
 
   nsXPIDLString title, message;
   bundle->GetStringFromName(NS_LITERAL_STRING("confirmTitle").get(),
                             getter_Copies(title));
   bundle->FormatStringFromName(NS_LITERAL_STRING("confirmFileReplacing").get(),
                                formatStrings, NS_ARRAY_LENGTH(formatStrings),
                                getter_Copies(message));
 
+  GtkWindow *parent_window = GTK_WINDOW(parent);
   GtkWidget *dialog;
   
-  dialog = gtk_message_dialog_new(GTK_WINDOW(parent),
+  dialog = gtk_message_dialog_new(parent_window,
                                   GTK_DIALOG_DESTROY_WITH_PARENT,
                                   GTK_MESSAGE_QUESTION,
                                   GTK_BUTTONS_YES_NO,
                                   NS_ConvertUTF16toUTF8(message).get());
   gtk_window_set_title(GTK_WINDOW(dialog), NS_ConvertUTF16toUTF8(title).get());
+  if (parent_window && parent_window->group) {
+    gtk_window_group_add_window(parent_window->group, GTK_WINDOW(dialog));
+  }
 
   PRBool result = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES);
   gtk_widget_destroy (dialog);
 
   return result;
 }
 
 NS_IMETHODIMP
 nsFilePicker::Show(PRInt16 *aReturn)
 {
@@ -491,20 +495,24 @@ nsFilePicker::Show(PRInt16 *aReturn)
 
   GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
   const gchar *accept_button = (mMode == GTK_FILE_CHOOSER_ACTION_SAVE)
                                ? GTK_STOCK_SAVE : GTK_STOCK_OPEN;
   GtkWidget *file_chooser =
       _gtk_file_chooser_dialog_new(title, parent_widget, action,
                                    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                    accept_button, GTK_RESPONSE_ACCEPT,
                                    NULL);
 
+  if (parent_widget && parent_widget->group) {
+    gtk_window_group_add_window(parent_widget->group, GTK_WINDOW(file_chooser));
+  }
+
   if (mMode == nsIFilePicker::modeOpenMultiple) {
     _gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER(file_chooser), TRUE);
   } else if (mMode == nsIFilePicker::modeSave) {
     char *default_filename = ToNewUTF8String(mDefault);
     _gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(file_chooser),
                                        NS_STATIC_CAST(const gchar*, default_filename));
     nsMemory::Free(default_filename);
   }
 
   gtk_dialog_set_default_response(GTK_DIALOG(file_chooser), GTK_RESPONSE_ACCEPT);


Index: firefox-mozconfig
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-mozconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-mozconfig	18 Jul 2005 20:27:41 -0000	1.1
+++ firefox-mozconfig	23 Jul 2005 00:32:23 -0000	1.2
@@ -14,6 +14,9 @@
 ac_add_options --disable-xprint
 ac_add_options --disable-strip
 ac_add_options --enable-pango
+ac_add_options --enable-system-cairo
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1


Index: firefox-redhat-default-prefs.js
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-redhat-default-prefs.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- firefox-redhat-default-prefs.js	18 Jul 2005 20:27:41 -0000	1.4
+++ firefox-redhat-default-prefs.js	23 Jul 2005 00:32:23 -0000	1.5
@@ -1,7 +1,7 @@
 pref("app.update.enabled", false);
 pref("app.update.autoInstallEnabled", false);
 pref("browser.display.use_system_colors",   true);
-pref("browser.link.open_external",          2);
+pref("browser.link.open_external",          3);
 pref("browser.startup.homepage", "chrome://browser-region/locale/region.properties");
 pref("general.smoothScroll",                true);
 pref("general.useragent.vendor", "Fedora");


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- firefox.spec	21 Jul 2005 03:13:36 -0000	1.77
+++ firefox.spec	23 Jul 2005 00:32:23 -0000	1.78
@@ -4,13 +4,14 @@
 %define indexhtml file:///usr/share/doc/HTML/index.html
 %define desktop_file_utils_version 0.9
 %define nspr_version 4.6
+%define cairo_version 0.5
 
 %define official_branding 0
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.1
-Release:        0.2.3.deerpark.alpha2
+Release:        0.2.4.deerpark.alpha2
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -61,12 +62,14 @@
 Patch80:        firefox-1.0-pango-cairo.patch
 
 # patches from upstream (Patch100+)
+Patch100:       firefox-1.1-modal-filechooser.patch
 
 
 # ---------------------------------------------------
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{nspr_version}
+BuildRequires:  cairo-devel >= %{cairo_version}
 BuildRequires:  libpng-devel, libjpeg-devel
 BuildRequires:  zlib-devel, zip
 BuildRequires:  libIDL-devel
@@ -121,6 +124,7 @@
 %patch41 -p0
 %patch42 -p0
 %patch80 -p1
+%patch100 -p0
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -254,10 +258,18 @@
 #---------------------------------------------------------------------
 
 %changelog
-* Wed Jul 20 2005 Christopher Aillon <caillon redhat com> 1.1-0.2.3-deerpark.alpha2
+* Fri Jul 22 2005 Christopher Aillon <caillon redhat com> 1.1-0.2.4.deerpark.alpha2
+- Add patch from Christian Persch to make the file chooser modal
+- Change default behavior of opening links from external apps to: New Tab
+- New build options:
+  --enable-system-cairo
+  --enable-svg
+  --enable-canvas
+
+* Wed Jul 20 2005 Christopher Aillon <caillon redhat com> 1.1-0.2.3.deerpark.alpha2
 - Update firefox-1.1-uriloader.patch to fix crashes when calling into gnome-vfs2
 
-* Tue Jul 19 2005 Christopher Aillon <caillon redhat com> 1.1-0.2.2-deerpark.alpha2
+* Tue Jul 19 2005 Christopher Aillon <caillon redhat com> 1.1-0.2.2.deerpark.alpha2
 - Do away with firefox-rebuild-databases.pl
 
 * Mon Jul 18 2005 Christopher Aillon <caillon redhat com> 1.1-0.2.1.deerpark.alpha2