gparted r811 - in trunk: . po src

[gedakc svn gnome org]

Author: gedakc
Date: Mon Apr  7 21:10:28 2008
New Revision: 811
URL: http://svn.gnome.org/viewvc/gparted?rev=811&view=rev

Log:
Changes post gparted-0.3.6 - code recreation from Source Forge

Added:
   trunk/po/LINGUAS
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/autogen.sh
   trunk/configure.in
   trunk/src/TreeView_Detail.cc
   trunk/src/Utils.cc
   trunk/src/reiser4.cc
   trunk/src/reiserfs.cc

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Apr  7 21:10:28 2008
@@ -20,8 +20,3 @@
 	intltool-merge		\
 	intltool-update		\
 	$(desktop_DATA)
-
-distclean-local:
-	rm -rf autom4te.cache
-	find . -name .svn | xargs rm -rf
-	find . -name .cvsignore | xargs rm -rf

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Mon Apr  7 21:10:28 2008
@@ -5,15 +5,10 @@
 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
\ No newline at end of file

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Apr  7 21:10:28 2008
@@ -1,8 +1,9 @@
-AC_INIT(gparted, 0.3.6)
+AC_INIT([gparted],[0.3.7-svn],[http://bugzilla.gnome.org/simple-bug-guide.cgi?product=gparted])
+
 AC_CONFIG_SRCDIR(src/main.cc)
-AM_INIT_AUTOMAKE
+AC_CONFIG_HEADERS([config.h])
 
-AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
 AM_MAINTAINER_MODE
 
 
@@ -20,10 +21,8 @@
 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_CFLAGS)
 
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 compose/Makefile
 include/Makefile
@@ -82,3 +81,5 @@
 pixmaps/Makefile
 po/Makefile.in
 ])
+
+AC_OUTPUT
\ No newline at end of file

Added: trunk/po/LINGUAS
==============================================================================
--- (empty file)
+++ trunk/po/LINGUAS	Mon Apr  7 21:10:28 2008
@@ -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

Modified: trunk/src/TreeView_Detail.cc
==============================================================================
--- trunk/src/TreeView_Detail.cc	(original)
+++ trunk/src/TreeView_Detail.cc	Mon Apr  7 21:10:28 2008
@@ -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 @@
 
 	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

Modified: trunk/src/Utils.cc
==============================================================================
--- trunk/src/Utils.cc	(original)
+++ trunk/src/Utils.cc	Mon Apr  7 21:10:28 2008
@@ -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 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 )

Modified: trunk/src/reiser4.cc
==============================================================================
--- trunk/src/reiser4.cc	(original)
+++ trunk/src/reiser4.cc	Mon Apr  7 21:10:28 2008
@@ -84,7 +84,7 @@
 {
 	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 ; 

Modified: trunk/src/reiserfs.cc
==============================================================================
--- trunk/src/reiserfs.cc	(original)
+++ trunk/src/reiserfs.cc	Mon Apr  7 21:10:28 2008
@@ -93,7 +93,7 @@
 	//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
 	{