diff options
| author | Nickolay V. Shmyrev <nshmyrev@yandex.ru> | 2008-07-11 07:22:01 (GMT) |
|---|---|---|
| committer | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2008-07-11 07:22:01 (GMT) |
| commit | 331bedb9cefa5567b900fe46381e89aa057f9f72 (patch) | |
| tree | c759d54ce98b5853dd78629e06d89890b0461091 | |
| parent | 51a2d25bbf8484dce132f4556f74828fdc133617 (diff) | |
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
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | backend/comics/comics-document.c | 6 | ||||
| -rw-r--r-- | backend/comics/comicsdocument.evince-backend.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | thumbnailer/evince-thumbnailer-comics.schemas.in | 26 |
5 files changed, 44 insertions, 2 deletions
@@ -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 2d8404e..b2f7b7a 100644 --- 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 df1a97e..d46161d 100644 --- 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 f22879b..ca47db9 100644 --- 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 4d62411..814cb80 100644 --- 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> |