Author: colossus
Date: 2006-07-24 08:54:19 +0000 (Mon, 24 Jul 2006)
New Revision: 22520
Modified:
xarchiver/trunk/src/callbacks.c
xarchiver/trunk/src/iso.c
xarchiver/trunk/src/main.c
Log:
Fixed seg fault when dropping an archive in the Xarchiver's empty window.
Fixed inability to quit Xarchiver when opening an ISO image.
Modified: xarchiver/trunk/src/callbacks.c
===================================================================
--- xarchiver/trunk/src/callbacks.c 2006-07-23 22:45:09 UTC (rev 22519)
+++ xarchiver/trunk/src/callbacks.c 2006-07-24 08:54:19 UTC (rev 22520)
@@ -449,8 +449,8 @@
if (archive != NULL)
{
if ( archive->status != XA_ARCHIVESTATUS_IDLE)
- {
- Update_StatusBar ( _("Please hit the Stop button first!"));
+ {
+ Update_StatusBar ( _("Please hit the Stop button
first!"));
return;
}
g_list_free ( Suffix );
@@ -838,10 +838,13 @@
if (dummy_ptr == NULL)
{
- gchar *msg = g_strdup_printf (_("Can't open archive %s") ,
filename );
+ gchar *utf8_path,*msg;
+ utf8_path = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL);
+ msg = g_strdup_printf (_("Can't open archive \"%s\":") ,
utf8_path );
response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow) ,
GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,
msg,g_strerror (errno));
g_free (msg);
+ g_free (utf8_path);
return -2;
}
if ( fread ( magic, 1, 6, dummy_ptr ) == 0 )
Modified: xarchiver/trunk/src/iso.c
===================================================================
--- xarchiver/trunk/src/iso.c 2006-07-23 22:45:09 UTC (rev 22519)
+++ xarchiver/trunk/src/iso.c 2006-07-24 08:54:19 UTC (rev 22520)
@@ -671,6 +671,7 @@
xa_set_button_state (1,1,0,1,1);
OffTooltipPadlock();
+ archive->status = XA_ARCHIVESTATUS_IDLE;
gtk_widget_set_sensitive ( properties , TRUE );
gtk_tree_view_set_model (GTK_TREE_VIEW(treeview1), model);
g_object_unref (model);
Modified: xarchiver/trunk/src/main.c
===================================================================
--- xarchiver/trunk/src/main.c 2006-07-23 22:45:09 UTC (rev 22519)
+++ xarchiver/trunk/src/main.c 2006-07-24 08:54:19 UTC (rev 22520)
@@ -224,6 +224,7 @@
gtk_window_set_default_size (GTK_WINDOW(MainWindow), 600, 400);
Update_StatusBar ( _("Ready."));
gtk_widget_show (MainWindow);
+ archive = xa_init_archive_structure(archive);
/* This to open the archive from the command line */
if ( argc == 2)
{
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
