Merge 'master' into 'gtk3'.

[pspp] / src / ui / gui / psppire.c

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 512239e92a4eb1a8fa038691ef2d23c841b9b0c0..7013fcfc1ad7affdc57afaf8ca68549486297cc2 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -94,7 +94,7 @@ initialize (const char *data_file)
 
   psppire_output_window_setup ();
 
-  journal_enable ();
+  journal_init ();
   textdomain (PACKAGE);
 
   psppire_selector_set_default_selection_func (GTK_TYPE_ENTRY, insert_source_row_into_entry);
@@ -270,14 +270,17 @@ create_icon_factory (void)
        ones in all other respects.
     */
     const struct iconmap map[] = {
-      {GTK_STOCK_NEW,   "file-new-document"},
-      {GTK_STOCK_QUIT,  "file-quit"},
-      {GTK_STOCK_SAVE,  "file-save-document"},
-      {GTK_STOCK_CUT,   "edit-cut"},
-      {GTK_STOCK_COPY,  "edit-copy"},
-      {GTK_STOCK_PASTE, "edit-paste"},
-      {GTK_STOCK_ABOUT, "help-about"},
-      {GTK_STOCK_PRINT, "file-print-document"}
+      {GTK_STOCK_NEW,    "file-new-document"},
+      {GTK_STOCK_QUIT,   "file-quit"},
+      {GTK_STOCK_SAVE,   "file-save-document"},
+      {GTK_STOCK_CUT,    "edit-cut"},
+      {GTK_STOCK_COPY,   "edit-copy"},
+      {GTK_STOCK_PASTE,  "edit-paste"},
+      {GTK_STOCK_UNDO,   "edit-undo"},
+      {GTK_STOCK_REDO,   "edit-redo"},
+      {GTK_STOCK_DELETE, "edit-delete"},
+      {GTK_STOCK_ABOUT,  "help-about"},
+      {GTK_STOCK_PRINT,  "file-print-document"}
     };
 
     GtkStockItem customised[sizeof (map) / sizeof (map[0])];