[Xfce4-commits] r27217 - xarchiver/trunk/src

Giuseppe Torelli colossus at xfce.org
Sun Jul 6 07:36:19 CEST 2008


Author: colossus
Date: 2008-07-06 05:36:19 +0000 (Sun, 06 Jul 2008)
New Revision: 27217

Modified:
   xarchiver/trunk/src/add_dialog.c
   xarchiver/trunk/src/archive.c
   xarchiver/trunk/src/archive.h
   xarchiver/trunk/src/bzip2.c
   xarchiver/trunk/src/deb.c
   xarchiver/trunk/src/pref_dialog.c
   xarchiver/trunk/src/rpm.c
   xarchiver/trunk/src/tar.c
   xarchiver/trunk/src/window.c
Log:
Applied patch from Diego Ongaro that get rid of tmp_dir[14] in xa_create_temp_directory.
Made xa_create_temp_directory to respect the setting "Preferred temp dir".
Fixed Gtk-CRITICAL **: gtk_combo_box_get_active_text in pref_dialog.c
Get rid of message "Operation failed".


Modified: xarchiver/trunk/src/add_dialog.c
===================================================================
--- xarchiver/trunk/src/add_dialog.c	2008-07-05 23:43:39 UTC (rev 27216)
+++ xarchiver/trunk/src/add_dialog.c	2008-07-06 05:36:19 UTC (rev 27217)
@@ -342,7 +342,6 @@
 	gchar *compression_string = NULL;
 	gchar *command = NULL;
 	gchar *new_path = NULL;
-	gchar tmp_dir[14];
 	gboolean done = FALSE;
 	gboolean result = FALSE;
 	GSList *files = NULL;
@@ -384,7 +383,7 @@
 			/* This in case the user wants to add files not in the archive root directory */
 			if (archive->location_entry_path != NULL)
 			{
-				result = xa_create_temp_directory(archive,tmp_dir);
+				result = xa_create_temp_directory(archive);
 				if (result == FALSE)
 					return;
 

Modified: xarchiver/trunk/src/archive.c
===================================================================
--- xarchiver/trunk/src/archive.c	2008-07-05 23:43:39 UTC (rev 27216)
+++ xarchiver/trunk/src/archive.c	2008-07-06 05:36:19 UTC (rev 27217)
@@ -72,7 +72,6 @@
 		&archive->error_fd,
 		&error) )
 	{
-		Update_StatusBar (_("Operation failed."));
 		response = xa_show_message_dialog (NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK, _("Can't run the archiver executable:"),error->message);
 		g_error_free (error);
 		g_strfreev ( argv );
@@ -259,23 +258,27 @@
 	xa_run_command (archive,list);
 }
 
-gboolean xa_create_temp_directory (XArchive *archive,gchar tmp_dir[])
+gboolean xa_create_temp_directory (XArchive *archive)
 {
+	gchar *tmp_dir;
+	gchar *value;
+
 	if (archive->tmp != NULL)
 		return TRUE;
-	//TODO use the user set tmp dir in the pref dialog
-	strcpy (tmp_dir,"/tmp/xa-XXXXXX");
+
+	value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_window->combo_prefered_temp_dir));
+	tmp_dir = g_strconcat(value,"/xa-XXXXXX",NULL);
+
 	if (mkdtemp (tmp_dir) == 0)
 	{
+		g_free(tmp_dir);
+		tmp_dir = NULL;
+
 		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't create temporary directory in /tmp:"),g_strerror(errno) );
-		if(xa_main_window) //avoid if we're on console
-		{
-			gtk_widget_set_sensitive (Stop_button, FALSE);
-			Update_StatusBar (_("Operation failed."));
-		}
 		return FALSE;
 	}
-	archive->tmp = strdup(tmp_dir);
+
+	archive->tmp = tmp_dir;
 	return TRUE;
 }
 

Modified: xarchiver/trunk/src/archive.h
===================================================================
--- xarchiver/trunk/src/archive.h	2008-07-05 23:43:39 UTC (rev 27216)
+++ xarchiver/trunk/src/archive.h	2008-07-06 05:36:19 UTC (rev 27217)
@@ -133,7 +133,7 @@
 XArchive *xa_init_archive_structure(gint);
 void xa_clean_archive_structure (XArchive *archive);
 gboolean xa_dump_child_error_messages (GIOChannel *ioc, GIOCondition cond, gpointer data);
