gparted r813 - in trunk: . po src

[gedakc svn gnome org]

Author: gedakc
Date: Tue Apr  8 18:36:35 2008
New Revision: 813
URL: http://svn.gnome.org/viewvc/gparted?rev=813&view=rev

Log:
Increase label dialog box size, and enhance to read linux-swap label using different versions of vol_id

Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/po/   (props changed)
   trunk/src/Dialog_Partition_Label.cc
   trunk/src/linux_swap.cc

Modified: trunk/src/Dialog_Partition_Label.cc
==============================================================================
--- trunk/src/Dialog_Partition_Label.cc	(original)
+++ trunk/src/Dialog_Partition_Label.cc	Tue Apr  8 18:36:35 2008
@@ -26,7 +26,7 @@
 
 	this ->set_resizable( false ) ;
 	this ->set_has_separator( false ) ;
-	this ->set_size_request( 300, 70 ) ;
+	this ->set_size_request( 300, 80 ) ;
 	
 	/*TO TRANSLATORS: dialog title, looks like Set partition label on /dev/hda3 */
 	this ->set_title( String::ucompose( _("Set partition label on %1"), partition .get_path() ) );

Modified: trunk/src/linux_swap.cc
==============================================================================
--- trunk/src/linux_swap.cc	(original)
+++ trunk/src/linux_swap.cc	Tue Apr  8 18:36:35 2008
@@ -48,9 +48,9 @@
 
 void linux_swap::get_label( Partition & partition )
 {
-	if ( ! Utils::execute_command( "vol_id --label-raw " + partition .get_path(), output, error, true ) )
+	if ( ! Utils::execute_command( "vol_id " + partition .get_path(), output, error, true ) )
 	{
-		partition .label = Utils::regexp_label( output, "^(.*)" ) ;
+		partition .label = Utils::regexp_label( output, "ID_FS_LABEL=([^\n]*)" ) ;
 	}
 	else
 	{