Merging changes between MOZILLA_1_7_RELEASE and AVIARY_20040809_MERGEPOINT, a=ben: bug 249520

git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@160567 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp

@@ -520,7 +520,12 @@ gtk_moz_embed_destroy(GtkObject *object)
   embedPrivate = (EmbedPrivate *)embed->data;
 
   if (embedPrivate) {
-    embedPrivate->Destroy();
+
+    // Destroy the widget only if it's been Init()ed.
+    if(embedPrivate->mMozWindowWidget != 0) {
+      embedPrivate->Destroy();
+    }
+
     delete embedPrivate;
     embed->data = NULL;
   }