X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-file.h;h=c94064511e9dcef69543332a85d5fca2e8b77de7;hb=fdfa727422da81ef7438fa2eb6d98fe814804391;hp=5fcf6e83f0a12dae0b8912daa6243d1bbbaced88;hpb=dcbb0ab8521a5e166f257d86884407eb98ef63f0;p=xournal.git

diff --git a/src/xo-file.h b/src/xo-file.h
index 5fcf6e8..c940645 100644
--- a/src/xo-file.h
+++ b/src/xo-file.h
@@ -1,5 +1,5 @@
 #define DEFAULT_SHORTEN_MENUS \
-  "optionsAntialiasBG optionsProgressiveBG optionsLeftHanded"
+  "optionsProgressiveBG optionsLeftHanded optionsButtonSwitchMapping"
 
 #define GS_CMDLINE \
   "gs -sDEVICE=bmp16m -r%f -q -sOutputFile=- " \
@@ -9,10 +9,6 @@ extern int GS_BITMAP_DPI, PDFTOPPM_PRINTING_DPI;
 
 #define TMPDIR_TEMPLATE "/tmp/xournalpdf.XXXXXX"
 
-#define PDFTOPPM_ARGV \
-     { "pdftoppm", "-q", "-f", pageno_str, "-l", pageno_str, \
-       "-r", dpi_str, pdf_filename, ppm_root, NULL }
-
 void new_journal(void);
 gboolean save_journal(const char *filename);
 gboolean close_journal(void);
@@ -23,11 +19,10 @@ GList *attempt_load_gv_bg(char *filename);
 struct Background *attempt_screenshot_bg(void);
 
 void cancel_bgpdf_request(struct BgPdfRequest *req);
-void add_bgpdf_request(int pageno, double zoom, gboolean printing);
-void bgpdf_spawn_child(void);
+gboolean add_bgpdf_request(int pageno, double zoom);
+gboolean bgpdf_scheduler_callback(gpointer data);
 void shutdown_bgpdf(void);
 gboolean init_bgpdf(char *pdfname, gboolean create_pages, int file_domain);
-void end_bgpdf_shutdown(void);
 
 void bgpdf_create_page_with_bg(int pageno, struct BgPdfPage *bgpg);
 void bgpdf_update_bg(int pageno, struct BgPdfPage *bgpg);