Added support for 7-zip based cb7 comic book. Patch by Kartik Rustagi.

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.

svn path=/trunk/; revision=3068

diff --git a/ChangeLog b/ChangeLog
index f7943c92b509cec88704d356230e81dce56add5d..04adffd6fa042e559ae4ed9a88569f581b7ba230 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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.
+
 2008-06-24  Bastien Nocera  <hadess@hadess.net>
 
        * shell/ev-window.c: Use Alt+Left to rotate left, and Alt+Right

diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
index 2d8404e064fc6ad8fbeb4b0e12f7a3ca173ecf9f..b2f7b7ac728ff838e5cd1fd263f5dc752adf5411 100644 (file)
--- a/backend/comics/comics-document.c
+++ b/backend/comics/comics-document.c
@@ -144,6 +144,12 @@ comics_document_load (EvDocument *document,
                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);

diff --git a/backend/comics/comicsdocument.evince-backend.in b/backend/comics/comicsdocument.evince-backend.in
index df1a97ee02c42b1b22a08c37755faaac540b97b1..d46161d2f6bce29932d57ff9cf4f894068c20ed3 100644 (file)
--- a/backend/comics/comicsdocument.evince-backend.in
+++ b/backend/comics/comicsdocument.evince-backend.in
@@ -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;

diff --git a/configure.ac b/configure.ac
index f22879b3066c4e0ee9159c7d387d8366231124a2..ca47db9690a61a1e0c463edf936efeafeb9d2062 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -408,7 +408,7 @@ if test "x$enable_tiff" = "xyes"; then
        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/*;"

diff --git a/thumbnailer/evince-thumbnailer-comics.schemas.in b/thumbnailer/evince-thumbnailer-comics.schemas.in
index 4d62411cab85f61eb088dbe8e00cb750273dcffa..814cb800412862da16495870ac0256a783f635c2 100644 (file)
--- a/thumbnailer/evince-thumbnailer-comics.schemas.in
+++ b/thumbnailer/evince-thumbnailer-comics.schemas.in
@@ -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>