Actually commit changes from src/GParted_Core.cc, and remove src/Partition.o that was accidentally committed in it's place.

svn path=/trunk/; revision=1026
This commit is contained in:
Curtis Gedak 2009-01-07 04:40:16 +00:00
parent b16825dbb8
commit a52b989903
3 changed files with 6 additions and 1 deletions

View File

@ -1,5 +1,8 @@
2009-01-06 Curtis Gedak <gedakc@gmail.com> 2009-01-06 Curtis Gedak <gedakc@gmail.com>
* src/GParted_Core.cc: Actually commit this file, and
remove src/Partition.o.
* src/Win_GParted.cc: Redo update copyright year range, again. * src/Win_GParted.cc: Redo update copyright year range, again.
- Updated copyright year in Help -> About. - Updated copyright year in Help -> About.

View File

@ -757,7 +757,9 @@ GParted::FILESYSTEM GParted_Core::get_filesystem()
} }
else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "ext4" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "ext4" )
return GParted::FS_EXT4 ; return GParted::FS_EXT4 ;
else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "linux-swap" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "linux-swap" ||
Glib::ustring( lp_partition ->fs_type ->name ) == "linux-swap(new)" ||
Glib::ustring( lp_partition ->fs_type ->name ) == "linux-swap(old)" )
return GParted::FS_LINUX_SWAP ; return GParted::FS_LINUX_SWAP ;
else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "fat16" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "fat16" )
return GParted::FS_FAT16 ; return GParted::FS_FAT16 ;

Binary file not shown.