Author: colossus
Date: 2006-11-16 13:00:30 +0000 (Thu, 16 Nov 2006)
New Revision: 23893
Modified:
xarchiver/trunk/ChangeLog
xarchiver/trunk/src/callbacks.c
xarchiver/trunk/src/interface.c
Log:
All the buttons are disabled when the user clicks on a tab who contains an idle
archive while another one is being loaded.
Fixed wrong use of strstr() instead of strcmp() when the user tries to open an
archive already open.
Updated Changelog.
Modified: xarchiver/trunk/ChangeLog
===================================================================
--- xarchiver/trunk/ChangeLog 2006-11-16 11:54:32 UTC (rev 23892)
+++ xarchiver/trunk/ChangeLog 2006-11-16 13:00:30 UTC (rev 23893)
@@ -18,7 +18,7 @@
- Fixed code to compile under Solaris.
- Changed some strings for a better usability.
- A lot of other small bug fixes; thanks to baze for notifying
most of them.
- - Fixed bugs #2434, #2321, #2247, #1736, #2455, #2451.
+ - Fixed bugs #2434, #2321, #22477, #1736, #2455, #2451, #2552
and others I forgot .
01/09/06 - 0.4:
- Added symbolic link column in tar/tar.bz2/tar.gz and RPM
archives.
Modified: xarchiver/trunk/src/callbacks.c
===================================================================
--- xarchiver/trunk/src/callbacks.c 2006-11-16 11:54:32 UTC (rev 23892)
+++ xarchiver/trunk/src/callbacks.c 2006-11-16 13:00:30 UTC (rev 23893)
@@ -322,7 +322,7 @@
current_page = xa_find_archive_index ( x );
if (current_page == -1)
break;
- if (strstr (path,archive[current_page]->path) )
+ if (strcmp (path,archive[current_page]->path) == 0)
return;
}
@@ -393,10 +393,12 @@
gtk_widget_set_sensitive (Stop_button,TRUE);
gtk_widget_show ( viewport2 );
+
if ( archive[current_page]->type == XARCHIVETYPE_ISO )
Update_StatusBar ( _("Please wait while the content of the ISO
image is being read..."));
else
Update_StatusBar ( _("Please wait while the content of the
archive is being read..."));
+
archive[current_page]->status = XA_ARCHIVESTATUS_OPEN;
gtk_widget_set_sensitive ( close1 , FALSE);
gtk_widget_set_sensitive ( check_menu , FALSE);
@@ -538,6 +540,7 @@
gtk_widget_set_sensitive (check_menu,FALSE);
gtk_widget_set_sensitive (properties,FALSE);
gtk_widget_set_sensitive (close1,FALSE);
+ OffDeleteandViewButtons();
xa_set_button_state (1,1,0,0,0,0);
xa_set_window_title (MainWindow,NULL);
}
Modified: xarchiver/trunk/src/interface.c
===================================================================
--- xarchiver/trunk/src/interface.c 2006-11-16 11:54:32 UTC (rev 23892)
+++ xarchiver/trunk/src/interface.c 2006-11-16 13:00:30 UTC (rev 23893)
@@ -434,6 +434,18 @@
xa_set_window_title (MainWindow , archive[id]->path);
gtk_widget_set_sensitive ( iso_info,FALSE );
+
+ if (archive[id]->status == XA_ARCHIVESTATUS_IDLE)
+ {
+ gtk_widget_set_sensitive ( Stop_button , FALSE);
+ return;
+ }
+ else
+ {
+ gtk_widget_set_sensitive ( Stop_button , TRUE);
+ return;
+ }
+
if ( archive[id]->type == XARCHIVETYPE_BZIP2 || archive[id]->type ==
XARCHIVETYPE_GZIP )
{
new = open = TRUE;
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
