Fixes for Linux build bustage
authordmose@mozilla.org
Wed, 25 Jul 2007 22:52:27 -0700
changeset 4020 f649665c243f009a08c3839eb60655407d29ae0d
parent 4019 8ad30026b627ee737e2ff279faae6f97dda2ad0a
child 4021 7ab8ab9e8d676df7666b17322d5debeedac57cb0
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9a7pre
Fixes for Linux build bustage
uriloader/exthandler/unix/nsGNOMERegistry.cpp
uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
uriloader/exthandler/unix/nsMIMEInfoUnix.h
--- a/uriloader/exthandler/unix/nsGNOMERegistry.cpp
+++ b/uriloader/exthandler/unix/nsGNOMERegistry.cpp
@@ -37,17 +37,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsGNOMERegistry.h"
 #include "prlink.h"
 #include "prmem.h"
 #include "nsString.h"
 #include "nsIComponentManager.h"
 #include "nsILocalFile.h"
-#include "nsMIMEInfoImpl.h"
+#include "nsMIMEInfoUnix.h"
 #include "nsAutoPtr.h"
 
 #include <glib.h>
 #include <glib-object.h>
 
 static PRLibrary *gconfLib;
 static PRLibrary *gnomeLib;
 static PRLibrary *vfsLib;
@@ -299,17 +299,17 @@ nsGNOMERegistry::GetFromType(const char 
 {
   if (!gconfLib)
     return nsnull;
 
   GnomeVFSMimeApplication *handlerApp = _gnome_vfs_mime_get_default_application(aMIMEType);
   if (!handlerApp)
     return nsnull;
 
-  nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType);
+  nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType);
   NS_ENSURE_TRUE(mimeInfo, nsnull);
 
   // Get the list of extensions and append then to the mimeInfo.
   GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType);
   for (GList *extension = extensions; extension; extension = extension->next)
     mimeInfo->AppendExtension(nsDependentCString((const char *) extension->data));
 
   _gnome_vfs_mime_extensions_list_free(extensions);
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
@@ -32,16 +32,17 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * 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.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsMIMEInfoWin.h"
+#include "nsMIMEInfoUnix.h"
+#include "nsGNOMERegistry.h"
 
 nsresult
 nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI)
 {
   return nsGNOMERegistry::LoadURL(aURI);
 }
 
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.h
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.h
@@ -37,15 +37,21 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef nsMIMEInfoUnix_h_
 #define nsMIMEInfoUnix_h_
 
 #include "nsMIMEInfoImpl.h"
 
-class nsMIMEInfoUnix : public nsMIMEInfoBase
+class nsMIMEInfoUnix : public nsMIMEInfoImpl
 {
+public:
+  nsMIMEInfoUnix(const char *aMIMEType = "") : nsMIMEInfoImpl(aMIMEType) {}
+  nsMIMEInfoUnix(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType) {}
+  nsMIMEInfoUnix(const nsACString& aType, HandlerClass aClass) :
+    nsMIMEInfoImpl(aType, aClass) {}
+
 protected:
   virtual NS_HIDDEN_(nsresult) LoadUriInternal(nsIURI *aURI);
 };
 
 #endif // nsMIMEInfoUnix_h_