head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.30
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.28
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.26
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.24
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.22
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.20
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.18
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.16
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.14
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.12
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.10
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.8
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.6
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.4
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.2
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.1.0.14
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.12
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.10
	pkgsrc-2006Q1-base:1.1
	pkgsrc-2005Q4:1.1.0.8
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.6
	pkgsrc-2005Q3-base:1.1
	pkgsrc-2005Q2:1.1.0.4
	pkgsrc-2005Q2-base:1.1
	pkgsrc-2005Q1:1.1.0.2
	pkgsrc-2005Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2006.10.19.20.22.30;	author wiz;	state dead;
branches;
next	1.1;

1.1
date	2005.01.16.05.23.59;	author taya;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove obsolete galeon12 package -- use galeon instead.
@
text
@$NetBSD: patch-ae,v 1.1 2005/01/16 05:23:59 taya Exp $

diff -ru ../Orig/galeon-1.2.14/src/mozilla/FilePicker.cpp ./src/mozilla/FilePicker.cpp
--- ../Orig/galeon-1.2.14/src/mozilla/FilePicker.cpp	2003-04-12 06:29:27.000000000 +0900
+++ ./src/mozilla/FilePicker.cpp	2005-01-16 13:59:04.000000000 +0900
@@@@ -98,8 +98,8 @@@@
 ////////////////////////////////////////////////////////////////////////////////
 
 /* void init (in nsIDOMWindowInternal parent, in wstring title, in short mode); */
-NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, 
-				 const PRUnichar *title, PRInt16 mode)
+NS_IMETHODIMP GFilePicker::Init(nsIDOMWindow *parent, 
+				 const nsAString &title, PRInt16 mode)
 {
 	mParentInternal = parent;
 	mParent = do_QueryInterface (mParentInternal);
@@@@ -121,8 +121,8 @@@@
 }
 
 /* void appendFilter (in wstring title, in wstring filter); */
-NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title,
-					const PRUnichar *filter)
+NS_IMETHODIMP GFilePicker::AppendFilter(const nsAString& title,
+					const nsAString& filter)
 {
 	//GtkFileSelection is crippled, so we can't provide a short-list
 	//of filters to choose from. We provide minimal functionality
@@@@ -142,29 +142,27 @@@@
 }
 
 /* attribute wstring defaultString; */
-NS_IMETHODIMP GFilePicker::GetDefaultString(PRUnichar * *aDefaultString)
+NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString)
 {
-	*aDefaultString = ToNewUnicode (mDefaultString);
+	aDefaultString = ToNewUnicode (mDefaultString);
 	return NS_OK;
 }
-NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar * aDefaultString)
+NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString)
 {
-	if (aDefaultString)
-		mDefaultString = aDefaultString;
-	else
-		mDefaultString = NS_LITERAL_STRING ("");
+	mDefaultString = aDefaultString;
+
 	return NS_OK;
 }
 
 /* attribute wstring defaultExtension; */
 // Again, due to the crippled file selector, we can't really
 // do anything here.
-NS_IMETHODIMP GFilePicker::GetDefaultExtension(PRUnichar * *aDefaultExtension)
+NS_IMETHODIMP GFilePicker::GetDefaultExtension(nsAString& aDefaultExtension)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP GFilePicker::SetDefaultExtension(const PRUnichar * aDefaultExtension)
+NS_IMETHODIMP GFilePicker::SetDefaultExtension(const nsAString& aDefaultExtension)
 {
     return NS_OK;
 }
@@@@ -606,7 +604,7 @@@@
 	g_free (expanded_directory);
 
 	aFilePicker->InitWithGtkWidget (parentWidget, title, mode);
-	aFilePicker->SetDefaultString (uDefaultString);
+	aFilePicker->SetDefaultString (nsAutoString(uDefaultString));
 	aFilePicker->SetDisplayDirectory (aDir);
 	
 	PRInt16 retval;
@


1.1
log
@
make this compile with mozilla-1.7.5
bump PKGREVISION
@
text
@d1 1
a1 1
$NetBSD$
@