diff --git a/libgimp/gimpui.c b/libgimp/gimpui.c
index 35cad82084..ac305053de 100644
--- a/libgimp/gimpui.c
+++ b/libgimp/gimpui.c
@@ -83,12 +83,8 @@ static gboolean gimp_ui_initialized = FALSE;
  * @prog_name: The name of the plug-in which will be passed as argv[0] to
  *             gtk_init(). It's a convention to use the name of the
  *             executable and _not_ the PDB procedure name.
- * @preview:   This parameter is unused and exists for historical
- *             reasons only.
  *
- * This function initializes GTK+ with gtk_init() and initializes GDK's
- * image rendering subsystem (GdkRGB) to follow the GIMP main program's
- * colormap allocation/installation policy.
+ * This function initializes GTK+ with gtk_init().
  *
  * It also sets up various other things so that the plug-in user looks
  * and behaves like the GIMP core. This includes selecting the GTK+
@@ -97,8 +93,7 @@ static gboolean gimp_ui_initialized = FALSE;
  * this function.
  **/
 void
-gimp_ui_init (const gchar *prog_name,
-              gboolean     preview)
+gimp_ui_init (const gchar *prog_name)
 {
   const gchar    *display_name;
   GtkCssProvider *css_provider;
diff --git a/libgimp/gimpui.h b/libgimp/gimpui.h
index b2e515821c..08e591b1b8 100644
--- a/libgimp/gimpui.h
+++ b/libgimp/gimpui.h
@@ -52,8 +52,7 @@ G_BEGIN_DECLS
 /* For information look into the C source or the html documentation */
 
 
-void        gimp_ui_init                          (const gchar *prog_name,
-                                                   gboolean     preview);
+void        gimp_ui_init                          (const gchar *prog_name);
 
 GdkWindow * gimp_ui_get_progress_window           (void);
 
diff --git a/plug-ins/common/align-layers.c b/plug-ins/common/align-layers.c
index d1e0648883..20d321ad42 100644
--- a/plug-ins/common/align-layers.c
+++ b/plug-ins/common/align-layers.c
@@ -654,7 +654,7 @@ align_layers_dialog (void)
   GtkAdjustment *adj;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Align Visible Layers"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/animation-play.c b/plug-ins/common/animation-play.c
index 48b83cee10..2b852785d6 100644
--- a/plug-ins/common/animation-play.c
+++ b/plug-ins/common/animation-play.c
@@ -783,7 +783,7 @@ build_dialog (gchar *imagename)
   gint         index;
   gchar       *text;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_role (GTK_WINDOW (window), "animation-playback");
diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c
index 4788d9e90a..210fb174ce 100644
--- a/plug-ins/common/blinds.c
+++ b/plug-ins/common/blinds.c
@@ -268,7 +268,7 @@ blinds_dialog (GimpDrawable *drawable)
   GtkWidget     *vertical;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Blinds"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/border-average.c b/plug-ins/common/border-average.c
index 4c1867e3dd..ce0a82dc58 100644
--- a/plug-ins/common/border-average.c
+++ b/plug-ins/common/border-average.c
@@ -400,7 +400,7 @@ borderaverage_dialog (GimpImage    *image,
   const gchar *labels[] =
     { "1", "2", "4", "8", "16", "32", "64", "128", "256" };
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Border Average"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/busy-dialog.c b/plug-ins/common/busy-dialog.c
index f6e77f4c43..6b09fe6a0e 100644
--- a/plug-ins/common/busy-dialog.c
+++ b/plug-ins/common/busy-dialog.c
@@ -246,7 +246,7 @@ busy_dialog (gint         read_fd,
    */
   gtk_init (NULL, NULL);
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   /* the main window */
   if (! cancelable)
diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c
index 5827604799..96995b6187 100644
--- a/plug-ins/common/checkerboard.c
+++ b/plug-ins/common/checkerboard.c
@@ -462,7 +462,7 @@ checkerboard_dialog (GimpImage    *image,
   gdouble    yres;
   gboolean   run;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Checkerboard"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/cml-explorer.c b/plug-ins/common/cml-explorer.c
index 3cb5dc6c5a..2fdda897a6 100644
--- a/plug-ins/common/cml-explorer.c
+++ b/plug-ins/common/cml-explorer.c
@@ -1319,7 +1319,7 @@ CML_explorer_dialog (void)
   GtkWidget *button;
   gboolean   run;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Coupled-Map-Lattice Explorer"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c
index 3961b02f11..2859cb06ca 100644
--- a/plug-ins/common/colormap-remap.c
+++ b/plug-ins/common/colormap-remap.c
@@ -645,7 +645,7 @@ remap_dialog (GimpImage *image,
   gint             ncols, i;
   gboolean         valid;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Rearrange Colormap"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c
index e37cc34159..f746201ac4 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -1145,7 +1145,7 @@ compose_dialog (const gchar  *compose_type,
   composeint.width  = gimp_drawable_width  (drawable);
   composeint.height = gimp_drawable_height (drawable);
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   layer_list = gimp_image_get_layers (gimp_item_get_image (GIMP_ITEM (drawable)),
                                       &nlayers);
diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c
index ad9ed5221e..0745c35c4d 100644
--- a/plug-ins/common/contrast-retinex.c
+++ b/plug-ins/common/contrast-retinex.c
@@ -316,7 +316,7 @@ retinex_dialog (GimpDrawable *drawable)
   GtkAdjustment *adj;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Retinex Image Enhancement"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/curve-bend.c b/plug-ins/common/curve-bend.c
index 013a75313b..67a7290d55 100644
--- a/plug-ins/common/curve-bend.c
+++ b/plug-ins/common/curve-bend.c
@@ -1093,7 +1093,7 @@ do_dialog (GimpDrawable *drawable)
   BenderDialog *cd;
 
   /* Init GTK  */
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   /*  The curve_bend dialog  */
   cd = bender_new_dialog (drawable);
diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c
index e49510f1dd..7ef72bc605 100644
--- a/plug-ins/common/decompose.c
+++ b/plug-ins/common/decompose.c
@@ -848,7 +848,7 @@ decompose_dialog (void)
         }
     }
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Decompose"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/depth-merge.c b/plug-ins/common/depth-merge.c
index 7b5427a19c..a82a0d1bda 100644
--- a/plug-ins/common/depth-merge.c
+++ b/plug-ins/common/depth-merge.c
@@ -700,7 +700,7 @@ DepthMerge_dialog (DepthMerge *dm)
 
   dm->interface = g_new0 (DepthMergeInterface, 1);
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dm->interface->dialog =
     dialog = gimp_dialog_new (_("Depth Merge"), PLUG_IN_ROLE,
diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c
index 3de8468594..629bd741ee 100644
--- a/plug-ins/common/despeckle.c
+++ b/plug-ins/common/despeckle.c
@@ -388,7 +388,7 @@ despeckle_dialog (GimpProcedure *procedure,
   gint       filter_type;
   gboolean   run;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_procedure_dialog_new (procedure,
                                       GIMP_PROCEDURE_CONFIG (config),
diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c
index 6a9315951a..b30733fd03 100644
--- a/plug-ins/common/destripe.c
+++ b/plug-ins/common/destripe.c
@@ -451,7 +451,7 @@ destripe_dialog (GimpDrawable *drawable)
   GtkAdjustment *adj;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Destripe"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/file-aa.c b/plug-ins/common/file-aa.c
index be19c67f96..606cfe58e0 100644
--- a/plug-ins/common/file-aa.c
+++ b/plug-ins/common/file-aa.c
@@ -194,7 +194,7 @@ ascii_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "AA",
                                   GIMP_EXPORT_CAN_HANDLE_RGB     |
diff --git a/plug-ins/common/file-cel.c b/plug-ins/common/file-cel.c
index 5881e464b3..45c2d9edbb 100644
--- a/plug-ins/common/file-cel.c
+++ b/plug-ins/common/file-cel.c
@@ -285,7 +285,7 @@ cel_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "CEL",
                                   GIMP_EXPORT_CAN_HANDLE_RGB   |
@@ -987,7 +987,7 @@ palette_dialog (const gchar *title)
 {
   GtkWidget *dialog;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gtk_file_chooser_dialog_new (title, NULL,
                                         GTK_FILE_CHOOSER_ACTION_OPEN,
diff --git a/plug-ins/common/file-csource.c b/plug-ins/common/file-csource.c
index d201e168cd..bef7aa6ca5 100644
--- a/plug-ins/common/file-csource.c
+++ b/plug-ins/common/file-csource.c
@@ -203,7 +203,7 @@ csource_save (GimpProcedure        *procedure,
     }
   x = config.comment;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   export = gimp_export_image (&image, &drawable, "C Source",
                               GIMP_EXPORT_CAN_HANDLE_RGB |
diff --git a/plug-ins/common/file-dicom.c b/plug-ins/common/file-dicom.c
index a491227cff..f667cc0fd5 100644
--- a/plug-ins/common/file-dicom.c
+++ b/plug-ins/common/file-dicom.c
@@ -276,7 +276,7 @@ dicom_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
       export = gimp_export_image (&image, &drawable, "DICOM",
                                   GIMP_EXPORT_CAN_HANDLE_RGB |
                                   GIMP_EXPORT_CAN_HANDLE_GRAY);
diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
index ec3dc3ba8e..108fe7b762 100644
--- a/plug-ins/common/file-gbr.c
+++ b/plug-ins/common/file-gbr.c
@@ -195,7 +195,7 @@ gbr_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "GBR",
                                   GIMP_EXPORT_CAN_HANDLE_GRAY    |
diff --git a/plug-ins/common/file-gegl.c b/plug-ins/common/file-gegl.c
index 574e2b3336..c6782befbd 100644
--- a/plug-ins/common/file-gegl.c
+++ b/plug-ins/common/file-gegl.c
@@ -276,7 +276,7 @@ goat_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "GEGL",
                                   GIMP_EXPORT_CAN_HANDLE_RGB     |
diff --git a/plug-ins/common/file-gif-save.c b/plug-ins/common/file-gif-save.c
index e312c9fd40..3c30ba1a32 100644
--- a/plug-ins/common/file-gif-save.c
+++ b/plug-ins/common/file-gif-save.c
@@ -277,7 +277,7 @@ gif_save (GimpProcedure        *procedure,
 
   if (run_mode == GIMP_RUN_INTERACTIVE ||
       run_mode == GIMP_RUN_WITH_LAST_VALS)
-    gimp_ui_init (PLUG_IN_BINARY, FALSE);
+    gimp_ui_init (PLUG_IN_BINARY);
 
   status = sanity_check (file, &image, run_mode, &error);
 
diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c
index 142e03508a..d9682950a0 100644
--- a/plug-ins/common/file-gih.c
+++ b/plug-ins/common/file-gih.c
@@ -285,7 +285,7 @@ gih_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "GIH",
                                   GIMP_EXPORT_CAN_HANDLE_RGB   |
diff --git a/plug-ins/common/file-header.c b/plug-ins/common/file-header.c
index 0d5c4afa95..39edebe998 100644
--- a/plug-ins/common/file-header.c
+++ b/plug-ins/common/file-header.c
@@ -154,7 +154,7 @@ header_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "Header",
                                   GIMP_EXPORT_CAN_HANDLE_RGB |
diff --git a/plug-ins/common/file-heif.c b/plug-ins/common/file-heif.c
index 84e6399531..1a25d9e778 100644
--- a/plug-ins/common/file-heif.c
+++ b/plug-ins/common/file-heif.c
@@ -228,7 +228,7 @@ heif_load (GimpProcedure        *procedure,
   interactive = (run_mode == GIMP_RUN_INTERACTIVE);
 
   if (interactive)
-    gimp_ui_init (PLUG_IN_BINARY, FALSE);
+    gimp_ui_init (PLUG_IN_BINARY);
 
   image = load_image (file, interactive, &status, &error);
 
@@ -275,7 +275,7 @@ heif_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
       export = gimp_export_image (&image, &drawable, "HEIF",
                                   GIMP_EXPORT_CAN_HANDLE_RGB |
                                   GIMP_EXPORT_CAN_HANDLE_ALPHA);
diff --git a/plug-ins/common/file-html-table.c b/plug-ins/common/file-html-table.c
index c61fbe2612..6e6ce43243 100644
--- a/plug-ins/common/file-html-table.c
+++ b/plug-ins/common/file-html-table.c
@@ -497,7 +497,7 @@ save_dialog (GimpImage *image)
   GtkWidget     *toggle;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_export_dialog_new (_("HTML table"), PLUG_IN_BINARY, SAVE_PROC);
 
diff --git a/plug-ins/common/file-jp2-load.c b/plug-ins/common/file-jp2-load.c
index 178a398e76..ae30330637 100644
--- a/plug-ins/common/file-jp2-load.c
+++ b/plug-ins/common/file-jp2-load.c
@@ -266,7 +266,7 @@ jp2_load (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
       interactive = TRUE;
       break;
 
@@ -967,7 +967,7 @@ open_dialog (GFile            *file,
     /* Unexpected, but let's be a bit flexible and ask. */
     title = "JPEG 2000 image with no color space";
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (title, PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c
index de1b8e7718..63fa72de15 100644
--- a/plug-ins/common/file-mng.c
+++ b/plug-ins/common/file-mng.c
@@ -410,7 +410,7 @@ mng_save (GimpProcedure        *procedure,
     {
       gimp_get_data (SAVE_PROC, &mng_data);
 
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "MNG",
                                   GIMP_EXPORT_CAN_HANDLE_RGB     |
diff --git a/plug-ins/common/file-pat.c b/plug-ins/common/file-pat.c
index bb1ee70656..93e1f280ef 100644
--- a/plug-ins/common/file-pat.c
+++ b/plug-ins/common/file-pat.c
@@ -161,7 +161,7 @@ pat_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "PAT",
                                   GIMP_EXPORT_CAN_HANDLE_GRAY    |
diff --git a/plug-ins/common/file-pcx.c b/plug-ins/common/file-pcx.c
index c8a00c8712..e0386e462a 100644
--- a/plug-ins/common/file-pcx.c
+++ b/plug-ins/common/file-pcx.c
@@ -271,7 +271,7 @@ pcx_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "PCX",
                                   GIMP_EXPORT_CAN_HANDLE_RGB  |
diff --git a/plug-ins/common/file-pdf-load.c b/plug-ins/common/file-pdf-load.c
index 9051d41a41..8718ae4c29 100644
--- a/plug-ins/common/file-pdf-load.c
+++ b/plug-ins/common/file-pdf-load.c
@@ -407,7 +407,7 @@ pdf_load (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
       gimp_get_data (LOAD_PROC, &loadvals);
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
       doc = open_document (file,
                            loadvals.PDF_password,
                            run_mode, &error);
diff --git a/plug-ins/common/file-pdf-save.c b/plug-ins/common/file-pdf-save.c
index 09c83ce804..352ae319ec 100644
--- a/plug-ins/common/file-pdf-save.c
+++ b/plug-ins/common/file-pdf-save.c
@@ -872,7 +872,7 @@ gui_single (void)
   gboolean   run;
   gint32     n_layers;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   window = gimp_export_dialog_new ("PDF", PLUG_IN_ROLE, SAVE_PROC);
 
@@ -975,7 +975,7 @@ gui_multi (void)
   gboolean     run;
   const gchar *temp;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   window = gimp_export_dialog_new ("PDF", PLUG_IN_ROLE, SAVE_MULTI_PROC);
 
diff --git a/plug-ins/common/file-pix.c b/plug-ins/common/file-pix.c
index 79f00020f7..bc1ef103ad 100644
--- a/plug-ins/common/file-pix.c
+++ b/plug-ins/common/file-pix.c
@@ -260,7 +260,7 @@ pix_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "PIX",
                                   GIMP_EXPORT_CAN_HANDLE_RGB  |
diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c
index c760d2d9d4..c8b675a0e9 100644
--- a/plug-ins/common/file-png.c
+++ b/plug-ins/common/file-png.c
@@ -408,7 +408,7 @@ png_load (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
       interactive = TRUE;
       break;
     default:
@@ -482,7 +482,7 @@ png_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "PNG",
                                   GIMP_EXPORT_CAN_HANDLE_RGB     |
@@ -1270,7 +1270,7 @@ offsets_dialog (gint offset_x,
   gchar     *message;
   gboolean   run;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Apply PNG Offset"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/file-pnm.c b/plug-ins/common/file-pnm.c
index fe3875b8f6..ebeffad0cf 100644
--- a/plug-ins/common/file-pnm.c
+++ b/plug-ins/common/file-pnm.c
@@ -526,7 +526,7 @@ pnm_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       if (! strcmp (name, PNM_SAVE_PROC))
         {
diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c
index ab3cfd694a..a25e95974e 100644
--- a/plug-ins/common/file-ps.c
+++ b/plug-ins/common/file-ps.c
@@ -735,7 +735,7 @@ ps_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable,
                                   psvals.eps ? "EPS" : "PostScript",
@@ -3526,7 +3526,7 @@ load_dialog (GFile *file)
 
   page_count = count_ps_pages (file);
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Import from PostScript"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c
index 7704bd9078..e738932e2f 100644
--- a/plug-ins/common/file-psp.c
+++ b/plug-ins/common/file-psp.c
@@ -735,7 +735,7 @@ psp_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "PSP",
                                   GIMP_EXPORT_CAN_HANDLE_RGB     |
diff --git a/plug-ins/common/file-raw-data.c b/plug-ins/common/file-raw-data.c
index 506cf20986..bfe9c53f7a 100644
--- a/plug-ins/common/file-raw-data.c
+++ b/plug-ins/common/file-raw-data.c
@@ -1780,7 +1780,7 @@ load_dialog (GFile    *file,
 
   file_size = get_file_info (file);
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Load Image from Raw Data"), PLUG_IN_ROLE,
                             NULL, 0,
@@ -2063,7 +2063,7 @@ save_dialog (GimpImage *image)
   gchar      *ui_file;
   GError     *error = NULL;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   /* Dialog init */
   dialog = gimp_export_dialog_new (_("Raw Image"), PLUG_IN_BINARY, SAVE_PROC);
diff --git a/plug-ins/common/file-sunras.c b/plug-ins/common/file-sunras.c
index 8be4b7397b..32d82f9273 100644
--- a/plug-ins/common/file-sunras.c
+++ b/plug-ins/common/file-sunras.c
@@ -381,7 +381,7 @@ sunras_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "SUNRAS",
                                   GIMP_EXPORT_CAN_HANDLE_RGB  |
diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c
index ffd6c64a9a..c52c1da850 100644
--- a/plug-ins/common/file-svg.c
+++ b/plug-ins/common/file-svg.c
@@ -668,7 +668,7 @@ load_dialog (GFile   *file,
       return GIMP_PDB_EXECUTION_ERROR;
     }
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   /* Scalable Vector Graphics is SVG, should perhaps not be translated */
   dialog = gimp_dialog_new (_("Render Scalable Vector Graphics"),
diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c
index 2ecc7b72f0..c9d5a0fbb7 100644
--- a/plug-ins/common/file-tga.c
+++ b/plug-ins/common/file-tga.c
@@ -369,7 +369,7 @@ tga_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "TGA",
                                   GIMP_EXPORT_CAN_HANDLE_RGB     |
diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c
index 770c84edb6..ba1409ae7c 100644
--- a/plug-ins/common/file-wmf.c
+++ b/plug-ins/common/file-wmf.c
@@ -540,7 +540,7 @@ load_dialog (GFile *file)
   WmfLoadVals  vals = { WMF_DEFAULT_RESOLUTION,
                         - WMF_PREVIEW_SIZE, - WMF_PREVIEW_SIZE };
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Render Windows Metafile"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c
index 67c8182366..5d2ca82b56 100644
--- a/plug-ins/common/file-xbm.c
+++ b/plug-ins/common/file-xbm.c
@@ -377,7 +377,7 @@ xbm_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "XBM",
                                   GIMP_EXPORT_CAN_HANDLE_BITMAP |
diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c
index 1d42e2f656..510648e884 100644
--- a/plug-ins/common/file-xmc.c
+++ b/plug-ins/common/file-xmc.c
@@ -574,7 +574,7 @@ xmc_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "XMC",
                                   GIMP_EXPORT_CAN_HANDLE_RGB    |
diff --git a/plug-ins/common/file-xpm.c b/plug-ins/common/file-xpm.c
index 34bf5697e4..df9541f925 100644
--- a/plug-ins/common/file-xpm.c
+++ b/plug-ins/common/file-xpm.c
@@ -316,7 +316,7 @@ xpm_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "XPM",
                                   GIMP_EXPORT_CAN_HANDLE_RGB     |
diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c
index caa77cbca2..fdeda5cb51 100644
--- a/plug-ins/common/file-xwd.c
+++ b/plug-ins/common/file-xwd.c
@@ -417,7 +417,7 @@ xwd_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "XWD",
                                   GIMP_EXPORT_CAN_HANDLE_RGB  |
diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c
index 9d5ef2a71f..1e76485988 100644
--- a/plug-ins/common/film.c
+++ b/plug-ins/common/film.c
@@ -1311,7 +1311,7 @@ film_dialog (GimpImage *image)
   GtkWidget *notebook;
   gboolean   run;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dlg = gimp_dialog_new (_("Filmstrip"), PLUG_IN_ROLE,
                          NULL, 0,
diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c
index f76b036d74..fe2a957fd5 100644
--- a/plug-ins/common/grid.c
+++ b/plug-ins/common/grid.c
@@ -725,7 +725,7 @@ dialog (GimpImage    *image,
 
   g_return_val_if_fail (main_dialog == NULL, FALSE);
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   d_width  = gimp_drawable_width  (drawable);
   d_height = gimp_drawable_height (drawable);
diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c
index e8514978a5..c02050811f 100644
--- a/plug-ins/common/hot.c
+++ b/plug-ins/common/hot.c
@@ -647,7 +647,7 @@ plugin_dialog (piArgs *argp)
   GtkWidget *frame;
   gboolean   run;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dlg = gimp_dialog_new (_("Hot"), PLUG_IN_ROLE,
                          NULL, 0,
diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c
index a97a86a1ca..de65c1be1a 100644
--- a/plug-ins/common/jigsaw.c
+++ b/plug-ins/common/jigsaw.c
@@ -2463,7 +2463,7 @@ jigsaw_dialog (GimpDrawable *drawable)
   GtkAdjustment *adj;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Jigsaw"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c
index 1d5b9a8cc8..c8cb8a6539 100644
--- a/plug-ins/common/mail.c
+++ b/plug-ins/common/mail.c
@@ -543,7 +543,7 @@ send_dialog (void)
   gint           row = 0;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   /* check gimprc for a preferred "From:" address */
   gump_from = gimp_gimprc_query ("gump-from");
diff --git a/plug-ins/common/nl-filter.c b/plug-ins/common/nl-filter.c
index 4f7ac4504b..8735952abf 100644
--- a/plug-ins/common/nl-filter.c
+++ b/plug-ins/common/nl-filter.c
@@ -1090,7 +1090,7 @@ nlfilter_dialog (GimpDrawable *drawable)
   GtkAdjustment *adj;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("NL Filter"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/plugin-browser.c b/plug-ins/common/plugin-browser.c
index a7f9a45652..6a51af77dc 100644
--- a/plug-ins/common/plugin-browser.c
+++ b/plug-ins/common/plugin-browser.c
@@ -549,7 +549,7 @@ browser_dialog_new (void)
   GtkTreeSelection  *selection;
   GtkTreeIter        iter;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   browser = g_new0 (PluginBrowser, 1);
 
diff --git a/plug-ins/common/procedure-browser.c b/plug-ins/common/procedure-browser.c
index b4d4ef73d9..e25646343b 100644
--- a/plug-ins/common/procedure-browser.c
+++ b/plug-ins/common/procedure-browser.c
@@ -159,7 +159,7 @@ browser_run (GimpProcedure        *procedure,
       {
         GtkWidget *dialog;
 
-        gimp_ui_init (PLUG_IN_BINARY, FALSE);
+        gimp_ui_init (PLUG_IN_BINARY);
 
         dialog =
           gimp_proc_browser_dialog_new (_("Procedure Browser"), PLUG_IN_BINARY,
diff --git a/plug-ins/common/qbist.c b/plug-ins/common/qbist.c
index 641b48920a..c1bcdf2122 100644
--- a/plug-ins/common/qbist.c
+++ b/plug-ins/common/qbist.c
@@ -837,7 +837,7 @@ dialog_run (void)
   gint       i;
   gboolean   run;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("G-Qbist"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/sample-colorize.c b/plug-ins/common/sample-colorize.c
index ee7c5b3de1..e1bb477b6b 100644
--- a/plug-ins/common/sample-colorize.c
+++ b/plug-ins/common/sample-colorize.c
@@ -1379,7 +1379,7 @@ smp_dialog (void)
   g_di.orig_inten_button     = NULL;
 
   /* Init GTK  */
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   /* Main Dialog */
   g_di.dialog = dialog =
diff --git a/plug-ins/common/smooth-palette.c b/plug-ins/common/smooth-palette.c
index 7def595ebf..0146585cdc 100644
--- a/plug-ins/common/smooth-palette.c
+++ b/plug-ins/common/smooth-palette.c
@@ -479,7 +479,7 @@ dialog (GimpDrawable *drawable)
   gdouble        xres, yres;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dlg = gimp_dialog_new (_("Smooth Palette"), PLUG_IN_ROLE,
                          NULL, 0,
diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c
index 42ab82d88a..140dc4f4be 100644
--- a/plug-ins/common/sparkle.c
+++ b/plug-ins/common/sparkle.c
@@ -393,7 +393,7 @@ sparkle_dialog (GimpDrawable *drawable)
   GtkAdjustment *scale_data;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Sparkle"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/sphere-designer.c b/plug-ins/common/sphere-designer.c
index 7ba9831174..70cbc35a6d 100644
--- a/plug-ins/common/sphere-designer.c
+++ b/plug-ins/common/sphere-designer.c
@@ -3113,7 +3113,7 @@ realrender (GimpDrawable *drawable)
 static gboolean
 sphere_main (GimpDrawable *drawable)
 {
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   img_stride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, PREVIEWSIZE);
   img = g_malloc0 (img_stride * PREVIEWSIZE);
diff --git a/plug-ins/common/tile-small.c b/plug-ins/common/tile-small.c
index 6b37b990b0..e5c6982c89 100644
--- a/plug-ins/common/tile-small.c
+++ b/plug-ins/common/tile-small.c
@@ -414,7 +414,7 @@ tileit_dialog (GimpDrawable *drawable)
   GSList        *orientation_group = NULL;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   cache_preview (drawable); /* Get the preview image */
 
diff --git a/plug-ins/common/tile.c b/plug-ins/common/tile.c
index 1e0cc9b90e..4a07809b39 100644
--- a/plug-ins/common/tile.c
+++ b/plug-ins/common/tile.c
@@ -452,7 +452,7 @@ tile_dialog (GimpImage    *image,
   GimpUnit   unit;
   gboolean   run;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   width  = gimp_drawable_width (drawable);
   height = gimp_drawable_height (drawable);
diff --git a/plug-ins/common/unit-editor.c b/plug-ins/common/unit-editor.c
index 9942b2899c..e40f6ea876 100644
--- a/plug-ins/common/unit-editor.c
+++ b/plug-ins/common/unit-editor.c
@@ -421,7 +421,7 @@ unit_editor_dialog (void)
   GtkCellRenderer   *rend;
   gint               i;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   list_store = gtk_list_store_new (NUM_COLUMNS,
                                    G_TYPE_BOOLEAN,   /*  SAVE          */
diff --git a/plug-ins/common/van-gogh-lic.c b/plug-ins/common/van-gogh-lic.c
index f9ee186140..099d6fb9c8 100644
--- a/plug-ins/common/van-gogh-lic.c
+++ b/plug-ins/common/van-gogh-lic.c
@@ -695,7 +695,7 @@ create_main_dialog (void)
   gint           row;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Van Gogh (LIC)"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c
index 5aa2fe78fe..82bb2600c9 100644
--- a/plug-ins/common/warp.c
+++ b/plug-ins/common/warp.c
@@ -458,7 +458,7 @@ warp_dialog (GimpDrawable *drawable)
   GSList        *group = NULL;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dlg = gimp_dialog_new (_("Warp"), PLUG_IN_ROLE,
                          NULL, 0,
diff --git a/plug-ins/common/wavelet-decompose.c b/plug-ins/common/wavelet-decompose.c
index 6830647e80..346aa2f09e 100644
--- a/plug-ins/common/wavelet-decompose.c
+++ b/plug-ins/common/wavelet-decompose.c
@@ -379,7 +379,7 @@ wavelet_decompose_dialog (void)
   GtkAdjustment *adj;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Wavelet decompose"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/common/web-browser.c b/plug-ins/common/web-browser.c
index 8fa4179a18..4e790d1ae0 100644
--- a/plug-ins/common/web-browser.c
+++ b/plug-ins/common/web-browser.c
@@ -236,7 +236,7 @@ browser_open_url (GtkWindow    *window,
 
 #else
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   return gtk_show_uri_on_window (window,
                                  url,
diff --git a/plug-ins/common/web-page.c b/plug-ins/common/web-page.c
index ab7f656581..315459841b 100644
--- a/plug-ins/common/web-page.c
+++ b/plug-ins/common/web-page.c
@@ -269,7 +269,7 @@ webpage_dialog (void)
   gint           status;
   gboolean       ret = FALSE;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Create from webpage"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/file-bmp/bmp.c b/plug-ins/file-bmp/bmp.c
index 5c11ef60bb..3ec107ddcb 100644
--- a/plug-ins/file-bmp/bmp.c
+++ b/plug-ins/file-bmp/bmp.c
@@ -242,7 +242,7 @@ bmp_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "BMP",
                                   GIMP_EXPORT_CAN_HANDLE_RGB   |
diff --git a/plug-ins/file-dds/dds.c b/plug-ins/file-dds/dds.c
index d22967384e..fa4fb1fa43 100644
--- a/plug-ins/file-dds/dds.c
+++ b/plug-ins/file-dds/dds.c
@@ -391,7 +391,7 @@ dds_load (GimpProcedure        *procedure,
   switch (run_mode)
     {
     case GIMP_RUN_INTERACTIVE:
-      gimp_ui_init ("dds", 0);
+      gimp_ui_init ("dds");
       gimp_get_data (LOAD_PROC, &dds_read_vals);
       break;
 
@@ -445,7 +445,7 @@ dds_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init ("dds", 0);
+      gimp_ui_init ("dds");
 
       export = gimp_export_image (&image, &drawable, "DDS",
                                   GIMP_EXPORT_CAN_HANDLE_RGB     |
diff --git a/plug-ins/file-fits/fits.c b/plug-ins/file-fits/fits.c
index db75547a45..32d75eca67 100644
--- a/plug-ins/file-fits/fits.c
+++ b/plug-ins/file-fits/fits.c
@@ -320,7 +320,7 @@ fits_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "FITS",
                                   GIMP_EXPORT_CAN_HANDLE_RGB  |
@@ -1176,7 +1176,7 @@ load_dialog (void)
   GtkWidget *frame;
   gboolean   run;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Load FITS File"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/file-fli/fli-gimp.c b/plug-ins/file-fli/fli-gimp.c
index 3b71e31e9e..f668c15deb 100644
--- a/plug-ins/file-fli/fli-gimp.c
+++ b/plug-ins/file-fli/fli-gimp.c
@@ -369,7 +369,7 @@ fli_save (GimpProcedure        *procedure,
 
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "FLI",
                                   GIMP_EXPORT_CAN_HANDLE_INDEXED |
@@ -881,7 +881,7 @@ load_dialog (GFile *file)
   from_frame = 1;
   to_frame   = nframes;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("GFLI 1.3 - Load framestack"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/file-ico/ico-save.c b/plug-ins/file-ico/ico-save.c
index 904336c472..aa3a5bc25f 100644
--- a/plug-ins/file-ico/ico-save.c
+++ b/plug-ins/file-ico/ico-save.c
@@ -238,7 +238,7 @@ ico_save_dialog (GimpImage      *image,
   gint       i;
   gint       response;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = ico_dialog_new (info);
   for (iter = info->layers, i = 0;
diff --git a/plug-ins/file-jpeg/jpeg.c b/plug-ins/file-jpeg/jpeg.c
index d9c334bbd7..957e3095e2 100644
--- a/plug-ins/file-jpeg/jpeg.c
+++ b/plug-ins/file-jpeg/jpeg.c
@@ -290,7 +290,7 @@ jpeg_load (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
       load_interactive = TRUE;
       break;
 
@@ -417,7 +417,7 @@ jpeg_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "JPEG",
                                   GIMP_EXPORT_CAN_HANDLE_RGB |
diff --git a/plug-ins/file-psd/psd.c b/plug-ins/file-psd/psd.c
index f0386be46e..5b3804e73c 100644
--- a/plug-ins/file-psd/psd.c
+++ b/plug-ins/file-psd/psd.c
@@ -247,7 +247,7 @@ psd_load (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
       interactive = TRUE;
       break;
     default:
@@ -353,7 +353,7 @@ psd_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "PSD",
                                   GIMP_EXPORT_CAN_HANDLE_RGB     |
diff --git a/plug-ins/file-sgi/sgi.c b/plug-ins/file-sgi/sgi.c
index 1ad802f8a8..4dc6c7258d 100644
--- a/plug-ins/file-sgi/sgi.c
+++ b/plug-ins/file-sgi/sgi.c
@@ -243,7 +243,7 @@ sgi_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       export = gimp_export_image (&image, &drawable, "SGI",
                                   GIMP_EXPORT_CAN_HANDLE_RGB     |
diff --git a/plug-ins/file-tiff/file-tiff.c b/plug-ins/file-tiff/file-tiff.c
index 7fbf91a0d4..13964de0a7 100644
--- a/plug-ins/file-tiff/file-tiff.c
+++ b/plug-ins/file-tiff/file-tiff.c
@@ -245,7 +245,7 @@ tiff_load (GimpProcedure        *procedure,
   gegl_init (NULL, NULL);
 
   if (run_mode == GIMP_RUN_INTERACTIVE)
-    gimp_ui_init (PLUG_IN_BINARY, FALSE);
+    gimp_ui_init (PLUG_IN_BINARY);
 
   status = load_image (file, run_mode, &image,
                        &resolution_loaded,
@@ -309,7 +309,7 @@ tiff_save (GimpProcedure        *procedure,
     {
     case GIMP_RUN_INTERACTIVE:
     case GIMP_RUN_WITH_LAST_VALS:
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
       break;
     default:
       break;
diff --git a/plug-ins/file-webp/file-webp.c b/plug-ins/file-webp/file-webp.c
index b6a6a74252..e358e4bbb5 100644
--- a/plug-ins/file-webp/file-webp.c
+++ b/plug-ins/file-webp/file-webp.c
@@ -293,7 +293,7 @@ webp_save (GimpProcedure        *procedure,
 
   if (run_mode == GIMP_RUN_INTERACTIVE ||
       run_mode == GIMP_RUN_WITH_LAST_VALS)
-    gimp_ui_init (PLUG_IN_BINARY, FALSE);
+    gimp_ui_init (PLUG_IN_BINARY);
 
   /* Default settings */
   params.preset        = WEBP_PRESET_DEFAULT;
diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c
index a8cd7b1760..e00b45d818 100644
--- a/plug-ins/flame/flame.c
+++ b/plug-ins/flame/flame.c
@@ -1004,7 +1004,7 @@ flame_dialog (void)
   GtkAdjustment *adj;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Flame"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
index 62c11a5f68..e84f70f89c 100644
--- a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
+++ b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
@@ -526,7 +526,7 @@ explorer_dialog (void)
   GSList    *group = NULL;
   gint       i;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   path = gimp_gimprc_query ("fractalexplorer-path");
 
diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c
index 26ce348864..2032a8c904 100644
--- a/plug-ins/gfig/gfig-dialog.c
+++ b/plug-ins/gfig/gfig-dialog.c
@@ -214,7 +214,7 @@ gfig_dialog (void)
   GtkWidget    *empty_label;
   gchar        *path;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   img_width  = gimp_drawable_width (gfig_context->drawable);
   img_height = gimp_drawable_height (gfig_context->drawable);
diff --git a/plug-ins/gimpressionist/gimpressionist.c b/plug-ins/gimpressionist/gimpressionist.c
index 7e9adc9ea4..cf005b0ed5 100644
--- a/plug-ins/gimpressionist/gimpressionist.c
+++ b/plug-ins/gimpressionist/gimpressionist.c
@@ -133,7 +133,7 @@ create_dialog (void)
   GtkWidget *hbox;
   GtkWidget *preview_box;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("GIMPressionist"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/goat-exercises/goat-exercise-c.c b/plug-ins/goat-exercises/goat-exercise-c.c
index be9cdc0bab..6c76419408 100644
--- a/plug-ins/goat-exercises/goat-exercise-c.c
+++ b/plug-ins/goat-exercises/goat-exercise-c.c
@@ -156,7 +156,7 @@ goat_run (GimpProcedure        *procedure,
       gssize            read;
       gint              response;
 
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
       dialog = gimp_dialog_new (_("Exercise a goat (C)"), PLUG_IN_ROLE,
                                 NULL, GTK_DIALOG_USE_HEADER_BAR,
                                 gimp_standard_help_func, PLUG_IN_PROC,
diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c
index 4a7712ada3..f4b5124dfa 100644
--- a/plug-ins/gradient-flare/gradient-flare.c
+++ b/plug-ins/gradient-flare/gradient-flare.c
@@ -2464,7 +2464,7 @@ dlg_run (void)
   GtkWidget  *notebook;
   gboolean    run = FALSE;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   /*
    *    Init Main Dialog
diff --git a/plug-ins/help-browser/dialog.c b/plug-ins/help-browser/dialog.c
index 0a54f4aa60..8288c1a4a0 100644
--- a/plug-ins/help-browser/dialog.c
+++ b/plug-ins/help-browser/dialog.c
@@ -168,7 +168,7 @@ browser_dialog_open (const gchar *plug_in_binary)
   GtkAction   *action;
   DialogData   data = { 720, 560, 240, TRUE, 1.0 };
 
-  gimp_ui_init (plug_in_binary, TRUE);
+  gimp_ui_init (plug_in_binary);
 
   gimp_get_data (GIMP_HELP_BROWSER_DIALOG_DATA, &data);
 
diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c
index f7f2f82bc1..0cb9b0dcab 100644
--- a/plug-ins/ifs-compose/ifs-compose.c
+++ b/plug-ins/ifs-compose/ifs-compose.c
@@ -770,7 +770,7 @@ ifs_compose_dialog (GimpDrawable *drawable)
   ifsD->preview_width   = design_width;
   ifsD->preview_height  = design_height;
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("IFS Fractal"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/imagemap/imap_main.c b/plug-ins/imagemap/imap_main.c
index 073fbf1be5..74e0fe4f44 100644
--- a/plug-ins/imagemap/imap_main.c
+++ b/plug-ins/imagemap/imap_main.c
@@ -1253,7 +1253,7 @@ dialog (GimpDrawable *drawable)
    GtkWidget    *main_vbox;
    GtkWidget    *tools;
 
-   gimp_ui_init (PLUG_IN_BINARY, TRUE);
+   gimp_ui_init (PLUG_IN_BINARY);
 
    set_arrow_func ();
 
diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c
index 1b77d614de..18f581f222 100644
--- a/plug-ins/lighting/lighting-ui.c
+++ b/plug-ins/lighting/lighting-ui.c
@@ -1026,7 +1026,7 @@ main_dialog (GimpDrawable *drawable)
   GtkWidget *image;
   */
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   path = gimp_gimprc_query ("lighting-effects-path");
   if (path)
diff --git a/plug-ins/map-object/map-object-ui.c b/plug-ins/map-object/map-object-ui.c
index 97fc4f7cd9..f476711bcb 100644
--- a/plug-ins/map-object/map-object-ui.c
+++ b/plug-ins/map-object/map-object-ui.c
@@ -1300,7 +1300,7 @@ main_dialog (GimpDrawable *drawable)
   GimpZoomModel *model;
   gboolean       run = FALSE;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   appwin = gimp_dialog_new (_("Map to Object"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/metadata/metadata-editor.c b/plug-ins/metadata/metadata-editor.c
index 309896af9c..57dc5c28d7 100644
--- a/plug-ins/metadata/metadata-editor.c
+++ b/plug-ins/metadata/metadata-editor.c
@@ -472,7 +472,7 @@ metadata_run (GimpProcedure        *procedure,
 
   INIT_I18N ();
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   image = GIMP_VALUES_GET_IMAGE (args, 1);
 
diff --git a/plug-ins/metadata/metadata-viewer.c b/plug-ins/metadata/metadata-viewer.c
index d6e6bdcf33..f0613acfed 100644
--- a/plug-ins/metadata/metadata-viewer.c
+++ b/plug-ins/metadata/metadata-viewer.c
@@ -194,7 +194,7 @@ metadata_run (GimpProcedure        *procedure,
 
   INIT_I18N ();
 
-  gimp_ui_init (PLUG_IN_BINARY, TRUE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   image = GIMP_VALUES_GET_IMAGE (args, 1);
 
diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c
index 456f2961cb..2f43ca7f06 100644
--- a/plug-ins/pagecurl/pagecurl.c
+++ b/plug-ins/pagecurl/pagecurl.c
@@ -464,7 +464,7 @@ dialog (void)
   GtkAdjustment *adjustment;
   gboolean       run;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Pagecurl Effect"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/print/print.c b/plug-ins/print/print.c
index 7185cf2581..750676245c 100644
--- a/plug-ins/print/print.c
+++ b/plug-ins/print/print.c
@@ -307,7 +307,7 @@ print_image (GimpImage *image,
 
   if (interactive)
     {
-      gimp_ui_init (PLUG_IN_BINARY, FALSE);
+      gimp_ui_init (PLUG_IN_BINARY);
 
       g_signal_connect_swapped (operation, "end-print",
                                 G_CALLBACK (print_settings_save),
@@ -375,7 +375,7 @@ page_setup (GimpImage *image)
   GimpValueArray     *return_vals;
   gchar              *name;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   operation = gtk_print_operation_new ();
 
diff --git a/plug-ins/screenshot/screenshot.c b/plug-ins/screenshot/screenshot.c
index ec88a38430..d8c3a91fd9 100644
--- a/plug-ins/screenshot/screenshot.c
+++ b/plug-ins/screenshot/screenshot.c
@@ -518,7 +518,7 @@ shoot_dialog (GdkMonitor **monitor)
   gboolean       run;
   GtkWidget     *cursor_toggle = NULL;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dialog = gimp_dialog_new (_("Screenshot"), PLUG_IN_ROLE,
                             NULL, 0,
diff --git a/plug-ins/script-fu/script-fu-console.c b/plug-ins/script-fu/script-fu-console.c
index baa2827f0d..c1b98909ca 100644
--- a/plug-ins/script-fu/script-fu-console.c
+++ b/plug-ins/script-fu/script-fu-console.c
@@ -103,7 +103,7 @@ script_fu_console_run (GimpProcedure        *procedure,
 
   ts_set_print_flag (1);
 
-  gimp_ui_init ("script-fu", FALSE);
+  gimp_ui_init ("script-fu");
 
   console.history_max = 50;
 
diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c
index fe9fdaca18..2b20961fdf 100644
--- a/plug-ins/script-fu/script-fu-interface.c
+++ b/plug-ins/script-fu/script-fu-interface.c
@@ -215,7 +215,7 @@ script_fu_interface (SFScript  *script,
     {
       INIT_I18N();
 
-      gimp_ui_init ("script-fu", TRUE);
+      gimp_ui_init ("script-fu");
 
       gtk_initted = TRUE;
     }
diff --git a/plug-ins/script-fu/script-fu-server.c b/plug-ins/script-fu/script-fu-server.c
index 1d92edb893..d5051e8e24 100644
--- a/plug-ins/script-fu/script-fu-server.c
+++ b/plug-ins/script-fu/script-fu-server.c
@@ -820,7 +820,7 @@ server_interface (void)
 
   INIT_I18N();
 
-  gimp_ui_init ("script-fu", FALSE);
+  gimp_ui_init ("script-fu");
 
   dlg = gimp_dialog_new (_("Script-Fu Server Options"), "gimp-script-fu",
                          NULL, 0,
diff --git a/plug-ins/selection-to-path/selection-to-path.c b/plug-ins/selection-to-path/selection-to-path.c
index 709281a846..d018f133eb 100644
--- a/plug-ins/selection-to-path/selection-to-path.c
+++ b/plug-ins/selection-to-path/selection-to-path.c
@@ -395,7 +395,7 @@ sel2path_dialog (SELVALS *sels)
 
   retVal = FALSE;
 
-  gimp_ui_init (PLUG_IN_BINARY, FALSE);
+  gimp_ui_init (PLUG_IN_BINARY);
 
   dlg = gimp_dialog_new (_("Selection to Path Advanced Settings"),
                          PLUG_IN_ROLE,