gthumb r2422 - in trunk: . data libgthumb src

[mjc svn gnome org]

Author: mjc
Date: Wed Oct  8 18:57:43 2008
New Revision: 2422
URL: http://svn.gnome.org/viewvc/gthumb?rev=2422&view=rev

Log:
Merged 2411:2412 from gthumb-2-10.


Added:
   trunk/COPYING
Modified:
   trunk/ChangeLog
   trunk/data/gthumb.schemas.in
   trunk/libgthumb/catalog.c
   trunk/libgthumb/file-utils.c
   trunk/libgthumb/file-utils.h
   trunk/libgthumb/preferences.h
   trunk/src/dlg-preferences.c
   trunk/src/gth-browser.c
   trunk/src/gth-dir-list.c
   trunk/src/gth-dir-list.h

Added: trunk/COPYING
==============================================================================
--- (empty file)
+++ trunk/COPYING	Wed Oct  8 18:57:43 2008
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

Modified: trunk/data/gthumb.schemas.in
==============================================================================
--- trunk/data/gthumb.schemas.in	(original)
+++ trunk/data/gthumb.schemas.in	Wed Oct  8 18:57:43 2008
@@ -111,6 +111,19 @@
       </schema>
 
       <schema>
+	<key>/schemas/apps/gthumb/browser/show_only_images</key>
+	<applyto>/apps/gthumb/browser/show_only_images</applyto>
+	<owner>gthumb</owner>
+	<type>bool</type>
+	<default>false</default>
+	<locale name="C">
+	  <short></short>
+	  <long>
+	  </long>
+	</locale>
+      </schema>
+
+      <schema>
 	<key>/schemas/apps/gthumb/browser/show_filenames</key>
 	<applyto>/apps/gthumb/browser/show_filenames</applyto>
 	<owner>gthumb</owner>
@@ -163,19 +176,6 @@
       </schema>
 
       <schema>
-        <key>/schemas/apps/gthumb/browser/include_audio_video</key>
-        <applyto>/apps/gthumb/browser/include_audio_video</applyto>
-        <owner>gthumb</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short></short>
-          <long>
-          </long>
-        </locale>
-      </schema>
-
-      <schema>
 	<key>/schemas/apps/gthumb/browser/save_thumbnails</key>
 	<applyto>/apps/gthumb/browser/save_thumbnails</applyto>
 	<owner>gthumb</owner>

Modified: trunk/libgthumb/catalog.c
==============================================================================
--- trunk/libgthumb/catalog.c	(original)
+++ trunk/libgthumb/catalog.c	Wed Oct  8 18:57:43 2008
@@ -527,7 +527,7 @@
 		
 		fd = file_data_new (path, NULL);
 		file_data_update (fd);  /* FIXME: when to update the mime-type */
-		if (file_filter (fd, TRUE))
+		if (file_filter (fd, TRUE, FALSE))
 			list = g_list_prepend (list, fd);
 	}
 	list = g_list_reverse (list);

Modified: trunk/libgthumb/file-utils.c
==============================================================================
--- trunk/libgthumb/file-utils.c	(original)
+++ trunk/libgthumb/file-utils.c	Wed Oct  8 18:57:43 2008
@@ -67,7 +67,7 @@
 #define BUF_SIZE 4096
 #define CHUNK_SIZE 128
 #define MAX_SYMLINKS_FOLLOWED 32
-
+#define ITEMS_PER_NOTIFICATION 1024
 
 /* Async directory list */
 
@@ -238,7 +238,7 @@
 	gnome_vfs_async_load_directory_uri (&handle,
 					    pli->uri,
 					    GNOME_VFS_FILE_INFO_FOLLOW_LINKS,
-					    128 /* items_per_notification FIXME: find a good value */,
+					    ITEMS_PER_NOTIFICATION,
 					    GNOME_VFS_PRIORITY_DEFAULT,
 					    directory_load_cb,
 					    pli);
