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

[Giuseppe Torelli]

Author: colossus
Date: 2006-08-03 12:40:08 +0000 (Thu, 03 Aug 2006)
New Revision: 22641

Modified:
   xarchiver/trunk/src/callbacks.c
   xarchiver/trunk/src/iso.c
Log:
Added a status bar message when failing to extract the file to be viewed to /tmp.
Corrected the code from the previous commit.


Modified: xarchiver/trunk/src/callbacks.c
===================================================================
--- xarchiver/trunk/src/callbacks.c	2006-08-03 12:25:52 UTC (rev 22640)
+++ xarchiver/trunk/src/callbacks.c	2006-08-03 12:40:08 UTC (rev 22641)
@@ -1249,6 +1249,7 @@
 	{
 		response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,"An error occurred while extracting the file to be viewed:",error->message);
 		g_error_free (error);
+		Update_StatusBar ( _("Operation failed."));
 		return NULL;
 	}
 	unlink ( filename );

Modified: xarchiver/trunk/src/iso.c
===================================================================
--- xarchiver/trunk/src/iso.c	2006-08-03 12:25:52 UTC (rev 22640)
+++ xarchiver/trunk/src/iso.c	2006-08-03 12:40:08 UTC (rev 22641)
@@ -597,9 +597,9 @@
 
 int xa_create_directory_with_parents (const gchar * pathname, int mode)
 {
-	if (glib_check_version (2, 8, 0) == NULL)
+	#if GLIB_CHECK_VERSION (2, 8, 0)
 		return g_mkdir_with_parents (pathname, mode);
-	else
+	#else
 	{
 		gchar *fn, *p;
 
@@ -654,6 +654,7 @@
 		g_free (fn);
 		return 0;
 	}
+	#endif
 }
 
 void OpenISO ( XArchive *archive )