-gboolean xa_create_temp_directory(XArchive *archive,gchar tmp_dir[]);
+gboolean xa_create_temp_directory(XArchive *archive);
 void xa_delete_temp_directory(XArchive *archive,gboolean flag);
 gboolean xa_run_command (XArchive *archive,GSList *commands);
 gint xa_find_archive_index (gint page_num);

Modified: xarchiver/trunk/src/bzip2.c
===================================================================
--- xarchiver/trunk/src/bzip2.c	2008-07-05 23:43:39 UTC (rev 27216)
+++ xarchiver/trunk/src/bzip2.c	2008-07-06 05:36:19 UTC (rev 27217)
@@ -29,7 +29,6 @@
 void xa_open_bzip2_lzma (XArchive *archive,GString *dummy)
 {
 	XEntry *entry = NULL;
-	gchar tmp_dir[14] = "";
 	gchar *filename = NULL;;
 	gchar *_filename;
 	gpointer item[2];
@@ -88,8 +87,8 @@
 
 		char *names[]= {(_("Compressed")),(_("Size"))};
 		xa_create_liststore (archive,names);
-		result = xa_create_temp_directory (archive,tmp_dir);
-		if (result == 0)
+		result = xa_create_temp_directory (archive);
+		if (!result)
 			return;
 
 		/* Let's copy the bzip2 file in the tmp dir */
@@ -175,7 +174,6 @@
 {
 	GSList *list = NULL;
 	gchar *command,*executable = NULL,*filename = NULL, *dot = NULL, *filename_noext = NULL;
-	gchar tmp_dir[14] = "";
 	gboolean result = FALSE;
 
 	filename = xa_remove_path_from_archive_name(archive->escaped_path);
@@ -197,8 +195,8 @@
 		break;
 	}
 
-	result = xa_create_temp_directory(archive,tmp_dir);
-	if (result == 0)
+	result = xa_create_temp_directory(archive);
+	if (!result)
 		return;
 
 	

Modified: xarchiver/trunk/src/deb.c
===================================================================
--- xarchiver/trunk/src/deb.c	2008-07-05 23:43:39 UTC (rev 27216)
+++ xarchiver/trunk/src/deb.c	2008-07-06 05:36:19 UTC (rev 27217)
@@ -32,20 +32,19 @@
 	gchar *archive_no_path = NULL;
 	gboolean result;
 	unsigned short int i;
-	gchar tmp_dir[14] = "";
 
 	/* Create a unique tmp dir in /tmp */
-	result = xa_create_temp_directory (archive,tmp_dir);
-	if (result == 0)
+	result = xa_create_temp_directory (archive);
+	if (!result)
 		return;
 
 	archive_no_path = g_strrstr (archive->escaped_path,"/");
 	if (archive_no_path == NULL)
-		dummy = g_strconcat (tmp_dir,"/",archive->escaped_path,NULL);
+		dummy = g_strconcat (archive->tmp,"/",archive->escaped_path,NULL);
 	else
 	{
 		archive_no_path++;
-		dummy = g_strconcat (tmp_dir,"/",archive_no_path,NULL);
+		dummy = g_strconcat (archive->tmp,"/",archive_no_path,NULL);
 	}
 	/* Copy the .deb archive to the unique dir */
 	command = g_strconcat ("cp ",archive->escaped_path," ",archive->tmp,NULL);

Modified: xarchiver/trunk/src/pref_dialog.c
===================================================================
--- xarchiver/trunk/src/pref_dialog.c	2008-07-05 23:43:39 UTC (rev 27216)
+++ xarchiver/trunk/src/pref_dialog.c	2008-07-06 05:36:19 UTC (rev 27217)
@@ -133,18 +133,6 @@
 	gtk_table_set_row_spacings (GTK_TABLE (table1), 2);
 	gtk_table_set_col_spacings (GTK_TABLE (table1), 4);
 
-	/*label5 = gtk_label_new (_("View archive content as"));
-	gtk_table_attach (GTK_TABLE (table1), label5, 0, 1, 0, 1,
-                     (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (GTK_SHRINK), 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (label5), 0, 0.5);
-	prefs_data->combo_archive_view = gtk_combo_box_new_text();
-	gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_archive_view), _("list") );
-	gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_archive_view), _("icon") );
-	gtk_table_attach (GTK_TABLE (table1), prefs_data->combo_archive_view, 1, 2, 0, 1,
-                     (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (GTK_SHRINK), 0, 0);*/
-	
 	label9 = gtk_label_new (_("Size of the mime type icons"));
 	gtk_table_attach (GTK_TABLE (table1), label9, 0, 1, 0, 1,
                      (GtkAttachOptions) (GTK_FILL),
@@ -314,15 +302,16 @@
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_data->confirm_deletion),TRUE);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_data->store_output),FALSE);
 	