@@ -499,15 +499,21 @@
 /* return TRUE to add the file to the file list. */
 gboolean
 file_filter (FileData *file,
-	     gboolean  show_hidden_files)
+	     gboolean  show_hidden_files,
+	     gboolean  show_only_images)
 {
 	if (file->mime_type == NULL)
 		return FALSE;
 
-	if ((! show_hidden_files && file_is_hidden (file->name))
-	    || ! (mime_type_is_image (file->mime_type) 
-	          || mime_type_is_video (file->mime_type)
-	          || mime_type_is_audio (file->mime_type)))
+	if (! show_hidden_files && file_is_hidden (file->name))
+		return FALSE;
+		
+	if (show_only_images && ! mime_type_is_image (file->mime_type))
+		return FALSE;
+		
+	if (! (mime_type_is_image (file->mime_type) 
+	       || mime_type_is_video (file->mime_type)
+	       || mime_type_is_audio (file->mime_type)))
 		return FALSE;
 			
 	return TRUE;
@@ -636,9 +642,6 @@
 {
 	/* Valid image mime types:
 	   	1. All image* types, 
-		1b.	except for image/x-xcf, image/x-compressed-xcf
-			because we can't read these gimp files, and fast,
-			reliable converters are not really available.
 		2. application/x-crw
 			This is a RAW photo file, which for some reason
 			uses an "application" prefix instead of "image".
@@ -646,8 +649,8 @@
 
 	g_return_val_if_fail (mime_type != NULL, FALSE);
 
-	return (   ((strstr (mime_type, "image") != NULL) && (strstr (mime_type, "xcf") == NULL))
-		|| (strcmp (mime_type, "application/x-crw") == 0) );
+	return ((strstr (mime_type, "image") != NULL) 
+		|| (strcmp (mime_type, "application/x-crw") == 0));
 }
 
 
@@ -669,8 +672,7 @@
 	g_return_val_if_fail (mime_type != NULL, FALSE);
 
 	return ( ((strstr (mime_type, "video") != NULL) ||
-		 (strcmp (mime_type, "application/ogg") == 0)) &&
-		 (eel_gconf_get_boolean (PREF_INCLUDE_AUDIO_VIDEO, TRUE) == TRUE));;
+		 (strcmp (mime_type, "application/ogg") == 0)));
 }
 
 
@@ -691,8 +693,7 @@
 {
 	g_return_val_if_fail (mime_type != NULL, FALSE);
 
-	return ((strstr (mime_type, "audio") != NULL) && 
-		(eel_gconf_get_boolean (PREF_INCLUDE_AUDIO_VIDEO, TRUE) == TRUE));
+	return ((strstr (mime_type, "audio") != NULL));
 }
 
 

Modified: trunk/libgthumb/file-utils.h
==============================================================================
--- trunk/libgthumb/file-utils.h	(original)
+++ trunk/libgthumb/file-utils.h	Wed Oct  8 18:57:43 2008
@@ -104,7 +104,8 @@
 						   gboolean          names_only,
 						   gboolean          show_dot_files);
 gboolean            file_filter                   (FileData         *file,
-	     					   gboolean          show_hidden_files);
+	     					   gboolean          show_hidden_files,
+	     					   gboolean          show_only_images);
 
 typedef void (*VisitFunc) (char *real_file, char *rc_file, gpointer data);
 gboolean            visit_rc_directory_sync       (const char       *rc_dir,

Modified: trunk/libgthumb/preferences.h
==============================================================================
--- trunk/libgthumb/preferences.h	(original)
+++ trunk/libgthumb/preferences.h	Wed Oct  8 18:57:43 2008
@@ -45,11 +45,11 @@
 #define  PREF_MIGRATE_COMMENT_SYSTEM "/apps/gthumb/general/migrate_comment_system"
 
 #define  PREF_SHOW_HIDDEN_FILES      "/apps/gthumb/browser/show_hidden_files"
+#define  PREF_SHOW_ONLY_IMAGES       "/apps/gthumb/browser/show_only_images"
 #define  PREF_SHOW_FILENAMES         "/apps/gthumb/browser/show_filenames"
 #define  PREF_SHOW_COMMENTS          "/apps/gthumb/browser/show_comments"
 #define  PREF_SHOW_THUMBNAILS        "/apps/gthumb/browser/show_thumbnails"
 #define  PREF_FAST_FILE_TYPE         "/apps/gthumb/browser/fast_file_type"
-#define  PREF_INCLUDE_AUDIO_VIDEO    "/apps/gthumb/browser/include_audio_view"
 #define  PREF_SAVE_THUMBNAILS        "/apps/gthumb/browser/save_thumbnails"
 #define  PREF_THUMBNAIL_SIZE         "/apps/gthumb/browser/thumbnail_size"
 #define  PREF_THUMBNAIL_LIMIT        "/apps/gthumb/browser/thumbnail_limit"

Modified: trunk/src/dlg-preferences.c
==============================================================================
--- trunk/src/dlg-preferences.c	(original)
+++ trunk/src/dlg-preferences.c	Wed Oct  8 18:57:43 2008
@@ -318,7 +318,7 @@
 include_audio_video_toggled_cb (GtkToggleButton *button,
                                 DialogData      *data)
 {
-        eel_gconf_set_boolean (PREF_INCLUDE_AUDIO_VIDEO, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->toggle_audio_video)));
+        eel_gconf_set_boolean (PREF_SHOW_ONLY_IMAGES, ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->toggle_audio_video)));
 	gth_browser_refresh (data->browser);
 }
 
@@ -489,7 +489,7 @@
 	/* * browser */
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->toggle_file_type), ! eel_gconf_get_boolean (PREF_FAST_FILE_TYPE, TRUE));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->toggle_audio_video), eel_gconf_get_boolean (PREF_INCLUDE_AUDIO_VIDEO, TRUE));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->toggle_audio_video), ! eel_gconf_get_boolean (PREF_SHOW_ONLY_IMAGES, FALSE));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->toggle_show_filenames), eel_gconf_get_boolean (PREF_SHOW_FILENAMES, FALSE));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->toggle_show_comments), eel_gconf_get_boolean (PREF_SHOW_COMMENTS, TRUE));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->toggle_show_thumbs), eel_gconf_get_boolean (PREF_SHOW_THUMBNAILS, TRUE));

