X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fmain.c;h=54fd51d404ae2f146019a5428f3d22710d7b12eb;hb=4d39b1b77c637b56b4f094e39328b3394cefa4dc;hp=433fc298c3c37000a14d7bb3827a149596161c47;hpb=cfd5ddfe5127ac20d01bd85c96ff16e39ca47696;p=xournal.git

diff --git a/src/main.c b/src/main.c
index 433fc29..54fd51d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -204,12 +204,13 @@ void init_stuff (int argc, char *argv[])
     gtk_widget_set_sensitive(GET_COMPONENT("optionsUseXInput"), FALSE);
 
   ui.use_xinput = ui.allow_xinput && can_xinput;
-  ui.need_emergency_disable_xinput = FALSE;
 
   gtk_check_menu_item_set_active(
     GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsProgressiveBG")), ui.progressive_bg);
   gtk_check_menu_item_set_active(
     GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsPrintRuling")), ui.print_ruling);
+  gtk_check_menu_item_set_active(
+    GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsAutoloadPdfXoj")), ui.autoload_pdf_xoj);
   gtk_check_menu_item_set_active(
     GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsLeftHanded")), ui.left_handed);
   gtk_check_menu_item_set_active(
@@ -265,12 +266,6 @@ void init_stuff (int argc, char *argv[])
       "event", G_CALLBACK (filter_extended_events),
       NULL);
   }
-  if (!gtk_check_version(2, 17, 0)) {
-    g_signal_connect (
-      GET_COMPONENT("comboLayer"),
-      "notify::popup-shown", G_CALLBACK (combobox_popup_disable_xinput),
-      NULL);
-  }
 
   // load the MRU