[Xfce4-commits] r23277 - in xarchiver/trunk: doc src

[Giuseppe Torelli]

Author: colossus
Date: 2006-10-04 06:26:18 +0000 (Wed, 04 Oct 2006)
New Revision: 23277

Modified:
   xarchiver/trunk/doc/Makefile.am
   xarchiver/trunk/doc/Makefile.in
   xarchiver/trunk/src/callbacks.c
Log:
Fixed xa_open_file_dialog() to remember the last user choosen filter; thanks to Enrico Troeger.
Removed xarchiver.txt from the doc because of cnn sensical docbook errors.


Modified: xarchiver/trunk/doc/Makefile.am
===================================================================
--- xarchiver/trunk/doc/Makefile.am	2006-10-03 21:10:05 UTC (rev 23276)
+++ xarchiver/trunk/doc/Makefile.am	2006-10-04 06:26:18 UTC (rev 23277)
@@ -1,26 +1,20 @@
 DOCDIR = $(DESTDIR)/$(datadir)/doc/@PACKAGE@
 HTML_FILES = html/*.html xarchiver.css
 IMAGE_FILES = images/*.png
-EXTRA_DIST = xarchiver.css xarchiver.xsl make_webable.sh xarchiver.txt \
+EXTRA_DIST = xarchiver.css xarchiver.xsl make_webable.sh \
 		xarchiver.docbook $(HTML_FILES) $(IMAGE_FILES)
 
 pdf:
 	jw -b pdf xarchiver.docbook
 	mv xarchiver.pdf geany-$(VERSION).pdf
 
-xarchiver.txt:
-	jw -b txt xarchiver.docbook
-
 htmldoc: xarchiver.docbook
 	xmlto -m xarchiver.xsl -o html/ xhtml xarchiver.docbook; \
 	test -f html/xarchiver.css || cp xarchiver.css html/;
 
-doc: xarchiver.txt htmldoc
-
 doc-clean:
 	rm -rf html/*.html
 	rm -f html/xarchiver.css
-	rm -f xarchiver.txt
 	rm -f *.pdf
 
 uninstall-local:
@@ -40,7 +34,6 @@
 	    $(INSTALL_DATA) $(srcdir)/$$file $(DOCDIR)/html/images/$$basefile; \
 	  fi \
 	done
-	$(INSTALL_DATA) xarchiver.txt $(DOCDIR)/manual.txt
 	$(INSTALL_DATA) ../README $(DOCDIR)
 	$(INSTALL_DATA) ../ChangeLog $(DOCDIR)
 	$(INSTALL_DATA) ../NEWS $(DOCDIR)

Modified: xarchiver/trunk/doc/Makefile.in
===================================================================
--- xarchiver/trunk/doc/Makefile.in	2006-10-03 21:10:05 UTC (rev 23276)
+++ xarchiver/trunk/doc/Makefile.in	2006-10-04 06:26:18 UTC (rev 23277)
@@ -206,8 +206,8 @@
 target_vendor = @target_vendor@
 DOCDIR = $(DESTDIR)/$(datadir)/doc/@PACKAGE@
 HTML_FILES = html/*.html xarchiver.css
-IMAGE_FILES = images/*.jpg
-EXTRA_DIST = xarchiver.css xarchiver.xsl make_webable.sh xarchiver.txt \
+IMAGE_FILES = images/*.png
+EXTRA_DIST = xarchiver.css xarchiver.xsl make_webable.sh \
 		xarchiver.docbook $(HTML_FILES) $(IMAGE_FILES)
 
 all: all-am
@@ -374,19 +374,13 @@
 	jw -b pdf xarchiver.docbook
 	mv xarchiver.pdf geany-$(VERSION).pdf
 
-xarchiver.txt:
-	jw -b txt xarchiver.docbook
-
 htmldoc: xarchiver.docbook
 	xmlto -m xarchiver.xsl -o html/ xhtml xarchiver.docbook; \
 	test -f html/xarchiver.css || cp xarchiver.css html/;
 
-doc: xarchiver.txt htmldoc
-
 doc-clean:
 	rm -rf html/*.html
 	rm -f html/xarchiver.css
-	rm -f xarchiver.txt
 	rm -f *.pdf
 
 uninstall-local:
@@ -406,7 +400,6 @@
 	    $(INSTALL_DATA) $(srcdir)/$$file $(DOCDIR)/html/images/$$basefile; \
 	  fi \
 	done
-	$(INSTALL_DATA) xarchiver.txt $(DOCDIR)/manual.txt
 	$(INSTALL_DATA) ../README $(DOCDIR)
 	$(INSTALL_DATA) ../ChangeLog $(DOCDIR)
 	$(INSTALL_DATA) ../NEWS $(DOCDIR)

Modified: xarchiver/trunk/src/callbacks.c
===================================================================
--- xarchiver/trunk/src/callbacks.c	2006-10-03 21:10:05 UTC (rev 23276)
+++ xarchiver/trunk/src/callbacks.c	2006-10-04 06:26:18 UTC (rev 23277)
@@ -781,7 +781,7 @@
 
 gchar *xa_open_file_dialog ()
 {
-	GtkWidget *File_Selector = NULL;
+	static GtkWidget *File_Selector = NULL;
 	GtkFileFilter *filter;
 	gchar *path = NULL;
 
@@ -805,9 +805,7 @@
 
 		filter = gtk_file_filter_new ();
 		gtk_file_filter_set_name ( filter , _("Only archives") );
-
 		Suffix = g_list_first ( ArchiveSuffix );
-
 		while ( Suffix != NULL )
 		{
 			gtk_file_filter_add_pattern (filter, Suffix->data);