Modified: trunk/src/gth-browser.c
==============================================================================
--- trunk/src/gth-browser.c	(original)
+++ trunk/src/gth-browser.c	Wed Oct  8 18:57:43 2008
@@ -74,7 +74,7 @@
 #include "jpegutils/jpeg-data.h"
 #include "icons/pixbufs.h"
 
-#define GCONF_NOTIFICATIONS 20
+#define GCONF_NOTIFICATIONS 21
 
 #define VIEW_AS_DELAY 500
 
@@ -212,6 +212,7 @@
 	gboolean            load_image_folder_after_image;
 	gboolean            focus_current_image;
 	gboolean            show_hidden_files;
+	gboolean            show_only_images;
 	gboolean            fast_file_type;
 	
 	guint               activity_timeout;   /* activity timeout handle. */
@@ -4743,6 +4744,25 @@
 
 
 static void
+pref_show_only_images_changed (GConfClient *client,
+			       guint        cnxn_id,
+			       GConfEntry  *entry,
+			       gpointer     user_data)
+{
+	GthBrowser *browser = user_data;
+	gboolean    show_only_images;
+	
+	show_only_images = eel_gconf_get_boolean (PREF_SHOW_ONLY_IMAGES, FALSE);
+	if (show_only_images == browser->priv->show_only_images) 
+		return;
+
+	browser->priv->show_only_images = show_only_images;
+	gth_dir_list_show_only_images (browser->priv->dir_list, browser->priv->show_only_images);
+	window_update_file_list (browser);
+}
+
+
+static void
 pref_fast_file_type_changed (GConfClient *client,
 			     guint        cnxn_id,
 			     GConfEntry  *entry,
@@ -5510,7 +5530,7 @@
 			
 			file = file_data_new (path, NULL);
 			file_data_update_all (file, browser->priv->fast_file_type);
-			if (file_filter (file, browser->priv->show_hidden_files))
+			if (file_filter (file, browser->priv->show_hidden_files, browser->priv->show_only_images))
 				created_in_current_dir = g_list_prepend (created_in_current_dir, file);
 			else
 				file_data_unref (file);
@@ -6910,6 +6930,7 @@
 	priv->sel_change_timeout = 0;
 	
 	priv->show_hidden_files = eel_gconf_get_boolean (PREF_SHOW_HIDDEN_FILES, FALSE);
+	priv->show_only_images = eel_gconf_get_boolean (PREF_SHOW_ONLY_IMAGES, FALSE);
 	priv->fast_file_type = eel_gconf_get_boolean (PREF_FAST_FILE_TYPE, TRUE);
 	
 	/* preloader */
@@ -7028,6 +7049,11 @@
 					   PREF_SHOW_HIDDEN_FILES,
 					   pref_show_hidden_files_changed,
 					   browser);
