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

[Giuseppe Torelli]

Author: colossus
Date: 2007-09-03 06:51:57 +0000 (Mon, 03 Sep 2007)
New Revision: 26039

Modified:
   xarchiver/trunk/src/7zip.c
   xarchiver/trunk/src/interface.c
   xarchiver/trunk/src/window.c
Log:
Modified string for File menu to "Archive".
Fixed crash when loading a solid 7z archive.
"Row search while you type" ability works again.


Modified: xarchiver/trunk/src/7zip.c
===================================================================
--- xarchiver/trunk/src/7zip.c	2007-09-03 06:44:15 UTC (rev 26038)
+++ xarchiver/trunk/src/7zip.c	2007-09-03 06:51:57 UTC (rev 26039)
@@ -134,13 +134,22 @@
 			break;
 
 	line[n] = '\0';
-	item[1] = line + a;
-	n+= 2;
 
-	/* Filename */
-	line[linesize-1] = '\0';
-	filename = g_strdup(line + n);
-	
+	if (line[50] != ' ')
+	{
+		n+=2;
+		item[1] = line + a;
+		line[linesize-1] = '\0';
+		filename = g_strdup(line + n);
+	}
+	/* Is this a solid archive? */
+	else
+	{
+		item[1] = "0";
+		line[n-1] = '\0';
+		filename = g_strdup(line + 53);
+	}
+
 	/* Work around for 7za which doesn't
 	* output / with directories */
 	if (dir)
@@ -149,7 +158,6 @@
 		g_free (filename);
 		filename = filename_with_slash;
 	}
-	
 	entry = xa_set_archive_entries_for_each_row (archive,filename,FALSE,item);
 	g_free(filename);
 }

Modified: xarchiver/trunk/src/interface.c
===================================================================
--- xarchiver/trunk/src/interface.c	2007-09-03 06:44:15 UTC (rev 26038)
+++ xarchiver/trunk/src/interface.c	2007-09-03 06:51:57 UTC (rev 26039)
@@ -70,7 +70,7 @@
 	gtk_widget_show (menubar1);
 	gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0);
 
-	menuitem1 = gtk_menu_item_new_with_mnemonic (_("_File"));
+	menuitem1 = gtk_menu_item_new_with_mnemonic (_("_Archive"));
 	gtk_widget_show (menuitem1);
 	gtk_container_add (GTK_CONTAINER (menubar1), menuitem1);
 

Modified: xarchiver/trunk/src/window.c
===================================================================
--- xarchiver/trunk/src/window.c	2007-09-03 06:44:15 UTC (rev 26038)
+++ xarchiver/trunk/src/window.c	2007-09-03 06:51:57 UTC (rev 26039)
@@ -1158,7 +1158,7 @@
     char *filename;
     gboolean result;
 
-    gtk_tree_model_get (model, iter, 0, &filename, -1);
+    gtk_tree_model_get (model, iter, 1, &filename, -1);
     if ( strcasestr (filename, key) ) result = FALSE;
         else result = TRUE;
     g_free (filename);