-
-	//gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_archive_view),0);
 	gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_icon_size),0);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_data->show_location_bar),TRUE);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_data->show_sidebar),TRUE);
 
-	gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_web_browser),0);
-	gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_editor),0);
-	gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_viewer),0);
+	if (! xdg_open)
+	{
+		gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_web_browser),0);
+		gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_editor),0);
+		gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_viewer),0);
+	}
 	gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir),0);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_data->check_save_geometry),FALSE);
 }
@@ -330,7 +319,7 @@
 void xa_prefs_save_options(Prefs_dialog_data *prefs_data, const char *filename)
 {
 	gchar *conf;
-	gchar *value;
+	gchar *value= NULL;
 	FILE *fp;
 	gint bytes_written, len;
 	GKeyFile *xa_key_file = g_key_file_new();
@@ -340,37 +329,38 @@
 	g_key_file_set_boolean (xa_key_file,PACKAGE,"sort_filename_content",gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs_data->check_sort_filename_column)));
 	g_key_file_set_boolean (xa_key_file,PACKAGE,"store_output",gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs_data->store_output)));
 
-	//g_key_file_set_integer (xa_key_file,PACKAGE,"archive_view",gtk_combo_box_get_active (GTK_COMBO_BOX(prefs_data->combo_archive_view)));
 	g_key_file_set_integer (xa_key_file,PACKAGE,"icon_size",gtk_combo_box_get_active (GTK_COMBO_BOX(prefs_data->combo_icon_size)));
 	g_key_file_set_boolean (xa_key_file,PACKAGE,"show_archive_comment",gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs_data->check_show_comment)));
 	g_key_file_set_boolean (xa_key_file,PACKAGE,"show_sidebar",gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs_data->show_sidebar)));
 	g_key_file_set_boolean (xa_key_file,PACKAGE,"show_location_bar",gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs_data->show_location_bar)));
 	
-	value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_data->combo_prefered_web_browser));
-	if (value != NULL)
+	if ( ! xdg_open)
 	{
-		g_key_file_set_string (xa_key_file,PACKAGE,"preferred_web_browser",value);
-		g_free (value);
+		value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_data->combo_prefered_web_browser));
+		if (value != NULL)
+		{
+			g_key_file_set_string (xa_key_file,PACKAGE,"preferred_web_browser",value);
+			g_free (value);
+		}
+		value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_data->combo_prefered_editor));
+		if (value != NULL)
+		{
+			g_key_file_set_string (xa_key_file,PACKAGE,"preferred_editor",value);
+			g_free(value);
+		}
+		value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_data->combo_prefered_viewer));
+		if (value != NULL)
+		{
+			g_key_file_set_string (xa_key_file,PACKAGE,"preferred_viewer",value);
+			g_free(value);
+		}
 	}
-	value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_data->combo_prefered_editor));
-	if (value != NULL)
-	{
-		g_key_file_set_string (xa_key_file,PACKAGE,"preferred_editor",value);
-		g_free(value);
-	}
-	value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_data->combo_prefered_viewer));
-	if (value != NULL)
-	{
-		g_key_file_set_string (xa_key_file,PACKAGE,"preferred_viewer",value);
-		g_free(value);
-	}
 	value = gtk_combo_box_get_active_text (GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir));
 	if (value != NULL)
 	{
 		g_key_file_set_string (xa_key_file,PACKAGE,"preferred_temp_dir",value);
 		g_free(value);
 	}
-
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_data->check_save_geometry)) )
 	{
 		prefs_data->geometry[4] = gtk_paned_get_position(GTK_PANED(hpaned1));
@@ -434,38 +424,41 @@
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(prefs_data->show_sidebar),g_key_file_get_boolean(xa_key_file,PACKAGE,"show_sidebar",NULL));
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(prefs_data->show_location_bar),g_key_file_get_boolean(xa_key_file,PACKAGE,"show_location_bar",NULL));
 
