Bug 1184936 - Need convert from UTF8 for printer name. r?karlt draft
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Tue, 09 Feb 2016 13:37:41 +0900
changeset 329752 21ce9bfc78d7cc36db222d0585c79945ff0428a9
parent 329566 815d689a6e1e7187b10238f2f840d49201d67c2b
child 514024 16666b9770dc68997ee50a5b8f895fa49fd8ecba
push id10596
push userm_kato@ga2.so-net.ne.jp
push dateTue, 09 Feb 2016 05:21:55 +0000
reviewerskarlt
bugs1184936
milestone47.0a1
Bug 1184936 - Need convert from UTF8 for printer name. r?karlt MozReview-Commit-ID: GAkaLYTvZ9h
widget/gtk/nsPrintSettingsGTK.cpp
--- a/widget/gtk/nsPrintSettingsGTK.cpp
+++ b/widget/gtk/nsPrintSettingsGTK.cpp
@@ -475,17 +475,17 @@ nsPrintSettingsGTK::GetPrinterName(char1
       gtkPrintName = gtk_printer_get_name(mGTKPrinter);
     } else {
       // This mimics what nsPrintSettingsImpl does when we try to Get before we Set
       nsXPIDLString nullPrintName;
       *aPrinter = ToNewUnicode(nullPrintName);
       return NS_OK;
     }
   }
-  *aPrinter = ToNewUnicode(nsDependentCString(gtkPrintName));
+  *aPrinter = ToNewUnicode(NS_ConvertUTF8toUTF16(gtkPrintName));
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsPrintSettingsGTK::SetPrinterName(const char16_t * aPrinter)
 {
   NS_ConvertUTF16toUTF8 gtkPrinter(aPrinter);