[meego-commits] 9193: Changes to devel:browser/chromium

[Wei W Fang]

Hi,
I have made the following changes to chromium in project devel:browser. Please review and accept ASAP.

Thank You,
Wei W Fang

[This message was auto-generated]

---

Request #9193:

  submit:   home:wfang6:branches:devel:browser/chromium(r4)(cleanup) -> devel:browser/chromium


Message:
    Fix BMC#9636 chromium importer crash

State:   new          2010-11-03T21:21:51 wfang6
Comment: None



changes files:
--------------
--- chromium.changes
+++ chromium.changes
@@ -0,0 +1,3 @@
+* Tue Nov 04 2010 Wei Fang <wei.w.fang at intel.com> - 7.0.542.0
+- Fix BMC#9636 chromium importer crash by merging the patch from Ningxin
+

new:
----
  chromium-importer-crash-fix.patch

spec files:
-----------
--- chromium.spec
+++ chromium.spec
@@ -141,11 +141,13 @@
 
 # Fix droid sans font rendering issue
 Patch208:        webkit-complex-font-selection-fix.patch
-################ patches for MeeGo integration ends
 
+# Fix chromium importer crash bug BMC#9636
+Patch210:        chromium-importer-crash-fix.patch
+################ patches for MeeGo integration ends
 
 # STATIC ONLY PATCHES
-#Patch35:	chromium-7.0.542.0-system-speex-static.patch
+Patch35:	chromium-7.0.542.0-system-speex-static.patch
 
 # OLD: Use chromium-daily-tarball.sh to generate tarball from svn.
 # New: Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
@@ -177,7 +179,7 @@
 BuildRequires:	desktop-file-utils, gperf
 BuildRequires:	nss-devel >= 3.12.3, expat-devel
 BuildRequires:	dbus-glib-devel, libXScrnSaver-devel
-BuildRequires:	cups-devel
+BuildRequires:  python, cups-devel
 
 BuildRequires:	libgnome-keyring-devel
 
@@ -373,6 +375,7 @@
 %patch202 -p1
 %patch204 -p1
 %patch208 -p1 
+%patch210 -p1 
 
 pushd third_party/ffmpeg/
 tar xf %{SOURCE8}

other changes:
--------------

++++++ chromium-importer-crash-fix.patch (new)
--- chromium-importer-crash-fix.patch
+++ chromium-importer-crash-fix.patch
+diff --git a/chrome/browser/gtk/import_dialog_gtk.cc b/chrome/browser/gtk/import_dialog_gtk.cc
+index 786007c..90224e8 100644
+--- a/chrome/browser/gtk/import_dialog_gtk.cc
++++ b/chrome/browser/gtk/import_dialog_gtk.cc
+@@ -167,11 +167,18 @@ void ImportDialogGtk::OnDialogResponse(GtkWidget* widget, int response) {
+     if (items == 0) {
+       ImportComplete();
+     } else {
+-      const ProfileInfo& source_profile =
+-          importer_host_->GetSourceProfileInfoAt(
+-          gtk_combo_box_get_active(GTK_COMBO_BOX(combo_)));
+-      StartImportingWithUI(parent_, items, importer_host_.get(),
+-                           source_profile, profile_, this, false);
++      int index = gtk_combo_box_get_active(GTK_COMBO_BOX(combo_));
++      if(index >= 0 && index < importer_host_->GetAvailableProfileCount())
++      {
++        const ProfileInfo& source_profile =
++            importer_host_->GetSourceProfileInfoAt(index);
++        StartImportingWithUI(parent_, items, importer_host_.get(),
++                             source_profile, profile_, this, false);
++      }
++      else
++      {
++        ImportCanceled();
++      }
+     }
+   } else {
+     ImportCanceled();