-		value = g_key_file_get_string(xa_key_file,PACKAGE,"preferred_web_browser",NULL);
-		if (value != NULL)
+		if ( ! xdg_open)
 		{
-			gtk_combo_box_remove_text(GTK_COMBO_BOX (prefs_data->combo_prefered_web_browser),0);
-			gtk_combo_box_prepend_text(GTK_COMBO_BOX(prefs_data->combo_prefered_web_browser),value);
-			gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_web_browser),0);
-			g_free(value);
+			value = g_key_file_get_string(xa_key_file,PACKAGE,"preferred_web_browser",NULL);
+			if (value != NULL)
+			{
+				gtk_combo_box_remove_text(GTK_COMBO_BOX (prefs_data->combo_prefered_web_browser),0);
+				gtk_combo_box_prepend_text(GTK_COMBO_BOX(prefs_data->combo_prefered_web_browser),value);
+				gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_web_browser),0);
+				g_free(value);
+			}
+			value = g_key_file_get_string(xa_key_file,PACKAGE,"preferred_editor",NULL);
+			if (value != NULL)
+			{
+				gtk_combo_box_remove_text(GTK_COMBO_BOX (prefs_data->combo_prefered_editor),0);
+				gtk_combo_box_insert_text (GTK_COMBO_BOX(prefs_data->combo_prefered_editor),0,value);
+				gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_editor),0);
+				g_free(value);
+			}
+			value = g_key_file_get_string(xa_key_file,PACKAGE,"preferred_viewer",NULL);
+			if (value != NULL)
+			{
+				gtk_combo_box_remove_text(GTK_COMBO_BOX (prefs_data->combo_prefered_viewer),0);
+				gtk_combo_box_insert_text (GTK_COMBO_BOX(prefs_data->combo_prefered_viewer),0,value);
+				gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_viewer),0);
+				g_free(value);
+			}
+			value = g_key_file_get_string(xa_key_file,PACKAGE,"preferred_temp_dir",NULL);
+			if (value != NULL)
+			{
+				gtk_combo_box_remove_text(GTK_COMBO_BOX (prefs_data->combo_prefered_temp_dir),0);
+				gtk_combo_box_insert_text (GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir),0,value);
+				gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir),0);
+				g_free(value);
+			}
 		}
-		value = g_key_file_get_string(xa_key_file,PACKAGE,"preferred_editor",NULL);
-		if (value != NULL)
-		{
-			gtk_combo_box_remove_text(GTK_COMBO_BOX (prefs_data->combo_prefered_editor),0);
-			gtk_combo_box_insert_text (GTK_COMBO_BOX(prefs_data->combo_prefered_editor),0,value);
-			gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_editor),0);
-			g_free(value);
-		}
-		value = g_key_file_get_string(xa_key_file,PACKAGE,"preferred_viewer",NULL);
-		if (value != NULL)
-		{
-			gtk_combo_box_remove_text(GTK_COMBO_BOX (prefs_data->combo_prefered_viewer),0);
-			gtk_combo_box_insert_text (GTK_COMBO_BOX(prefs_data->combo_prefered_viewer),0,value);
-			gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_viewer),0);
-			g_free(value);
-		}
-		value = g_key_file_get_string(xa_key_file,PACKAGE,"preferred_temp_dir",NULL);
-		if (value != NULL)
-		{
-			gtk_combo_box_remove_text(GTK_COMBO_BOX (prefs_data->combo_prefered_temp_dir),0);
-			gtk_combo_box_insert_text (GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir),0,value);
-			gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir),0);
-			g_free(value);
-		}
 		gtk_combo_box_set_active (GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir),0);
 		coords = g_key_file_get_integer_list(xa_key_file, PACKAGE, "geometry", &coords_len, &error);
 		if (error)

Modified: xarchiver/trunk/src/rpm.c
===================================================================
--- xarchiver/trunk/src/rpm.c	2008-07-05 23:43:39 UTC (rev 27216)
+++ xarchiver/trunk/src/rpm.c	2008-07-06 05:36:19 UTC (rev 27217)
@@ -95,8 +95,8 @@
 	fclose (stream);
 
 	/* Create a unique temp dir in /tmp */
-	result = xa_create_temp_directory (archive,tmp_dir);
-	if (result == 0)
+	result = xa_create_temp_directory (archive);
+	if (!result)
 		return;
 
 	gzip_tmp = g_strconcat (archive->tmp,"/file.gz_bz",NULL);
