diff -ru ../gparted-0.4.5/compose/ucompose.hpp ./compose/ucompose.hpp

--- ../gparted-0.4.5/compose/ucompose.hpp	2009-04-18 13:38:05.000000000 -0700

+++ ./compose/ucompose.hpp	2009-08-28 13:37:02.167527000 -0700

@@ -127,7 +127,11 @@

     return Glib::convert(std::string(reinterpret_cast<const char *>(str.data()),

 				     str.size() * sizeof(wchar_t)),

+#ifdef __sun

+			 "UTF-8", "UCS-4LE");

+#else

 			 "UTF-8", "WCHAR_T");

+#endif

   }

   // specialisations for the common string types

diff -ru ../gparted-0.4.5/configure ./configure

--- ../gparted-0.4.5/configure	2009-05-08 09:05:43.000000000 -0700

+++ ./configure	2009-06-12 10:12:27.781410000 -0700

@@ -22031,6 +22031,10 @@

 #include <stdio.h>

 #include <parted/parted.h>

+#ifdef __sun

+char *program_name = "test";

+#endif

+

 int main ()

 {

 	int min_major ;

diff -ru ../gparted-0.4.5/configure.in ./configure.in

--- ../gparted-0.4.5/configure.in	2009-05-08 08:50:41.000000000 -0700

+++ ./configure.in	2009-06-12 10:12:05.631528000 -0700

@@ -49,6 +49,10 @@

 #include <stdio.h>

 #include <parted/parted.h>

+#ifdef __sun

+char *program_name = "test";

+#endif

+

 int main ()

 {

 	int min_major ;

diff -ru ../gparted-0.4.5/gparted.desktop ./gparted.desktop

--- ../gparted-0.4.5/gparted.desktop	2009-05-08 09:05:53.000000000 -0700

+++ ./gparted.desktop	2009-06-12 10:44:28.470185000 -0700

@@ -58,7 +58,7 @@

 Comment[zh_CN]=创建、重新组织或删除分区

 Comment[zh_HK]=建立、編輯或刪除分割區

 Comment[zh_TW]=建立、編輯或刪除分割區

-Exec=gksu /usr/local/sbin/gparted %f

+Exec=gksu /usr/sbin/gparted %f

 Icon=gparted

 Terminal=false

 Type=Application

diff -ru ../gparted-0.4.5/src/GParted_Core.cc ./src/GParted_Core.cc

--- ../gparted-0.4.5/src/GParted_Core.cc	2009-05-02 09:59:49.000000000 -0700

+++ ./src/GParted_Core.cc	2009-06-10 15:19:53.573670000 -0700

@@ -847,7 +847,11 @@

 	strncpy(magic, buf+0, 6) ;  magic[6] = '\0' ; //set and terminate string

 	ped_device_close( lp_device );

+#ifdef __sun

+	if (strncmp("LUKS\xBA\xBE", magic, 6) == 0)

+#else

 	if ( Glib::ustring( magic ) == "LUKS\xBA\xBE" )

+#endif

 	{

 		temp = _( "Linux Unified Key Setup encryption is not yet supported." ) ;

 		temp += "\n" ;

@@ -911,7 +915,16 @@

 	ped_geometry_read( & lp_partition ->geom, buf, 128, 1 ) ;

 	ped_device_close( lp_device );

+#ifdef __sun

+	/*

+	 * On Solaris, the Glib::ustring causes this message:

+	 * GLib-CRITICAL **: file gconvert.c:

+	 *    line 734: assertion `str != NULL' failed

+	 */

+	if (strncmp("ReIsEr4", buf, 7) == 0)

+#else

 	if ( Glib::ustring( buf ) == "ReIsEr4" )

+#endif

 		return GParted::FS_REISER4 ;

 	//lvm2

@@ -925,8 +938,13 @@

 	strncpy(magic2, buf+24, 4) ; magic2[4] = '\0' ; //set and terminate string

 	ped_device_close( lp_device );

+#ifdef __sun

+	if (strncmp("LABELONE", magic1, 8) == 0

+	    && strncmp("LVM2", magic2, 4) == 0)

+#else

 	if (    Glib::ustring( magic1 ) == "LABELONE"

 		 && Glib::ustring( magic2 ) == "LVM2" )

+#endif

 	{

 		temp = _( "Logical Volume Management is not yet supported." ) ;

 		temp += "\n" ;

@@ -949,7 +967,11 @@

 	strncpy(magic, buf_btrfs+64, BTRFS_SIGNATURE .size()) ;  magic[BTRFS_SIGNATURE .size()] = '\0' ; //set and terminate string

 	ped_device_close( lp_device ) ;

+#ifdef __sun

+	if (strncmp("_BHRfS_M", magic, 8) == 0)

+#else

 	if ( magic == BTRFS_SIGNATURE )

+#endif

 	{

 		temp = _( "BTRFS is not yet supported." ) ;

 		temp += "\n" ;

diff -ru ../gparted-0.4.5/src/Utils.cc ./src/Utils.cc

--- ../gparted-0.4.5/src/Utils.cc	2009-04-19 11:05:13.000000000 -0700

+++ ./src/Utils.cc	2009-06-10 15:02:38.660042000 -0700

@@ -19,6 +19,7 @@

 #include <sstream>

 #include <iomanip>

+#include <unistd.h>

 #include <regex.h>

 #include <locale.h>

diff -ru ../gparted-0.4.5/src/Win_GParted.cc ./src/Win_GParted.cc

--- ../gparted-0.4.5/src/Win_GParted.cc	2009-04-19 11:05:13.000000000 -0700

+++ ./src/Win_GParted.cc	2009-06-10 15:04:57.634572000 -0700

@@ -1690,9 +1690,14 @@

 	*succes = true ; 

 	for ( unsigned int t = 0 ; t < selected_partition .get_mountpoints() .size() ; t++ )

-		if ( std::count( mountpoints .begin(),

+	{

+		size_t n = 0;

+

+		std::count( mountpoints .begin(),

 				 mountpoints .end(),

-				 selected_partition .get_mountpoints()[ t ] ) <= 1 ) 

+				 selected_partition .get_mountpoints()[ t ],

+				 n );

+		if ( n <= 1 ) 

 		{

 			if ( Utils::execute_command( "umount -v \"" + selected_partition .get_mountpoints()[ t ] + "\"",

 						     dummy,

@@ -1704,6 +1709,7 @@

 		}

 		else

 			failed_mountpoints .push_back( selected_partition .get_mountpoints()[ t ] ) ;

+	}

 	if ( *succes && failed_mountpoints .size() )

diff -ru ../gparted-0.4.5/src/main.cc ./src/main.cc

--- ../gparted-0.4.5/src/main.cc	2009-04-18 13:38:05.000000000 -0700

+++ ./src/main.cc	2009-06-12 10:38:31.131138000 -0700

@@ -20,8 +20,16 @@

 #include <gtkmm/messagedialog.h>

 #include <gtkmm/main.h>

+#ifdef __sun

+char *program_name;

+#endif

+

 int main( int argc, char *argv[] )

 {

+#ifdef __sun

+	program_name = argv[0];

+#endif

+

 	//initialize thread system

 	Glib::thread_init() ;