Author: colossus
Date: 2008-06-26 12:08:33 +0000 (Thu, 26 Jun 2008)
New Revision: 27153
Modified:
xarchiver/trunk/src/archive.c
xarchiver/trunk/src/archive.h
xarchiver/trunk/src/bzip2.c
xarchiver/trunk/src/interface.c
xarchiver/trunk/src/pref_dialog.c
xarchiver/trunk/src/pref_dialog.h
xarchiver/trunk/src/tar.c
xarchiver/trunk/src/window.c
Log:
Made the option 'Confirm Deletion' to work.
Changed icon and text of first category in the Preferences dialog.
Added the option 'Store archiver output' to have Xarchiver consumes less memory
on large archives.
Fixed some glitches with the progress bar when the archiver exits with an error.
Fixed bugs with the archiver output in the command line output window.
Modified: xarchiver/trunk/src/archive.c
===================================================================
--- xarchiver/trunk/src/archive.c 2008-06-26 09:21:05 UTC (rev 27152)
+++ xarchiver/trunk/src/archive.c 2008-06-26 12:08:33 UTC (rev 27153)
@@ -28,6 +28,7 @@
extern int add [15];
extern int extract [15];
extern int test [15];
+extern Prefs_dialog_data *prefs_window;
static gboolean xa_process_output (GIOChannel *ioc, GIOCondition cond,
gpointer data);
@@ -161,8 +162,10 @@
status = g_io_channel_read_line (ioc, &line, NULL,
NULL, NULL);
if (line != NULL)
{
+ if
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_window->store_output)))
+ archive->error_output = g_slist_prepend
(archive->error_output,g_strdup(line));
(*archive->parse_output) (line,archive);
- archive->error_output = g_slist_prepend
(archive->error_output,line);
+ g_free(line);
}
while (gtk_events_pending())
gtk_main_iteration();
@@ -174,11 +177,11 @@
else if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL) )
{
done:
- g_io_channel_shutdown (ioc, TRUE, NULL);
+ g_io_channel_shutdown (ioc,TRUE,NULL);
g_io_channel_unref (ioc);
xa_update_window_with_archive_entries (archive,NULL);
- gtk_tree_view_set_model (GTK_TREE_VIEW(archive->treeview),
archive->model);
+ gtk_tree_view_set_model
(GTK_TREE_VIEW(archive->treeview),archive->model);
g_object_unref (archive->model);
return FALSE;
}
@@ -274,16 +277,14 @@
g_free (archive);
}
-gboolean xa_delete_temp_directory (XArchive *archive,gboolean flag)
+void xa_delete_temp_directory (XArchive *archive,gboolean flag)
{
GSList *list = NULL;
gchar *command;
- gboolean result;
command = g_strconcat ("rm -rf ",archive->tmp,NULL);
list = g_slist_append(list,command);
- result = xa_run_command (archive,list);
- return result;
+ xa_run_command (archive,list);
}
gboolean xa_create_temp_directory (XArchive *archive,gchar tmp_dir[])
@@ -330,7 +331,7 @@
ps = waitpid (archive->child_pid, &status, WNOHANG);
if (ps < 0)
break;
- else if(xa_main_window) //avoid if we are on console
+ else if(xa_main_window)
gtk_main_iteration_do (FALSE);
usleep(1000); //give the processor time to rest (0.1
sec)
@@ -340,9 +341,8 @@
break;
_commands = _commands->next;
}
- g_slist_foreach (commands, (GFunc) g_free, NULL);
+ g_slist_foreach (commands,(GFunc) g_free,NULL);
g_slist_free(commands);
- g_print ("vado a xa_archive\n");
xa_archive_operation_finished(archive,result);
return result;
}
Modified: xarchiver/trunk/src/archive.h
===================================================================
--- xarchiver/trunk/src/archive.h 2008-06-26 09:21:05 UTC (rev 27152)
+++ xarchiver/trunk/src/archive.h 2008-06-26 12:08:33 UTC (rev 27153)
@@ -91,6 +91,7 @@
gboolean can_add;
gboolean can_extract;
gboolean has_properties;
+ gboolean list_reversed;
GString *comment;
GSList *error_output;
GType *column_types;
@@ -124,7 +125,7 @@
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_delete_temp_directory(XArchive *archive,gboolean flag);
+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);
gint xa_get_new_archive_idx();
Modified: xarchiver/trunk/src/bzip2.c
===================================================================
--- xarchiver/trunk/src/bzip2.c 2008-06-26 09:21:05 UTC (rev 27152)
+++ xarchiver/trunk/src/bzip2.c 2008-06-26 12:08:33 UTC (rev 27153)
@@ -104,7 +104,7 @@
command = g_strconcat(executable,"-f -d
",archive->tmp,"/",archive->escaped_path,NULL);
list = g_slist_append(list,command);
- result = xa_run_command (archive,list);
+ xa_run_command (archive,list);
/* and let's get its uncompressed file size */
if (_filename)
@@ -219,6 +219,6 @@
}
list = g_slist_append(list,command);
- result = xa_run_command (archive,list);
+ xa_run_command (archive,list);
}
}
Modified: xarchiver/trunk/src/interface.c
===================================================================
--- xarchiver/trunk/src/interface.c 2008-06-26 09:21:05 UTC (rev 27152)
+++ xarchiver/trunk/src/interface.c 2008-06-26 12:08:33 UTC (rev 27153)
@@ -50,7 +50,6 @@
void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location)
{
GdkPixbuf *icon;
-
xa_create_popup_menu();
tooltips = gtk_tooltips_new ();
accel_group = gtk_accel_group_new ();
@@ -227,7 +226,6 @@
view_shell_output1 = gtk_image_menu_item_new_with_mnemonic
(_("C_md-line output"));
gtk_container_add (GTK_CONTAINER (menuitem2_menu), view_shell_output1);
gtk_widget_add_accelerator (view_shell_output1,
"activate",accel_group,GDK_m, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
- gtk_widget_set_sensitive (view_shell_output1,FALSE);
gtk_widget_show (view_shell_output1);
image2 = gtk_image_new_from_stock ("gtk-find-and-replace",
GTK_ICON_SIZE_MENU);
@@ -469,6 +467,7 @@
int xa_progressbar_pulse (gpointer data)
{
+ //TODO to remove?
if ( ! xa_main_window)
return FALSE;
if ( ! GTK_WIDGET_VISIBLE(viewport2) )
@@ -827,7 +826,6 @@
void xa_create_delete_dialog(GtkMenuItem *menuitem, gpointer user_data)
{
- GtkTreeSelection *selection;
GtkWidget *ddialog1;
GtkWidget *ddialog_vbox1;
GtkWidget *dhbox1;
Modified: xarchiver/trunk/src/pref_dialog.c
===================================================================
--- xarchiver/trunk/src/pref_dialog.c 2008-06-26 09:21:05 UTC (rev 27152)
+++ xarchiver/trunk/src/pref_dialog.c 2008-06-26 12:08:33 UTC (rev 27153)
@@ -54,13 +54,13 @@
gchar *pixbuf_file =
g_strconcat(DATADIR,"/pixmaps/xarchiver-behaviour.svg",NULL);
icon_pixbuf = gdk_pixbuf_new_from_file (pixbuf_file,NULL);
g_free (pixbuf_file);
- gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf,
1, _("Behaviour"),2,0,-1);
+ gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf,
1, _("Archive"),2,0,-1);
if(icon_pixbuf != NULL)
g_object_unref (icon_pixbuf);
gtk_list_store_append (prefs_data->prefs_liststore, &iter);
- icon_pixbuf = gtk_widget_render_icon (prefs_data->dialog1, "gtk-find",
GTK_ICON_SIZE_DND, NULL);
- gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf,
1, _("View"),2,1,-1);
+ icon_pixbuf = gtk_widget_render_icon (prefs_data->dialog1,
"gtk-leave-fullscreen", GTK_ICON_SIZE_DND, NULL);
+ gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf,
1, _("Window"),2,1,-1);
g_object_unref (icon_pixbuf);
gtk_list_store_append (prefs_data->prefs_liststore, &iter);
@@ -85,7 +85,7 @@
GTK_WIDGET_UNSET_FLAGS (prefs_data->prefs_notebook, GTK_CAN_FOCUS);
g_signal_connect (G_OBJECT (prefs_iconview),
"selection-changed",G_CALLBACK (xa_prefs_iconview_changed), prefs_data);
- /* Behaviour page*/
+ /* Archive page*/
frame1 = gtk_frame_new (NULL);
gtk_container_add (GTK_CONTAINER (prefs_data->prefs_notebook), frame1);
gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_NONE);
@@ -123,11 +123,16 @@
prefs_data->confirm_deletion = gtk_check_button_new_with_mnemonic
(_("Confirm deletion of files"));
gtk_box_pack_start (GTK_BOX (vbox4), prefs_data->confirm_deletion,
FALSE, FALSE, 0);
gtk_button_set_focus_on_click (GTK_BUTTON
(prefs_data->confirm_deletion), FALSE);
+
+ prefs_data->store_output = gtk_check_button_new_with_mnemonic (_("Store
archiver output"));
+ gtk_box_pack_start (GTK_BOX (vbox4), prefs_data->store_output, FALSE,
FALSE, 0);
+ gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->store_output),
FALSE);
+ gtk_tooltips_set_tip(tooltips, prefs_data->store_output, _("It takes a
lot of memory with large archives!"), NULL);
label1 = gtk_label_new ("");
gtk_notebook_set_tab_label (GTK_NOTEBOOK (prefs_data->prefs_notebook),
gtk_notebook_get_nth_page (GTK_NOTEBOOK (prefs_data->prefs_notebook), 0),
label1);
- /* View page*/
+ /* Window page*/
frame2 = gtk_frame_new (NULL);
gtk_container_add (GTK_CONTAINER (prefs_data->prefs_notebook), frame2);
gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_NONE);
@@ -297,6 +302,8 @@
{
gtk_combo_box_set_active
(GTK_COMBO_BOX(prefs_data->combo_prefered_format),0);
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);
@@ -320,6 +327,7 @@
g_key_file_set_integer
(xa_key_file,PACKAGE,"preferred_format",gtk_combo_box_get_active
(GTK_COMBO_BOX(prefs_data->combo_prefered_format)));
g_key_file_set_boolean
(xa_key_file,PACKAGE,"allow_ext_dir_by_dnd",gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (prefs_data->allow_dir_extract_with_dnd)));
g_key_file_set_boolean
(xa_key_file,PACKAGE,"confirm_deletion",gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (prefs_data->confirm_deletion)));
+ 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)));
@@ -404,6 +412,7 @@
gtk_combo_box_set_active
(GTK_COMBO_BOX(prefs_data->combo_prefered_format),g_key_file_get_integer(xa_key_file,PACKAGE,"preferred_format",NULL));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
(prefs_data->allow_dir_extract_with_dnd),g_key_file_get_boolean(xa_key_file,PACKAGE,"allow_ext_dir_by_dnd",NULL));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
(prefs_data->confirm_deletion),g_key_file_get_boolean(xa_key_file,PACKAGE,"confirm_deletion",NULL));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
(prefs_data->store_output),g_key_file_get_boolean(xa_key_file,PACKAGE,"store_output",NULL));
gtk_combo_box_set_active
(GTK_COMBO_BOX(prefs_data->combo_archive_view),g_key_file_get_integer(xa_key_file,PACKAGE,"archive_view",NULL));
gtk_combo_box_set_active
(GTK_COMBO_BOX(prefs_data->combo_icon_size),g_key_file_get_integer(xa_key_file,PACKAGE,"icon_size",NULL));
Modified: xarchiver/trunk/src/pref_dialog.h
===================================================================
--- xarchiver/trunk/src/pref_dialog.h 2008-06-26 09:21:05 UTC (rev 27152)
+++ xarchiver/trunk/src/pref_dialog.h 2008-06-26 12:08:33 UTC (rev 27153)
@@ -22,7 +22,7 @@
typedef struct
{
GtkWidget *dialog1,*dialog_vbox1,*combo_prefered_format;
- GtkWidget *allow_dir_extract_with_dnd, *confirm_deletion,
*combo_archive_view,*combo_icon_size;
+ GtkWidget *allow_dir_extract_with_dnd, *confirm_deletion,
*store_output,*combo_archive_view,*combo_icon_size;
GtkWidget *check_show_comment,
*check_sort_filename_column,*show_location_bar,*combo_prefered_viewer;
GtkWidget *combo_prefered_web_browser, *combo_prefered_editor,
*combo_prefered_temp_dir, *check_save_geometry,*prefs_notebook;
GtkListStore *prefs_liststore;
Modified: xarchiver/trunk/src/tar.c
===================================================================
--- xarchiver/trunk/src/tar.c 2008-06-26 09:21:05 UTC (rev 27152)
+++ xarchiver/trunk/src/tar.c 2008-06-26 12:08:33 UTC (rev 27153)
@@ -333,7 +333,7 @@
/* Let's move the modified archive from /tmp to the original archive
location */
command = g_strconcat ("mv ",archive->tmp,"/",filename,"
",archive->escaped_path,NULL);
list = g_slist_append(list,command);
- result = xa_run_command (archive,list);
+ xa_run_command (archive,list);
}
gboolean is_tar_compressed (gint type)
Modified: xarchiver/trunk/src/window.c
===================================================================
--- xarchiver/trunk/src/window.c 2008-06-26 09:21:05 UTC (rev 27152)
+++ xarchiver/trunk/src/window.c 2008-06-26 12:08:33 UTC (rev 27153)
@@ -42,6 +42,11 @@
gboolean xa_check_child_for_error_on_exit(XArchive *archive,gint status)
{
+ if (GTK_WIDGET_REALIZED(viewport2))
+ {
+ gtk_widget_set_sensitive(Stop_button,FALSE);
+ gtk_widget_hide(viewport2);
+ }
if ( WIFEXITED (status) )
{
if (WEXITSTATUS (status))
@@ -64,6 +69,42 @@
return TRUE;
}
+void xa_archive_operation_finished(XArchive *archive,gboolean error)
+{
+ if(xa_main_window)
+ {
+ if (archive->has_comment)
+ gtk_widget_set_sensitive (comment_menu,TRUE);
+ else
+ gtk_widget_set_sensitive (comment_menu,FALSE);
+
+ xa_set_button_state
(1,1,1,archive->can_add,archive->can_extract,archive->has_sfx,archive->has_test,archive->has_properties);
+ if (error)
+ Update_StatusBar ( _("Operation completed."));
+ else
+ Update_StatusBar ( _("Operation failed!"));
+
+ if (archive->has_comment && archive->status ==
XA_ARCHIVESTATUS_OPEN &&
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_window->check_show_comment)))
+ xa_show_archive_comment (NULL, NULL);
+
+ gtk_widget_grab_focus (GTK_WIDGET(archive->treeview));
+ }
+
+ if (archive->status == XA_ARCHIVESTATUS_ADD || archive->status ==
XA_ARCHIVESTATUS_DELETE)
+ xa_reload_archive_content(archive);
+
+ else if (archive->status == XA_ARCHIVESTATUS_SFX && archive->type ==
XARCHIVETYPE_RAR)
+ {
+ if(xa_main_window)
+ gtk_widget_set_sensitive ( exe_menu, FALSE);
+ response = xa_show_message_dialog (GTK_WINDOW
(xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_INFO,GTK_BUTTONS_OK,_("The sfx
archive was saved as:"),archive->tmp );
+ }
+ if (archive->status == XA_ARCHIVESTATUS_TEST)
+ xa_show_cmd_line_output (NULL);
+
+ archive->status = XA_ARCHIVESTATUS_IDLE;
+}
+
void xa_reload_archive_content(XArchive *archive)
{
XEntry *entry;
@@ -128,55 +169,6 @@
}
}
-void xa_archive_operation_finished(XArchive *archive,gboolean error)
-{
- if(xa_main_window)
- {
- gtk_widget_set_sensitive(Stop_button,FALSE);
- gtk_widget_hide(viewport2);
- }
- g_print ("Sono in xa_archive_operation_finished\n");
- if (archive->status == XA_ARCHIVESTATUS_ADD || archive->status ==
XA_ARCHIVESTATUS_DELETE)
- {
- xa_reload_archive_content(archive);
- return;
- }
-
- if(xa_main_window)
- {
- if (archive->has_comment)
- gtk_widget_set_sensitive (comment_menu,TRUE);
- else
- gtk_widget_set_sensitive (comment_menu,FALSE);
-
- if (archive->has_comment && archive->status ==
XA_ARCHIVESTATUS_OPEN &&
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_window->check_show_comment)))
- xa_show_archive_comment (NULL, NULL);
- }
-
- if (archive->status == XA_ARCHIVESTATUS_SFX && archive->type ==
XARCHIVETYPE_RAR)
- {
- if(xa_main_window)
- gtk_widget_set_sensitive ( exe_menu, FALSE);
- response = xa_show_message_dialog (GTK_WINDOW
(xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_INFO,GTK_BUTTONS_OK,_("The sfx
archive was saved as:"),archive->tmp );
- }
-
- if(xa_main_window)
- {
- xa_set_button_state
(1,1,1,archive->can_add,archive->can_extract,archive->has_sfx,archive->has_test,archive->has_properties);
- if (error)
- Update_StatusBar ( _("Operation completed."));
- else
- Update_StatusBar ( _("Operation failed!"));
- }
-
- if (archive->status == XA_ARCHIVESTATUS_TEST)
- xa_show_cmd_line_output (NULL);
-
- if(xa_main_window)
- gtk_widget_grab_focus (GTK_WIDGET(archive->treeview));
- archive->status = XA_ARCHIVESTATUS_IDLE;
-}
-
void xa_watch_child (GPid pid,gint status,gpointer data)
{
gboolean result;
@@ -234,7 +226,6 @@
xa_set_button_state (1,1,1,1,0,0,0,0 );
archive[current_page]->has_passwd = FALSE;
- gtk_widget_set_sensitive(view_shell_output1,TRUE);
gtk_widget_set_sensitive(check_menu,FALSE);
gtk_widget_set_sensitive(properties,FALSE );
xa_disable_delete_view_buttons(FALSE);
@@ -351,7 +342,6 @@
xa_add_page (archive[current_page]);
xa_disable_delete_view_buttons (FALSE);
- gtk_widget_set_sensitive (view_shell_output1,TRUE);
g_free (path);
gtk_widget_set_sensitive (Stop_button,TRUE);
@@ -448,7 +438,6 @@
current_page = gtk_notebook_get_n_pages(notebook);
if (current_page == 0)
{
- gtk_widget_set_sensitive (view_shell_output1,FALSE);
gtk_widget_set_sensitive (check_menu,FALSE);
gtk_widget_set_sensitive (properties,FALSE);
gtk_widget_set_sensitive (up_button,FALSE);
@@ -545,9 +534,12 @@
g_list_free (row_list);
}
- response = xa_show_message_dialog (GTK_WINDOW
(xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_YES_NO,"You
are about to delete entries from the archive.",_( "Are you sure you want to do
this?") );
- if (response == GTK_RESPONSE_NO || response ==
GTK_RESPONSE_DELETE_EVENT)
- return;
+ if
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_window->confirm_deletion)))
+ {
+ response = xa_show_message_dialog (GTK_WINDOW
(xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_YES_NO,"You
are about to delete entries from the archive.",_( "Are you sure you want to do
this?") );
+ if (response == GTK_RESPONSE_NO || response ==
GTK_RESPONSE_DELETE_EVENT)
+ return;
+ }
Update_StatusBar ( _("Deleting files from the archive, please
wait..."));
(*archive[id]->delete) (archive[id],names);
@@ -647,7 +639,7 @@
archive[idx]->tmp[l + 3] = 'x';
archive[idx]->tmp[l + 4] = 0;
}
- result = xa_run_command(archive[idx],list);
+ xa_run_command(archive[idx],list);
}
break;
@@ -714,7 +706,7 @@
list = g_slist_append(list,command);
command = g_strconcat ("zip -A
",archive_name_escaped,NULL);
list = g_slist_append(list,command);
- result = xa_run_command (archive[idx],list);
+ xa_run_command (archive[idx],list);
}
g_free (archive_name);
g_free (archive_name_escaped);
@@ -819,7 +811,7 @@
command = g_strconcat ("chmod 755
",archive_name_escaped,NULL);
list = g_slist_append(list,command);
- result = xa_run_command (archive[idx],list);
+ xa_run_command (archive[idx],list);
}
g_free (archive_name);
g_free (archive_name_escaped);
@@ -829,7 +821,7 @@
case XARCHIVETYPE_ARJ:
command = g_strconcat ("arj y -je1 " , archive[idx]->escaped_path,
NULL);
list = g_slist_append(list,command);
- result = xa_run_command (archive[idx],list);
+ xa_run_command (archive[idx],list);
break;
default:
@@ -1191,16 +1183,18 @@
gboolean result;
gtk_tree_model_get (model, iter, 1, &filename, -1);
- if ( strcasestr (filename, key) ) result = FALSE;
- else result = TRUE;
+ if (strcasestr (filename, key))
+ result = FALSE;
+ else
+ result = TRUE;
g_free (filename);
return result;
}
void xa_show_cmd_line_output (GtkMenuItem *menuitem)
{
+ GSList *output = NULL;
widget_data *xa_cmd_line_output;
- GSList *output = NULL;
gchar *line = NULL;
gchar *utf8_line;
gsize bytes_written;
@@ -1211,7 +1205,13 @@
idx = xa_find_archive_index (current_page);
xa_cmd_line_output = xa_create_output_window(_("Command line output"));
- output = g_slist_reverse (archive[idx]->error_output);
+ if ( ! archive[idx]->list_reversed)
+ {
+ archive[idx]->error_output =
g_slist_reverse(archive[idx]->error_output);
+ archive[idx]->list_reversed = TRUE;
+ }
+
+ output = archive[idx]->error_output;
while (output)
{
line = output->data;
@@ -1235,7 +1235,7 @@
if (archive[idx]->status == XA_ARCHIVESTATUS_ADD ||
archive[idx]->status == XA_ARCHIVESTATUS_SFX)
{
- response = xa_show_message_dialog (GTK_WINDOW
(xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_YES_NO,_("Doing
so will probably corrupt your archive!"),_("Do you really want to cancel?") );
+ response = xa_show_message_dialog
(GTK_WINDOW(xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_YES_NO,_("Doing
so will probably corrupt your archive!"),_("Do you really want to cancel?") );
if (response == GTK_RESPONSE_NO)
return;
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
