diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-01-13 13:52:34 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-01-13 13:52:34 +0000 |
commit | fc84dd7b510b26b0e88ede79966cdec6d3e47aa8 (patch) | |
tree | c554a07d358eef3d95f04825ab18b728423bc410 | |
parent | c393bb4efb7b54fc037b02c859b5c616d73b1287 (diff) | |
download | libextractor-fc84dd7b510b26b0e88ede79966cdec6d3e47aa8.tar.gz libextractor-fc84dd7b510b26b0e88ede79966cdec6d3e47aa8.zip |
Gnome thinks unloading plugins is an unnecessary feature, so we only run Gnome code out-of-process from now on
-rw-r--r-- | src/plugins/ole2_extractor.c | 15 | ||||
-rw-r--r-- | src/plugins/thumbnailgtk_extractor.c | 14 |
2 files changed, 29 insertions, 0 deletions
diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c index 5f6cd01..5cef88e 100644 --- a/src/plugins/ole2_extractor.c +++ b/src/plugins/ole2_extractor.c | |||
@@ -475,6 +475,21 @@ history_extract(GsfInput * stream, | |||
475 | } | 475 | } |
476 | 476 | ||
477 | 477 | ||
478 | |||
479 | const char * | ||
480 | EXTRACTOR_ole2_options () | ||
481 | { | ||
482 | /* | ||
483 | Since the Gnome developers think that being unable to | ||
484 | unload plugins is an 'acceptable' limitation, we | ||
485 | require out-of-process execution for plugins depending | ||
486 | on libgsf and other glib-based plugins. | ||
487 | See also https://bugzilla.gnome.org/show_bug.cgi?id=374940 | ||
488 | */ | ||
489 | return "oop-only"; | ||
490 | } | ||
491 | |||
492 | |||
478 | int | 493 | int |
479 | EXTRACTOR_ole2_extract (const char *data, | 494 | EXTRACTOR_ole2_extract (const char *data, |
480 | size_t size, | 495 | size_t size, |
diff --git a/src/plugins/thumbnailgtk_extractor.c b/src/plugins/thumbnailgtk_extractor.c index f5ea228..51e3ea4 100644 --- a/src/plugins/thumbnailgtk_extractor.c +++ b/src/plugins/thumbnailgtk_extractor.c | |||
@@ -41,6 +41,20 @@ void __attribute__ ((constructor)) ole_gobject_init () | |||
41 | } | 41 | } |
42 | 42 | ||
43 | 43 | ||
44 | const char * | ||
45 | EXTRACTOR_thumbnailgtk_options () | ||
46 | { | ||
47 | /* | ||
48 | Since the Gnome developers think that being unable to | ||
49 | unload plugins is an 'acceptable' limitation, we | ||
50 | require out-of-process execution for plugins depending | ||
51 | on libgsf and other glib-based plugins. | ||
52 | See also https://bugzilla.gnome.org/show_bug.cgi?id=374940 | ||
53 | */ | ||
54 | return "oop-only"; | ||
55 | } | ||
56 | |||
57 | |||
44 | int | 58 | int |
45 | EXTRACTOR_thumbnailgtk_extract (const char *data, | 59 | EXTRACTOR_thumbnailgtk_extract (const char *data, |
46 | size_t size, | 60 | size_t size, |