Print via gtk-print instead of libgnomeprint

[xournal.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index ac6e3ebf944f9267bb0e83fe32719a5025be7c8e..129716ad971de4dafed350c37d83cdf6e83ae775 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -26,21 +26,6 @@ struct UndoItem *undo, *redo; // the undo and redo stacks
 
 double DEFAULT_ZOOM;
 
-// prevent interface items from getting bogus XInput events
-gboolean filter_extended_events (GtkWidget *widget, GdkEvent *event,
-                                   gpointer user_data)
-{
-  // prevent scrollbars from reacting to XInput events
-  if (event->type == GDK_MOTION_NOTIFY &&
-      event->motion.device != gdk_device_get_core_pointer())
-    return TRUE;
-  if ((event->type == GDK_BUTTON_PRESS || event->type == GDK_2BUTTON_PRESS ||
-      event->type == GDK_3BUTTON_PRESS || event->type == GDK_BUTTON_RELEASE) &&
-      event->button.device != gdk_device_get_core_pointer())
-    return TRUE;
-  return FALSE;
-}
-
 void init_stuff (int argc, char *argv[])
 {
   GtkWidget *w;
@@ -77,8 +62,8 @@ void init_stuff (int argc, char *argv[])
   ui.layerbox_length = 0;
 
   if (argc > 2 || (argc == 2 && argv[1][0] == '-')) {
-    printf("Invalid command line parameters.\n"
-           "Usage: %s [filename.xoj]\n", argv[0]);
+    printf(_("Invalid command line parameters.\n"
+           "Usage: %s [filename.xoj]\n"), argv[0]);
     gtk_exit(0);
   }
    
@@ -161,6 +146,9 @@ void init_stuff (int argc, char *argv[])
   g_signal_connect ((gpointer) canvas, "enter_notify_event",
                     G_CALLBACK (on_canvas_enter_notify_event),
                     NULL);
+  g_signal_connect ((gpointer) canvas, "leave_notify_event",
+                    G_CALLBACK (on_canvas_leave_notify_event),
+                    NULL);
   g_signal_connect ((gpointer) canvas, "expose_event",
                     G_CALLBACK (on_canvas_expose_event),
                     NULL);
@@ -200,6 +188,7 @@ 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("optionsAntialiasBG")), ui.antialias_bg);
@@ -234,7 +223,7 @@ void init_stuff (int argc, char *argv[])
   /* fix a bug in GTK+ 2.16 and beyond: scrollbars shouldn't get extended
      input events from pointer motion when cursor moves into main window */
 #if GTK_CHECK_VERSION(2,14,0)
-  if (!gtk_check_version(2, 14, 0)) {
+  if (!gtk_check_version(2, 16, 0)) {
     g_signal_connect (
       GET_COMPONENT("menubar"),
       "event", G_CALLBACK (filter_extended_events),
@@ -259,6 +248,10 @@ void init_stuff (int argc, char *argv[])
       (gpointer)(gtk_scrolled_window_get_hscrollbar(GTK_SCROLLED_WINDOW(w))),
       "event", G_CALLBACK (filter_extended_events),
       NULL);
+    g_signal_connect (
+      GET_COMPONENT("comboLayer"),
+      "notify::popup-shown", G_CALLBACK (combobox_popup_disable_xinput),
+      NULL);
   }
 #endif
 
@@ -283,7 +276,7 @@ void init_stuff (int argc, char *argv[])
   set_cursor_busy(FALSE);
   if (!success) {
     w = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
-       GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error opening file '%s'", argv[1]);
+       GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), argv[1]);
     gtk_dialog_run(GTK_DIALOG(w));
     gtk_widget_destroy(w);
   }
@@ -295,6 +288,12 @@ main (int argc, char *argv[])
 {
   gchar *path, *path1, *path2;
   
+#ifdef ENABLE_NLS
+  bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
+#endif
+  
   gtk_set_locale ();
   gtk_init (&argc, &argv);