@@ -133,7 +133,6 @@
     {
 	    if ( WEXITSTATUS (exit_code) )
     	{
-            Update_StatusBar ( _("Operation failed."));
             gtk_widget_hide ( viewport2 );
 	    	xa_set_window_title (xa_main_window , NULL);
 		    response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_YES_NO,_("An error occurred while decompressing the cpio archive."),_("Do you want to view the command line output?") );

Modified: xarchiver/trunk/src/tar.c
===================================================================
--- xarchiver/trunk/src/tar.c	2008-07-05 23:43:39 UTC (rev 27216)
+++ xarchiver/trunk/src/tar.c	2008-07-06 05:36:19 UTC (rev 27217)
@@ -321,7 +321,6 @@
 void xa_add_delete_bzip2_gzip_lzma_compressed_tar (GString *_list,XArchive *archive,gboolean add)
 {
 	gchar *command = NULL,*executable = NULL,*filename = NULL;
-	gchar tmp_dir[14] = "";
 	gboolean result;
 	GSList *list = NULL;
 
@@ -344,8 +343,8 @@
 		break;
 	}
 	/* Let's copy the archive to /tmp first */
-	result = xa_create_temp_directory(archive,tmp_dir);
-	if (result == 0)
+	result = xa_create_temp_directory(archive);
+	if (!result)
 		return;
 
 	/* Let's copy the archive to /tmp first */
@@ -384,7 +383,6 @@
 {
 	XEntry *entry;
 	gchar *command = NULL;
-	gchar tmp_dir[14] = "";
 	GtkTreeSelection *selection;
 	GString *names;
 	GtkTreeIter iter;
@@ -426,8 +424,8 @@
 		}
 	}
 
-	result = xa_create_temp_directory (archive,tmp_dir);
-	if (result == 0)
+	result = xa_create_temp_directory (archive);
+	if (!result)
 	{
 		g_string_free(names,TRUE);
 		return;

Modified: xarchiver/trunk/src/window.c
===================================================================
--- xarchiver/trunk/src/window.c	2008-07-05 23:43:39 UTC (rev 27216)
+++ xarchiver/trunk/src/window.c	2008-07-06 05:36:19 UTC (rev 27217)
@@ -53,10 +53,9 @@
 		{
 			if (WEXITSTATUS (status) == 1 && archive->type == XARCHIVETYPE_ZIP)
 				return TRUE;
-			Update_StatusBar ( _("Operation failed."));
 			if ( ! gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_window->store_output)))
 			{
-				response = xa_show_message_dialog(GTK_WINDOW(xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("An error occurred!"),_("Please uncheck the 'Store archiver output' option to see it.") );	
+				response = xa_show_message_dialog(GTK_WINDOW(xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("An error occurred!"),_("Please check the 'Store archiver output' option to see it.") );	
 				return FALSE;
 			}
 			xa_set_button_state (1,1,1,archive->can_add,archive->can_extract,0,archive->has_test,archive->has_properties);
@@ -670,7 +669,6 @@
 				result = g_file_get_contents (unzipsfx_path,&content,&length,&error);
 				if ( ! result)
 				{
-					Update_StatusBar (_("Operation failed."));
 					gtk_widget_set_sensitive (Stop_button,FALSE);
 					response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't convert the archive to self-extracting:"),error->message);
 					g_error_free (error);
@@ -683,7 +681,6 @@
 				sfx_archive = g_fopen ( archive_name ,"w" );
 				if (sfx_archive == NULL)
 				{
-					Update_StatusBar (_("Operation failed."));
 					gtk_widget_set_sensitive (Stop_button,FALSE);
 					response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't write the unzipsfx module to the archive:"),g_strerror(errno) );
 					return;
@@ -779,7 +776,6 @@
 				result = g_file_get_contents (sfx_path,&content,&length,&error);
 				if ( ! result)
 				{
-					Update_StatusBar (_("Operation failed."));
 					response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't convert the archive to self-extracting:"),error->message);
 					g_error_free (error);
 					g_free (sfx_path);
@@ -791,7 +787,6 @@
 				sfx_archive = g_fopen ( archive_name ,"w" );
 				if (sfx_archive == NULL)
 				{
-					Update_StatusBar (_("Operation failed."));
 					response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't write the unzipsfx module to the archive:"),g_strerror(errno) );
 					return;
 				}



More information about the Xfce4-commits mailing list