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

Changes post gparted-0.3.6 - code recreation from Source Forge 

svn path=/trunk/; revision=811
This commit is contained in:
Curtis Gedak 2008-04-07 20:10:28 +00:00
parent 8d808c0b62
commit ff2a6c00dd
9 changed files with 92 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ChangeLog
View File

@ -1,7 +1,34 @@
2008-04-07 Marcel Telka <marcel@telka.sk>
* MAINTAINERS: New file (bug #524276).
* configure.in: Added 'sk' to ALL_LINGUAS.
2008-04-03 Curtis Gedak <gedakc@gmail.com>
* configure.in,
autogen.sh,
po/LINGUAS: Enhanced to use po/LINGUAS for LINGUAS
- Closes GParted bug #467459
- Thanks to Christian Persch for this patch
2008-04-01 Curtis Gedak <gedakc@gmail.com>
* Makefile.am: Removed distclean target enhancements from 2008-02-05
- use "make dist" to create a distribution archive file
2008-03-31 Curtis Gedak <gedakc@gmail.com>
* src/Utils.cc: Ensure hour portion of time is always displayed
- Closes GParted bug #438590
* src/TreeView_Detail.cc: Removed text_color hard coding
- Removed hard coding of Partition and Filesystem text_color
which was based on if partition was TYPE_UNALLOCATED.
- Removed hard coding of Mount text_color which was based
on if partition was busy. Lock symbol provides this indicator.
- Closes GParted bug #413810
* src/reiser4.cc,
src/reiserfs.cc: Tighten get_label regular expression
2008-03-26 Curtis Gedak <gedakc@gmail.com>

5
Makefile.am
View File

@ -20,8 +20,3 @@ DISTCLEANFILES = \
intltool-merge \
intltool-update \
$(desktop_DATA)
distclean-local:
rm -rf autom4te.cache
find . -name .svn | xargs rm -rf
find . -name .cvsignore | xargs rm -rf

7
autogen.sh
View File

@ -5,15 +5,10 @@ srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
PKG_NAME="gparted"
REQUIRED_AUTOMAKE_VERSION=1.7
which gnome-autogen.sh || {
echo "You need to install gnome-common from the GNOME CVS"
exit 1
}
#i needed to put this one here on order to fix an weird depcomp error
aclocal
USE_GNOME2_MACROS=1 . gnome-autogen.sh
REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh

17
configure.in
View File

@ -1,8 +1,9 @@
AC_INIT(gparted, 0.3.6)
AC_CONFIG_SRCDIR(src/main.cc)
AM_INIT_AUTOMAKE
AC_INIT([gparted],[0.3.7-svn],[http://bugzilla.gnome.org/simple-bug-guide.cgi?product=gparted])
AM_CONFIG_HEADER(config.h)
AC_CONFIG_SRCDIR(src/main.cc)
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
AM_MAINTAINER_MODE
@ -20,10 +21,8 @@ GETTEXT_PACKAGE=gparted
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[description])
ALL_LINGUAS="ar bg ca cs de dz el en_CA en_GB es eu fi fr gl he hu it ja ko lt lv mk nb ne nl oc pa pl pt pt_BR ru rw si sk sl sv th tr uk vi zh_CN zh_HK zh_TW"
AM_GLIB_GNU_GETTEXT
AC_PROG_INTLTOOL
IT_PROG_INTLTOOL([0.35.5])
dnl======================
@ -74,7 +73,7 @@ AC_SUBST(GTKMM_LIBS)
AC_SUBST(GTKMM_CFLAGS)
AC_OUTPUT([
AC_CONFIG_FILES([
Makefile
compose/Makefile
include/Makefile
@ -82,3 +81,5 @@ src/Makefile
pixmaps/Makefile
po/Makefile.in
])
AC_OUTPUT

45
po/LINGUAS Normal file
View File

@ -0,0 +1,45 @@
# please keep this list sorted alphabetically
#
ar
bg
ca
cs
de
dz
el
en_CA
en_GB
es
eu
fi
fr
gl
he
hu
it
ja
ko
lt
lv
mk
nb
ne
nl
oc
pa
pl
pt
pt_BR
ru
rw
si
sk
sl
sv
th
tr
uk
vi
zh_CN
zh_HK
zh_TW

7
src/TreeView_Detail.cc
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2004 Bart
/* Copyright (C) 2004, 2005, 2006, 2007, 2008 Bart Hakvoort
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -176,16 +176,13 @@ void TreeView_Detail::create_row( const Gtk::TreeRow & treerow, const Partition
treerow[ treeview_detail_columns .color ] = Utils::get_color_as_pixbuf( partition .filesystem, 16, 16 ) ;
treerow[ treeview_detail_columns .text_color ] =
partition .type == GParted::TYPE_UNALLOCATED ? "darkgrey" : "black" ;
treerow[ treeview_detail_columns .filesystem ] =
Utils::get_filesystem_string( partition .filesystem ) ;
//mountpoint
treerow[ treeview_detail_columns .mount_text_color ] = partition .busy ? "black" : "darkgrey" ;
treerow[ treeview_detail_columns .mountpoint ] = Glib::build_path( ", ", partition .get_mountpoints() ) ;
//label
treerow[ treeview_detail_columns .label ] = partition .label ;
//size

13
src/Utils.cc
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2004 Bart 'plors' Hakvoort
/* Copyright (C) 2004, 2005, 2006, 2007, 2008 Bart Hakvoort
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -170,13 +170,10 @@ Glib::ustring Utils::format_time( std::time_t seconds )
Glib::ustring time ;
int unit = static_cast<int>( seconds / 3600 ) ;
if ( unit > 0 )
{
if ( unit < 10 )
time += "0" ;
time += num_to_str( unit ) + ":" ;
seconds %= 3600 ;
}
if ( unit < 10 )
time += "0" ;
time += num_to_str( unit ) + ":" ;
seconds %= 3600 ;
unit = static_cast<int>( seconds / 60 ) ;
if ( unit < 10 )

2
src/reiser4.cc
View File

@ -84,7 +84,7 @@ void reiser4::get_label( Partition & partition )
{
if ( ! Utils::execute_command( "debugfs.reiser4 " + partition .get_path(), output, error, true ) )
{
Glib::ustring label = Utils::regexp_label( output, "^label:[\t ]*([^!]*)" ) ;
Glib::ustring label = Utils::regexp_label( output, "^label:[\t ]*([^!]*)$" ) ;
//FIXME: find a better way to see if label is empty.. imagine someone uses '<none>' as label.... ;)
if( label != "<none>" )
partition .label = label ;

2
src/reiserfs.cc
View File

@ -93,7 +93,7 @@ void reiserfs::get_label( Partition & partition )
//FIXME: i think running debugreiserfs takes a long time on filled filesystems, test for this...
if ( ! Utils::execute_command( "debugreiserfs " + partition .get_path(), output, error, true ) )
{
partition .label = Utils::regexp_label( output, "^label:[\t ]*(.*)" ) ;
partition .label = Utils::regexp_label( output, "^label:[\t ]*(.*)$" ) ;
}
else
{