Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

svn path=/trunk/; revision=813
This commit is contained in:
Curtis Gedak 2008-04-08 17:36:35 +00:00
parent f78f52c188
commit 94917ed883
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,9 @@
2008-04-08 Curtis Gedak <gedakc@gmail.com>
* src/Dialog_Partition_Label.cc: Increase dialog box size
* src/linux_swap.cc: Enhanced to work with different versions of vol_id
2008-04-07 Marcel Telka <marcel@telka.sk> 2008-04-07 Marcel Telka <marcel@telka.sk>
* MAINTAINERS: New file (bug #524276). * MAINTAINERS: New file (bug #524276).
@ -271,7 +277,7 @@
2007-01-07 Bart Hakvoort <hakvoort@cvs.gnome.org> 2007-01-07 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/GParted_Core.cc: added a check to see wether a device is 'real' * src/GParted_Core.cc: added a check to see wether a device is 'real'
or not. (thanks to François Dupoux for the patch) or not. (thanks to Fran<EFBFBD>ois Dupoux for the patch)
2006-12-19 Theppitak Karoonboonyanan <thep@linux.thai.net> 2006-12-19 Theppitak Karoonboonyanan <thep@linux.thai.net>

2
src/Dialog_Partition_Label.cc
View File

@ -26,7 +26,7 @@ Dialog_Partition_Label::Dialog_Partition_Label( const Partition & partition )
this ->set_resizable( false ) ; this ->set_resizable( false ) ;
this ->set_has_separator( 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 */ /*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() ) ); this ->set_title( String::ucompose( _("Set partition label on %1"), partition .get_path() ) );

4
src/linux_swap.cc
View File

@ -48,9 +48,9 @@ void linux_swap::set_used_sectors( Partition & partition )
void linux_swap::get_label( Partition & partition ) 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 else
{ {