X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-file.h;h=6b35597a997481fdde1cf4bcadcf2e24a179537b;hb=34dbe92edd95fbf7082c3e54f438c76355254fe5;hp=0cc2e2e60960018124795d8deba6d8b5fc9707d2;hpb=62e6c9d87f653624015e8dacd4c5e5abbec4cffa;p=xournal.git

diff --git a/src/xo-file.h b/src/xo-file.h
index 0cc2e2e..6b35597 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,8 +19,8 @@ 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);
+void 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);