gparted-0.3.5 - code recreation from Source Forge

svn path=/trunk/; revision=809

ChangeLog

@@ -3,6 +3,53 @@
 	* MAINTAINERS: New file (bug #524276).
 	* configure.in: Added 'sk' to ALL_LINGUAS.
 
+2008-02-01  Curtis Gedak  <gedakc@gmail.com>
+
+	* configure.in: gparted-0.3.5
+	  ===================================================
+
+2008-02-01  Curtis Gedak  <gedakc@gmail.com>
+
+	* gparted.desktop.in: Rolled back HIG code changes to 0.3.3
+	  - Reopens bugs #440012, and #381557
+	  - Rolls back debian patch 01_fix-desktop.patch
+	  - moved config.in: gparted-0.3.5 entry from 2008-01-30
+	    to 2008-02-01 to improve readability of ChangeLog entries
+
+2008-01-29  Curtis Gedak  <gedakc@gmail.com>
+
+	* gparted.desktop.in: Updated to align with GNOME Human
+	                      Interface Guidelines 2.0
+	  - Closes bug #440012
+
+2008-01-28  Curtis Gedak  <gedakc@gmail.com>
+
+	* src/Win_GParted.cc: Applied debian patch 04_Win_GParted.cc.diff
+	  - Fixed "crashes when rescanning devices after any operation",
+	    closes: #446522. Patch by Denis Sirotkin <fechiny@gmail.com>
+
+	* src/GParted_Core.cc: Applied debian patch
+	                       03_fdi_robustification.patch
+	  - Install a signal handler for cleaning up the automount disabling
+	     FDI, so that it will be cleaned up on program crashes, too.
+	  - Use storage.automount_enabled_hint instead of volume.ignore for the
+	    automount disabling FDI. That way, the new drives will at least
+	    appear in Gnome and the user can mount them manually.
+	  - Patch by Martin Pitt <martin.pitt@ubuntu.com>
+	  - LP: #134712
+	  - Closes: 434268
+
+	* include/Utils.h,
+	  include/OperationDetail.h: Applied debian patch
+	                             02_fix-build-failure-with-g++-4.3.patch
+	  - Fix build failures with g++-4.3. LP: #138584
+
+	* gparted.desktop.in: Applied debian patch 01_fix-desktop.patch
+	  - don't specify the encoding that's deprecated, update the categories
+	    and set the translation domain (LP: #145202)
+	  - Changes name to `Partition Editor`
+	  - Enables gksu to run gparted with
+
 2007-10-14  Yannig Marchegay  <yannig@marchegay.org>
 
 	* configure.in: Added 'oc' to ALL_LINGUAS.

configure.in

@@ -1,4 +1,4 @@
-AC_INIT(gparted, 0.3.4)
+AC_INIT(gparted, 0.3.5)
 AC_CONFIG_SRCDIR(src/main.cc)
 AM_INIT_AUTOMAKE
 
@@ -20,7 +20,7 @@ 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 lt lv mk nb ne nl oc pa pl pt pt_BR ru rw sk sl sv th tr uk vi zh_CN zh_HK zh_TW"
+ALL_LINGUAS="ar bg ca cs de dz el en_CA en_GB es eu fi fr gl he hu it ja lt lv mk nb ne nl oc pa pl pt pt_BR ru rw sl sv th tr uk vi zh_CN zh_HK zh_TW"
 
 AM_GLIB_GNU_GETTEXT
 AC_PROG_INTLTOOL

include/OperationDetail.h

@@ -22,6 +22,7 @@
 #include <glibmm/markup.h>
 
 #include <vector>
+#include <ctime>
 
 namespace GParted
 {

include/Utils.h

@@ -30,6 +30,7 @@
 #include <glibmm/ustring.h>
 
 #include <iostream>
+#include <ctime>
 
 namespace GParted
 {

po/ChangeLog

@@ -22,6 +22,11 @@
 
 	* eu.po: Updated Basque translation.
 
+2008-01-30  Curtis Gedak  <gedakc@gmail.com>
+
+	* gparted-0.3.5
+	  ===================================================
+
 2008-01-29  Jonh Wendell  <jwendell@gnome.org>
 
 	* pt_BR.po: Brazilian Portuguese translation updated by Djavan Fagundes.

src/GParted_Core.cc

@@ -38,6 +38,8 @@
 #include "../include/ufs.h"
 
 #include <cerrno>
+#include <cstdio>
+#include <csignal>
 #include <sys/statvfs.h>	
 
 std::vector<Glib::ustring> libparted_messages ; //see ped_exception_handler()
@@ -45,6 +47,13 @@ std::vector<Glib::ustring> libparted_messages ; //see ped_exception_handler()
 namespace GParted
 {
 
+// Clean up the fdi when terminating
+void sig_fdi_cleanup( int signum )
+{
+	remove( "/usr/share/hal/fdi/policy/gparted-disable-automount.fdi" );
+	raise( signum );
+}
+
 GParted_Core::GParted_Core() 
 {
 	lp_device = NULL ;
@@ -54,14 +63,37 @@ GParted_Core::GParted_Core()
 
 	ped_exception_set_handler( ped_exception_handler ) ; 
 
+	//make sure that the fdi is cleaned up on all but the most forceful
+	//program exits
+	struct sigaction sa;
+	sa.sa_handler = sig_fdi_cleanup;
+	sigemptyset( &sa.sa_mask );
+	sa.sa_flags = SA_RESETHAND;
+	if( sigaction( SIGHUP, &sa, NULL ) == -1 ||
+	    sigaction( SIGINT, &sa, NULL ) == -1 ||
+	    sigaction( SIGQUIT, &sa, NULL ) == -1 ||
+	    sigaction( SIGILL, &sa, NULL ) == -1 ||
+	    sigaction( SIGABRT, &sa, NULL ) == -1 ||
+	    sigaction( SIGFPE, &sa, NULL ) == -1 ||
+	    sigaction( SIGSEGV, &sa, NULL ) == -1 ||
+	    sigaction( SIGPIPE, &sa, NULL ) == -1 ||
+	    sigaction( SIGALRM, &sa, NULL ) == -1 ||
+	    sigaction( SIGTERM, &sa, NULL ) == -1 ||
+	    sigaction( SIGUSR1, &sa, NULL ) == -1 ||
+	    sigaction( SIGUSR2, &sa, NULL ) == -1 ||
+	    sigaction( SIGBUS, &sa, NULL ) == -1 ||
+	    sigaction( SIGXCPU, &sa, NULL ) == -1 ||
+	    sigaction( SIGXFSZ, &sa, NULL ) == -1 )
+		perror( "Could not set signal handler" );
+	
 	//disable automount //FIXME: temporary hack, till i find a better solution...
 	std::ofstream fdi_file( "/usr/share/hal/fdi/policy/gparted-disable-automount.fdi" ) ;
 	if ( fdi_file )
 	{
 		fdi_file << "<deviceinfo version='0.2'>" ;
 		fdi_file << "<device>" ;
-		fdi_file << "<match key='@block.storage_device:storage.hotpluggable' bool='true'>" ;
+		fdi_file << "<match key='storage.hotpluggable' bool='true'>" ;
-		fdi_file << "<merge key='volume.ignore' type='bool'>true</merge>" ;
+		fdi_file << "<merge key='storage.automount_enabled_hint' type='bool'>false</merge>" ;
 		fdi_file << "</match>" ;
 		fdi_file << "</device>" ;
 		fdi_file << "</deviceinfo>" ;

src/Win_GParted.cc

@@ -916,8 +916,13 @@ void Win_GParted::clear_operationslist()
 
 void Win_GParted::combo_devices_changed()
 {
+	unsigned int old_current_device = current_device;
 	//set new current device
 	current_device = combo_devices .get_active_row_number() ;
+	if ( current_device == (unsigned int) -1 )
+		current_device = old_current_device;
+	if ( current_device >= devices .size() )
+		current_device = 0 ;
 	set_title( String::ucompose( _("%1 - GParted"), devices[ current_device ] .get_path() ) );
 	
 	//refresh label_device_info