+					   
+	priv->cnxn_id[i++] = eel_gconf_notification_add (
+					   PREF_SHOW_ONLY_IMAGES,
+					   pref_show_only_images_changed,
+					   browser);
 
 	priv->cnxn_id[i++] = eel_gconf_notification_add (
 					   PREF_FAST_FILE_TYPE,

Modified: trunk/src/gth-dir-list.c
==============================================================================
--- trunk/src/gth-dir-list.c	(original)
+++ trunk/src/gth-dir-list.c	Wed Oct  8 18:57:43 2008
@@ -41,6 +41,7 @@
 #include "comments.h"
 
 #define DEF_SHOW_HIDDEN FALSE
+#define DEF_SHOW_ONLY_IMAGES FALSE
 
 enum {
 	DIR_LIST_COLUMN_ICON,
@@ -282,6 +283,7 @@
 	dir_list->list = NULL;
 	dir_list->file_list = NULL;
 	dir_list->show_dot_files = eel_gconf_get_boolean (PREF_SHOW_HIDDEN_FILES, DEF_SHOW_HIDDEN);
+	dir_list->show_only_images = eel_gconf_get_boolean (PREF_SHOW_ONLY_IMAGES, DEF_SHOW_ONLY_IMAGES);
 	dir_list->old_dir = NULL;
 	dir_list->dir_load_handle = NULL;
 
@@ -369,6 +371,14 @@
 
 
 void
+gth_dir_list_show_only_images (GthDirList  *dir_list,
+			       gboolean     show)
+{
+	dir_list->show_only_images = show;
+}
+
+
+void
 gth_dir_list_update_underline (GthDirList *dir_list)
 {
 	GdkWindow  *win;
@@ -508,7 +518,7 @@
 
 	filtered = dir_list_filter_and_sort (new_dir_list,
 			         	     TRUE,
-					     eel_gconf_get_boolean (PREF_SHOW_HIDDEN_FILES, DEF_SHOW_HIDDEN));
+					     dir_list->show_dot_files);
 
 	/* * Add the ".." entry if the current path is not "/".
 	 * path_list_async_new does not include the "." and ".." elements. */
@@ -566,7 +576,7 @@
 			  gpointer       data)
 {
 	GthDirList *dir_list = data;
-	return file_filter (file, dir_list->show_dot_files);
+	return file_filter (file, dir_list->show_dot_files, dir_list->show_only_images);
 }
 
 
@@ -631,8 +641,7 @@
 
 	/* insert dir in the list */
 
-	if (! (file_is_hidden (name_only)
-	       && ! eel_gconf_get_boolean (PREF_SHOW_HIDDEN_FILES, DEF_SHOW_HIDDEN))
+	if (! (file_is_hidden (name_only) && ! dir_list->show_dot_files)
 	    && ! same_uri (name_only, CACHE_DIR))
 		dir_list->list = g_list_prepend (dir_list->list, g_strdup (name_only));
 	dir_list->list = g_list_sort (dir_list->list, (GCompareFunc) strcasecmp);

Modified: trunk/src/gth-dir-list.h
==============================================================================
--- trunk/src/gth-dir-list.h	(original)
+++ trunk/src/gth-dir-list.h	Wed Oct  8 18:57:43 2008
@@ -51,6 +51,7 @@
 	GtkCellRenderer *text_renderer;
 	gboolean         show_dot_files; /* Whether to show file names that begin
 				          * with a dot. */
+	gboolean         show_only_images;
 	gboolean         single_click;
 	GtkTreePath     *hover_path;
 	char            *old_dir;
@@ -71,6 +72,8 @@
 GthDirList *   gth_dir_list_new                     (void);
 void           gth_dir_list_show_hidden_files       (GthDirList  *dir_list,
 				     		     gboolean     show);
+void           gth_dir_list_show_only_images        (GthDirList  *dir_list,
+				     		     gboolean     show);
 void           gth_dir_list_change_to               (GthDirList  *dir_list,
 						     const char  *path);
 void           gth_dir_list_stop                    (GthDirList  *dir_list);