[meego-commits] 7773: Changes to Trunk/chromium

[Rolla Selbak]

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

Thank You,
Rolla Selbak

[This message was auto-generated]

---

Request #7773:

  submit:   Trunk:Testing/chromium(r24) -> Trunk/chromium


Message:
    Move to Trunk

State:   new          2010-09-23T21:32:49 rolla
Comment: None



changes files:
--------------
--- chromium.changes
+++ chromium.changes
@@ -0,0 +1,3 @@
+* Tue Sep 21 2010 Ningxin Hu <ningxin.hu at intel.com> - 6.0.486.0
+- Fix BMC#6750 chromium importer crash when nothing selected
+

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

spec files:
-----------
--- chromium.spec
+++ chromium.spec
@@ -138,6 +138,9 @@
 
 # Fix droid sans font rendering issue
 Patch208:        webkit-complex-font-selection-fix.patch
+
+# Fix chromium importer crash bug BMC#6750
+Patch209:        chromium-importer-crash-fix.patch
 ################ patches for MeeGo integration ends
 
 
@@ -311,6 +314,7 @@
 %patch205 -p1
 %patch206 -p1
 %patch208 -p1 -d third_party/WebKit
+%patch209 -p1
 
 # Scrape out incorrect optflags and hack in the correct ones
 PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -DUSE_SYSTEM_LIBEVENT -fPIC -fno-strict-aliasing -fno-ipa-cp \' | sed "s/ /',/g" | sed "s/',/', '/g"`

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();