Author: colossus
Date: 2006-07-10 11:37:09 +0000 (Mon, 10 Jul 2006)
New Revision: 22356
Modified:
xarchiver/trunk/TODO
xarchiver/trunk/src/bzip2.c
xarchiver/trunk/src/callbacks.c
xarchiver/trunk/src/callbacks.h
xarchiver/trunk/src/extract_dialog.c
xarchiver/trunk/src/iso.c
xarchiver/trunk/src/rpm.c
Log:
Updated TODO file.
Replaced all the calls to strerror to g_strerror to have the text converted to
UTF8. Thank to Enrico Troeger for pointing this out.
Modified: xarchiver/trunk/TODO
===================================================================
--- xarchiver/trunk/TODO 2006-07-10 10:46:26 UTC (rev 22355)
+++ xarchiver/trunk/TODO 2006-07-10 11:37:09 UTC (rev 22356)
@@ -1,5 +1,5 @@
+ iso
- add display of ID's inside the ISO plus image type [PARTIALLY DONE].
- fix the extraction of single files with full path.
-- fix bugs #1736, #1937, #1986, #1987, #1988
+- fix bugs #1736, #1937.
- ?? create a routine for handling the sensitiveness of the buttons, window
title
Modified: xarchiver/trunk/src/bzip2.c
===================================================================
--- xarchiver/trunk/src/bzip2.c 2006-07-10 10:46:26 UTC (rev 22355)
+++ xarchiver/trunk/src/bzip2.c 2006-07-10 11:37:09 UTC (rev 22356)
@@ -104,7 +104,7 @@
g_free ( new_path );
if ( stream == NULL )
{
- response = ShowGtkMessageDialog
(GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,strerror(errno));
+ response = ShowGtkMessageDialog
(GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,g_strerror(errno));
done = FALSE;
break;
}
@@ -146,7 +146,7 @@
stream = fdopen ( fd , "w" );
if ( stream == NULL)
{
- response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,strerror(errno)
);
+ response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,g_strerror(errno)
);
g_free (tmp);
return NULL;
}
@@ -342,7 +342,7 @@
stream = fopen ( archive->path , "w" ) ;
if ( stream == NULL)
{
- response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,strerror(errno)
);
+ response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,g_strerror(errno)
);
unlink ( tmp );
g_free (tmp);
return;
@@ -389,7 +389,7 @@
stream = fopen ( archive->path , "w" );
if ( stream == NULL )
{
- response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,strerror(errno));
+ response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,g_strerror(errno));
done = FALSE;
return;
}
Modified: xarchiver/trunk/src/callbacks.c
===================================================================
--- xarchiver/trunk/src/callbacks.c 2006-07-10 10:46:26 UTC (rev 22355)
+++ xarchiver/trunk/src/callbacks.c 2006-07-10 11:37:09 UTC (rev 22356)
@@ -189,8 +189,6 @@
default:
break;
}
- archive->status = XA_ARCHIVESTATUS_IDLE;
- return;
}
}
if (archive->status != XA_ARCHIVESTATUS_EXTRACT)
@@ -267,7 +265,7 @@
gtk_window_set_title ( GTK_WINDOW (MainWindow) , archive->path );
}
-int ShowGtkMessageDialog ( GtkWindow *window, int mode,int type,int button,
gchar *message)
+int ShowGtkMessageDialog ( GtkWindow *window, int mode,int type,int button,
const gchar *message)
{
dialog = gtk_message_dialog_new (window, mode, type, button,message);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
@@ -828,7 +826,7 @@
if (dummy_ptr == NULL)
{
- gchar *msg = g_strdup_printf (_("Can't open archive %s:\n%s") ,
filename , strerror (errno) );
+ gchar *msg = g_strdup_printf (_("Can't open archive %s:\n%s") ,
filename , g_strerror (errno) );
response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow) ,
GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,
msg);
g_free (msg);
@@ -1030,7 +1028,7 @@
Update_StatusBar (_("Waiting for the process to abort..."));
if ( kill ( archive->child_pid , SIGABRT ) < 0 )
{
- response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,
strerror(errno));
+ response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,
g_strerror(errno));
return;
}
/* This in case the user cancels the opening of a password protected
archive */
Modified: xarchiver/trunk/src/callbacks.h
===================================================================
--- xarchiver/trunk/src/callbacks.h 2006-07-10 10:46:26 UTC (rev 22355)
+++ xarchiver/trunk/src/callbacks.h 2006-07-10 11:37:09 UTC (rev 22356)
@@ -94,7 +94,7 @@
void drag_data_get (GtkWidget *widget, GdkDragContext *dc, GtkSelectionData
*selection_data, guint info, guint t, gpointer data);
GSList *Add_File_Dialog ( gchar *mode );
-int ShowGtkMessageDialog ( GtkWindow *window, int mode,int type,int button,
gchar *message);
+int ShowGtkMessageDialog ( GtkWindow *window, int mode,int type,int button,
const gchar *message);
int CountCharacter ( gchar *string , int chr );
int is_escaped_char(char c);
int DetectArchiveType ( gchar *filename );
Modified: xarchiver/trunk/src/extract_dialog.c
===================================================================
--- xarchiver/trunk/src/extract_dialog.c 2006-07-10 10:46:26 UTC (rev
22355)
+++ xarchiver/trunk/src/extract_dialog.c 2006-07-10 11:37:09 UTC (rev
22356)
@@ -345,7 +345,7 @@
int result = mkdir (destination_path , S_IRUSR
| S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXGRP);
if (result == -1)
{
- gchar *msg = g_strconcat (_("Can't
create directory "),"\"",destination_path,"\"",": ",strerror(errno),NULL);
+ gchar *msg = g_strconcat (_("Can't
create directory "),"\"",destination_path,"\"",": ",g_strerror(errno),NULL);
response = ShowGtkMessageDialog
(GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK, msg
);
g_free (msg);
break;
Modified: xarchiver/trunk/src/iso.c
===================================================================
--- xarchiver/trunk/src/iso.c 2006-07-10 10:46:26 UTC (rev 22355)
+++ xarchiver/trunk/src/iso.c 2006-07-10 11:37:09 UTC (rev 22356)
@@ -531,7 +531,7 @@
}
if ((fdest = fopen (filename, "w")) == NULL)
{
- response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,strerror(errno)
);
+ response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,g_strerror(errno)
);
g_free (filename);
return FALSE;
}
Modified: xarchiver/trunk/src/rpm.c
===================================================================
--- xarchiver/trunk/src/rpm.c 2006-07-10 10:46:26 UTC (rev 22355)
+++ xarchiver/trunk/src/rpm.c 2006-07-10 11:37:09 UTC (rev 22356)
@@ -40,7 +40,7 @@
stream = fopen ( archive->path , "r" );
if (stream == NULL)
{
- gchar *msg = g_strdup_printf (_("Can't open archive %s:\n%s") ,
archive->path , strerror (errno) );
+ gchar *msg = g_strdup_printf (_("Can't open archive %s:\n%s") ,
archive->path , g_strerror (errno) );
response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow) ,
GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,
msg);
g_free (msg);
@@ -55,13 +55,13 @@
if (fseek ( stream, 104 , SEEK_CUR ) )
{
fclose (stream);
- response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,(char
*)strerror(errno));
+ response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,g_strerror(errno));
return;
}
if ( fread ( bytes, 1, 8, stream ) == 0 )
{
fclose ( stream );
- response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,strerror(errno));
+ response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,g_strerror(errno));
return;
}
il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
@@ -71,13 +71,13 @@
if (fseek ( stream, offset , SEEK_SET ) )
{
fclose (stream);
- response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,strerror(errno));
+ response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,g_strerror(errno));
return;
}
if ( fread ( bytes, 1, 8, stream ) == 0 )
{
fclose ( stream );
- response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,strerror(errno));
+ response = ShowGtkMessageDialog (GTK_WINDOW
(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,g_strerror(errno));
return;
}
il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
