gparted r1026 - in trunk: . src

[gedakc svn gnome org]

Author: gedakc
Date: Wed Jan  7 04:40:16 2009
New Revision: 1026
URL: http://svn.gnome.org/viewvc/gparted?rev=1026&view=rev

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

Removed:
   trunk/src/Partition.o
Modified:
   trunk/ChangeLog
   trunk/src/GParted_Core.cc

Modified: trunk/src/GParted_Core.cc
==============================================================================
--- trunk/src/GParted_Core.cc	(original)
+++ trunk/src/GParted_Core.cc	Wed Jan  7 04:40:16 2009
@@ -757,7 +757,9 @@
 		}
 		else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "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 ;
 		else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "fat16" )
 			return GParted::FS_FAT16 ;