evince r3068 - in trunk: . backend/comics thumbnailer

[nshmyrev svn gnome org]

Author: nshmyrev
Date: Fri Jul 11 07:22:01 2008
New Revision: 3068
URL: http://svn.gnome.org/viewvc/evince?rev=3068&view=rev

Log:
2008-07-11  Nickolay V. Shmyrev  <nshmyrev yandex ru>

	* backend/comics/comics-document.c (comics_document_load):
	* backend/comics/comicsdocument.evince-backend.in:
	* configure.ac:
	* thumbnailer/evince-thumbnailer-comics.schemas.in:
	
	Added support for 7-zip based cb7 comic book. Patch by
	Kartik Rustagi. Fixes bug #532312.



Modified:
   trunk/ChangeLog
   trunk/backend/comics/comics-document.c
   trunk/backend/comics/comicsdocument.evince-backend.in
   trunk/configure.ac
   trunk/thumbnailer/evince-thumbnailer-comics.schemas.in

Modified: trunk/backend/comics/comics-document.c
==============================================================================
--- trunk/backend/comics/comics-document.c	(original)
+++ trunk/backend/comics/comics-document.c	Fri Jul 11 07:22:01 2008
@@ -144,6 +144,12 @@
 		list_files_command = 
 			g_strdup_printf ("zipinfo -1 -- %s", quoted_file);
 		comics_document->regex_arg = TRUE;
+	} else if (!strcmp (mime_type, "application/x-cb7")) {
+		comics_document->extract_command =
+			g_strdup ("7zr x -so");
+		list_files_command = 
+			g_strdup_printf ("7zr l -- %s", quoted_file);
+		comics_document->regex_arg = TRUE;
 	}
 
 	g_object_unref (file_info);

Modified: trunk/backend/comics/comicsdocument.evince-backend.in
==============================================================================
--- trunk/backend/comics/comicsdocument.evince-backend.in	(original)
+++ trunk/backend/comics/comicsdocument.evince-backend.in	Fri Jul 11 07:22:01 2008
@@ -1,4 +1,4 @@
 [Evince Backend]
 Module=comicsdocument
 _TypeDescription=Comic Books
-MimeType=application/x-cbr;application/x-cbz;
+MimeType=application/x-cbr;application/x-cbz;application/x-cb7;

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Jul 11 07:22:01 2008
@@ -408,7 +408,7 @@
 	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/tiff;"
 fi
 if test "x$enable_comics" = "xyes"; then
-	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-cbr;application/x-cbz;"
+	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7"
 fi
 if test "x$enable_pixbuf" = "xyes"; then
 	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/*;"

Modified: trunk/thumbnailer/evince-thumbnailer-comics.schemas.in
==============================================================================
--- trunk/thumbnailer/evince-thumbnailer-comics.schemas.in	(original)
+++ trunk/thumbnailer/evince-thumbnailer-comics.schemas.in	Fri Jul 11 07:22:01 2008
@@ -51,5 +51,31 @@
             </locale>
         </schema>
 
+
+	<schema>
+            <key>/schemas/desktop/gnome/thumbnailers/application x-cb7/enable</key>
+            <applyto>/desktop/gnome/thumbnailers/application x-cb7/enable</applyto>
+            <owner>evince</owner>
+            <type>bool</type>
+            <default>true</default>
+            <locale name="C">
+                <short></short>
+                <long></long>
+            </locale>
+        </schema>
+
+
+        <schema>
+            <key>/schemas/desktop/gnome/thumbnailers/application x-cb7/command</key>
+            <applyto>/desktop/gnome/thumbnailers/application x-cb7/command</applyto>
+            <owner>evince</owner>
+            <type>string</type>
+            <default>evince-thumbnailer -s %s %u %o</default>
+            <locale name="C">
+                <short></short>
+                <long></long>
+            </locale>
+        </schema>
+
     </schemalist>
 </gconfschemafile>