added a call to gtk_window_set_wmclass to most of the gimp

dialogs

-adrian

app/about_dialog.c

@@ -57,6 +57,7 @@ static char *scroll_text[] =
   "Simon Janes",
   "Tim Janik",
   "Tuomas Kuosmanen",
+  "Peter Kirchgessner", 
   "Karl LaRocca",
   "Jens Lautenbacher",
   "Raph Levien",
@@ -111,6 +112,7 @@ about_dialog_create (int timeout)
   if (!about_dialog)
     {
       about_dialog = gtk_window_new (GTK_WINDOW_DIALOG);
+      gtk_window_set_wmclass (GTK_WINDOW (about_dialog), "about_dialog", "Gimp");
       gtk_window_set_title (GTK_WINDOW (about_dialog), "About the GIMP");
       gtk_window_set_policy (GTK_WINDOW (about_dialog), FALSE, FALSE, FALSE);
       gtk_window_position (GTK_WINDOW (about_dialog), GTK_WIN_POS_CENTER);

app/actions/help-commands.c

@@ -312,6 +312,7 @@ file_new_cmd_callback (GtkWidget *widget,
     vals->type = RGB;    /* no indexed images */
 
   vals->dlg = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (vals->dlg), "new_image", "Gimp");
   gtk_window_set_title (GTK_WINDOW (vals->dlg), "New Image");
   gtk_window_position (GTK_WINDOW (vals->dlg), GTK_WIN_POS_MOUSE);
 
@@ -995,6 +996,7 @@ file_pref_cmd_callback (GtkWidget *widget,
       file_prefs_strset (&old_gradient_path, edit_gradient_path);
 
       prefs_dlg = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (prefs_dlg), "preferences", "Gimp");
       gtk_window_set_title (GTK_WINDOW (prefs_dlg), "Preferences");
 
       /* handle the wm close signal */
@@ -2109,6 +2111,7 @@ image_resize_cmd_callback (GtkWidget *widget,
 
   /*  the dialog  */
   image_resize->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (image_resize->shell), "image_resize", "Gimp");
   gtk_window_set_title (GTK_WINDOW (image_resize->shell), "Image Resize");
   gtk_window_set_policy (GTK_WINDOW (image_resize->shell), FALSE, FALSE, TRUE);
   gtk_window_position (GTK_WINDOW (image_resize->shell), GTK_WIN_POS_MOUSE);
@@ -2155,6 +2158,7 @@ image_scale_cmd_callback (GtkWidget *widget,
 
   /*  the dialog  */
   image_scale->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (image_scale->shell), "image_scale", "Gimp");
   gtk_window_set_title (GTK_WINDOW (image_scale->shell), "Image Scale");
   gtk_window_set_policy (GTK_WINDOW (image_scale->shell), FALSE, FALSE, TRUE);
   gtk_window_position (GTK_WINDOW (image_scale->shell), GTK_WIN_POS_MOUSE);

app/actions/plug-in-commands.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/app_procs.c

@@ -137,6 +137,7 @@ make_initialization_status_window(void)
       GtkWidget *vbox;
 
       win_initstatus = gtk_window_new(GTK_WINDOW_DIALOG);
+      gtk_window_set_wmclass (GTK_WINDOW(win_initstatus), "gimp_startup", "Gimp");
       gtk_window_set_title(GTK_WINDOW(win_initstatus),
 			   "GIMP Startup");
 
@@ -223,8 +224,11 @@ app_init ()
   if (gimp_dir[0] != '\000')
     {
       sprintf (filename, "%s/gtkrc", gimp_dir);
+
+      if (be_verbose == TRUE)
       g_print ("parsing \"%s\"\n", filename);
       app_init_update_status("Resource configuration", filename, -1);
+
       gtk_rc_parse (filename);
     }
 
@@ -367,6 +371,7 @@ really_quit_dialog ()
   menus_set_sensitive ("<Image>/File/Quit", FALSE);
 
   dialog = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (dialog), "really_quit", "Gimp");
   gtk_window_set_title (GTK_WINDOW (dialog), "Really Quit?");
   gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
   gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 2);

app/appenv.h

@@ -30,5 +30,6 @@
 
 extern int no_interface;
 extern int no_data;
+extern int be_verbose;
 
 #endif /*  APPENV_H  */

app/base/color-balance.c

@@ -383,6 +383,7 @@ color_balance_new_dialog ()
 
   /*  The shell and main vbox  */
   cbd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (cbd->shell), "color_balance", "Gimp");
   gtk_window_set_title (GTK_WINDOW (cbd->shell), "Color Balance");
   
   /* handle the wm close signal */

app/base/curves.c

@@ -440,6 +440,7 @@ curves_new_dialog ()
 
   /*  The shell and main vbox  */
   cd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (cd->shell), "curves", "Gimp");
   gtk_window_set_title (GTK_WINDOW (cd->shell), "Curves");
 
   gtk_signal_connect (GTK_OBJECT (cd->shell), "delete_event",

app/base/hue-saturation.c

@@ -447,6 +447,7 @@ hue_saturation_new_dialog ()
 
   /*  The shell and main vbox  */
   hsd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (hsd->shell), "hue_saturation", "Gimp");
   gtk_window_set_title (GTK_WINDOW (hsd->shell), "Hue-Saturation");
   
   /* handle the wm close signal */

app/base/threshold.c

@@ -390,6 +390,7 @@ threshold_new_dialog ()
 
   /*  The shell and main vbox  */
   td->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (td->shell), "threshold", "Gimp");
   gtk_window_set_title (GTK_WINDOW (td->shell), "Threshold");
 
   /* handle the wm close signal */

app/brightness_contrast.c

@@ -329,6 +329,7 @@ brightness_contrast_new_dialog ()
 
   /*  The shell and main vbox  */
   bcd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (bcd->shell), "brightness_contrast", "Gimp");
   gtk_window_set_title (GTK_WINDOW (bcd->shell), "Brightness-Contrast");
   
   /* handle wm close signal */

app/brush_select.c

@@ -137,6 +137,7 @@ brush_select_new ()
 
   /*  The shell and main vbox  */
   bsp->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (bsp->shell), "brushselection", "Gimp");
   gtk_window_set_title (GTK_WINDOW (bsp->shell), "Brush Selection");
   gtk_window_set_policy(GTK_WINDOW(bsp->shell), TRUE, TRUE, FALSE);
   vbox = gtk_vbox_new (FALSE, 1);

app/by_color_select.c

@@ -559,6 +559,7 @@ by_color_select_new_dialog ()
 
   /*  The shell and main vbox  */
   bcd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (bcd->shell), "by_color_selection", "Gimp");
   gtk_window_set_title (GTK_WINDOW (bcd->shell), "By Color Selection");
   gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (bcd->shell)->action_area), 2);
 

app/channel_ops.c

@@ -101,6 +101,7 @@ channel_ops_offset (void *gimage_ptr)
   off_d->gimage_id = gimage->ID;
 
   off_d->dlg = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (off_d->dlg), "offset", "Gimp");
   gtk_window_set_title (GTK_WINDOW (off_d->dlg), "Offset");
 
   /* handle the wm close signal */

app/channels_dialog.c

@@ -518,7 +518,7 @@ channels_dialog_set_menu_sensitivity ()
   /* lower channel */
   gtk_widget_set_sensitive (channels_ops[2].widget, !fs_sensitive && aux_sensitive);
   /* duplicate channel */
-  gtk_widget_set_sensitive (channels_ops[3].widget, !fs_sensitive && aux_sensitive);
+  gtk_widget_set_sensitive (channels_ops[3].widget, !fs_sensitive );
   /* delete channel */
   gtk_widget_set_sensitive (channels_ops[4].widget, !fs_sensitive && aux_sensitive);
   /* channel to selection */
@@ -1722,6 +1722,7 @@ channels_dialog_new_channel_query (int gimage_id)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "new_channel_options", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "New Channel Options");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 
@@ -1895,6 +1896,7 @@ channels_dialog_edit_channel_query (ChannelWidget *channel_widget)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "edit_channel_atributes", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Edit Channel Attributes");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 

app/color_balance.c

@@ -383,6 +383,7 @@ color_balance_new_dialog ()
 
   /*  The shell and main vbox  */
   cbd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (cbd->shell), "color_balance", "Gimp");
   gtk_window_set_title (GTK_WINDOW (cbd->shell), "Color Balance");
   
   /* handle the wm close signal */

app/color_select.c

@@ -175,6 +175,7 @@ color_select_new (int                  r,
   color_select_update_pos (csp);
 
   csp->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (csp->shell), "color_selection", "Gimp");
   gtk_window_set_title (GTK_WINDOW (csp->shell), "Color Selection");
   gtk_window_set_policy (GTK_WINDOW (csp->shell), FALSE, FALSE, FALSE);
   gtk_widget_set_uposition (csp->shell, color_select_x, color_select_y);

app/commands.c

@@ -312,6 +312,7 @@ file_new_cmd_callback (GtkWidget *widget,
     vals->type = RGB;    /* no indexed images */
 
   vals->dlg = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (vals->dlg), "new_image", "Gimp");
   gtk_window_set_title (GTK_WINDOW (vals->dlg), "New Image");
   gtk_window_position (GTK_WINDOW (vals->dlg), GTK_WIN_POS_MOUSE);
 
@@ -995,6 +996,7 @@ file_pref_cmd_callback (GtkWidget *widget,
       file_prefs_strset (&old_gradient_path, edit_gradient_path);
 
       prefs_dlg = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (prefs_dlg), "preferences", "Gimp");
       gtk_window_set_title (GTK_WINDOW (prefs_dlg), "Preferences");
 
       /* handle the wm close signal */
@@ -2109,6 +2111,7 @@ image_resize_cmd_callback (GtkWidget *widget,
 
   /*  the dialog  */
   image_resize->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (image_resize->shell), "image_resize", "Gimp");
   gtk_window_set_title (GTK_WINDOW (image_resize->shell), "Image Resize");
   gtk_window_set_policy (GTK_WINDOW (image_resize->shell), FALSE, FALSE, TRUE);
   gtk_window_position (GTK_WINDOW (image_resize->shell), GTK_WIN_POS_MOUSE);
@@ -2155,6 +2158,7 @@ image_scale_cmd_callback (GtkWidget *widget,
 
   /*  the dialog  */
   image_scale->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (image_scale->shell), "image_scale", "Gimp");
   gtk_window_set_title (GTK_WINDOW (image_scale->shell), "Image Scale");
   gtk_window_set_policy (GTK_WINDOW (image_scale->shell), FALSE, FALSE, TRUE);
   gtk_window_position (GTK_WINDOW (image_scale->shell), GTK_WIN_POS_MOUSE);

app/convert.c

@@ -308,6 +308,7 @@ convert_to_indexed (void *gimage_ptr)
   dialog->monopal_flag = FALSE;
   dialog->reusepal_flag = FALSE;
   dialog->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (dialog->shell), "indexed_color_conversion", "Gimp");
   gtk_window_set_title (GTK_WINDOW (dialog->shell), "Indexed Color Conversion");
   gtk_signal_connect (GTK_OBJECT (dialog->shell), "delete_event",
 		      GTK_SIGNAL_FUNC (indexed_delete_callback),

app/core/gimp-edit.c

@@ -589,6 +589,7 @@ paste_named_buffer (GDisplay *gdisp)
   pn_dlg->gdisp = gdisp;
 
   pn_dlg->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (pn_dlg->shell), "paste_named_buffer", "Gimp");
   gtk_window_set_title (GTK_WINDOW (pn_dlg->shell), "Paste Named Buffer");
   gtk_window_position (GTK_WINDOW (pn_dlg->shell), GTK_WIN_POS_MOUSE);
 

app/core/gimpdrawable-offset.c

@@ -101,6 +101,7 @@ channel_ops_offset (void *gimage_ptr)
   off_d->gimage_id = gimage->ID;
 
   off_d->dlg = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (off_d->dlg), "offset", "Gimp");
   gtk_window_set_title (GTK_WINDOW (off_d->dlg), "Offset");
 
   /* handle the wm close signal */

app/core/gimpedit.c

@@ -589,6 +589,7 @@ paste_named_buffer (GDisplay *gdisp)
   pn_dlg->gdisp = gdisp;
 
   pn_dlg->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (pn_dlg->shell), "paste_named_buffer", "Gimp");
   gtk_window_set_title (GTK_WINDOW (pn_dlg->shell), "Paste Named Buffer");
   gtk_window_position (GTK_WINDOW (pn_dlg->shell), GTK_WIN_POS_MOUSE);
 

app/core/gimpimage-convert.c

@@ -308,6 +308,7 @@ convert_to_indexed (void *gimage_ptr)
   dialog->monopal_flag = FALSE;
   dialog->reusepal_flag = FALSE;
   dialog->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (dialog->shell), "indexed_color_conversion", "Gimp");
   gtk_window_set_title (GTK_WINDOW (dialog->shell), "Indexed Color Conversion");
   gtk_signal_connect (GTK_OBJECT (dialog->shell), "delete_event",
 		      GTK_SIGNAL_FUNC (indexed_delete_callback),

app/core/gimpimage-duplicate.c

@@ -101,6 +101,7 @@ channel_ops_offset (void *gimage_ptr)
   off_d->gimage_id = gimage->ID;
 
   off_d->dlg = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (off_d->dlg), "offset", "Gimp");
   gtk_window_set_title (GTK_WINDOW (off_d->dlg), "Offset");
 
   /* handle the wm close signal */

app/curves.c

@@ -440,6 +440,7 @@ curves_new_dialog ()
 
   /*  The shell and main vbox  */
   cd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (cd->shell), "curves", "Gimp");
   gtk_window_set_title (GTK_WINDOW (cd->shell), "Curves");
 
   gtk_signal_connect (GTK_OBJECT (cd->shell), "delete_event",

app/dialogs/about-dialog.c

@@ -57,6 +57,7 @@ static char *scroll_text[] =
   "Simon Janes",
   "Tim Janik",
   "Tuomas Kuosmanen",
+  "Peter Kirchgessner", 
   "Karl LaRocca",
   "Jens Lautenbacher",
   "Raph Levien",
@@ -111,6 +112,7 @@ about_dialog_create (int timeout)
   if (!about_dialog)
     {
       about_dialog = gtk_window_new (GTK_WINDOW_DIALOG);
+      gtk_window_set_wmclass (GTK_WINDOW (about_dialog), "about_dialog", "Gimp");
       gtk_window_set_title (GTK_WINDOW (about_dialog), "About the GIMP");
       gtk_window_set_policy (GTK_WINDOW (about_dialog), FALSE, FALSE, FALSE);
       gtk_window_position (GTK_WINDOW (about_dialog), GTK_WIN_POS_CENTER);

app/dialogs/info-dialog.c

@@ -83,6 +83,7 @@ info_dialog_new (char *title)
   idialog->field_list = NULL;
 
   shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (shell), "info_dialog", "Gimp");
   gtk_window_set_title (GTK_WINDOW (shell), title);
   gtk_widget_set_uposition (shell, info_x, info_y);
 

app/dialogs/tips-dialog.c

@@ -52,6 +52,7 @@ tips_dialog_create ()
   if (!tips_dialog)
     {
       tips_dialog = gtk_window_new (GTK_WINDOW_DIALOG);
+      gtk_window_set_wmclass (GTK_WINDOW (tips_dialog), "tip_of_the_day", "Gimp");
       gtk_window_set_title (GTK_WINDOW (tips_dialog), "GIMP Tip of the day");
       gtk_window_position (GTK_WINDOW (tips_dialog), GTK_WIN_POS_CENTER);
       gtk_signal_connect (GTK_OBJECT (tips_dialog), "delete_event",

app/dialogs/user-install-dialog.c

@@ -97,6 +97,7 @@ install_help (InstallCallback callback)
   GdkFont   *font;
 
   help_widget = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (help_widget), "gimp_installation", "Gimp");
   gtk_window_set_title (GTK_WINDOW (help_widget), "GIMP Installation");
   gtk_window_position (GTK_WINDOW (help_widget), GTK_WIN_POS_CENTER);
 
@@ -339,6 +340,7 @@ install_run (InstallCallback callback)
   int executable = TRUE;
 
   install_widget = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (install_widget), "installation_log", "Gimp");
   gtk_window_set_title (GTK_WINDOW (install_widget), "Installation Log");
   gtk_window_position (GTK_WINDOW (install_widget), GTK_WIN_POS_CENTER);
   vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));

app/display/gimpdisplay-ops.c

@@ -326,6 +326,8 @@ gdisplay_close_warning_dialog (char     *image_name,
   menus_set_sensitive ("<Image>/File/Close", FALSE);
 
   warning_dialog = mbox = gtk_dialog_new ();
+  /* should this be imaeg_window or the actual image naem??? */
+  gtk_window_set_wmclass (GTK_WINDOW (mbox), "image_window", "Gimp");
   gtk_window_set_title (GTK_WINDOW (mbox), image_name);
   gtk_window_position (GTK_WINDOW (mbox), GTK_WIN_POS_MOUSE);
   gtk_object_set_user_data (GTK_OBJECT (mbox), gdisp);

app/display/gimpdisplayshell-draw.c

@@ -502,6 +502,7 @@ create_toolbox ()
   GtkAcceleratorTable *table;
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_wmclass (GTK_WINDOW (window), "toolbox", "Gimp");
   gtk_window_set_title (GTK_WINDOW (window), "The GIMP");
   gtk_widget_set_uposition (window, toolbox_x, toolbox_y);
   gtk_signal_connect (GTK_OBJECT (window), "delete_event",
@@ -611,6 +612,7 @@ create_display_shell (int   gdisp_id,
   /*  The toplevel shell */
   gdisp->shell = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (gdisp->shell), title);
+  gtk_window_set_wmclass (GTK_WINDOW (gdisp->shell), "image_window", "Gimp");
   gtk_window_set_policy (GTK_WINDOW (gdisp->shell), TRUE, TRUE, TRUE);
   gtk_object_set_user_data (GTK_OBJECT (gdisp->shell), (gpointer) gdisp);
   gtk_widget_set_events (gdisp->shell, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
@@ -744,6 +746,7 @@ query_string_box (char        *title,
 
   qbox = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (qbox), title);
+  gtk_window_set_wmclass (GTK_WINDOW (qbox), "query_box", "Gimp");
   gtk_window_position (GTK_WINDOW (qbox), GTK_WIN_POS_MOUSE);
   gtk_signal_connect (GTK_OBJECT (qbox), "delete_event",
 		      (GtkSignalFunc) query_box_delete_callback,
@@ -876,6 +879,7 @@ message_box (char        *message,
   msg_box = (MessageBox *) g_malloc (sizeof (MessageBox));
 
   mbox = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (mbox), "gimp_message", "Gimp");
   gtk_window_set_title (GTK_WINDOW (mbox), "GIMP Message");
   gtk_window_position (GTK_WINDOW (mbox), GTK_WIN_POS_MOUSE);
   gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (mbox)->action_area), 2);

app/display/gimpdisplayshell-layer-select.c

@@ -95,6 +95,7 @@ layer_select_init (GImage  *gimage,
 
       /*  The shell and main vbox  */
       layer_select->shell = gtk_window_new (GTK_WINDOW_POPUP);
+      gtk_window_set_wmclass (GTK_WINDOW (layer_select->shell), "layer_select", "Gimp");
       gtk_window_set_title (GTK_WINDOW (layer_select->shell), "Layer Select");
       gtk_window_position (GTK_WINDOW (layer_select->shell), GTK_WIN_POS_MOUSE);
       gtk_signal_connect (GTK_OBJECT (layer_select->shell), "event",

app/display/gimpdisplayshell.c

@@ -502,6 +502,7 @@ create_toolbox ()
   GtkAcceleratorTable *table;
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_wmclass (GTK_WINDOW (window), "toolbox", "Gimp");
   gtk_window_set_title (GTK_WINDOW (window), "The GIMP");
   gtk_widget_set_uposition (window, toolbox_x, toolbox_y);
   gtk_signal_connect (GTK_OBJECT (window), "delete_event",
@@ -611,6 +612,7 @@ create_display_shell (int   gdisp_id,
   /*  The toplevel shell */
   gdisp->shell = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (gdisp->shell), title);
+  gtk_window_set_wmclass (GTK_WINDOW (gdisp->shell), "image_window", "Gimp");
   gtk_window_set_policy (GTK_WINDOW (gdisp->shell), TRUE, TRUE, TRUE);
   gtk_object_set_user_data (GTK_OBJECT (gdisp->shell), (gpointer) gdisp);
   gtk_widget_set_events (gdisp->shell, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
@@ -744,6 +746,7 @@ query_string_box (char        *title,
 
   qbox = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (qbox), title);
+  gtk_window_set_wmclass (GTK_WINDOW (qbox), "query_box", "Gimp");
   gtk_window_position (GTK_WINDOW (qbox), GTK_WIN_POS_MOUSE);
   gtk_signal_connect (GTK_OBJECT (qbox), "delete_event",
 		      (GtkSignalFunc) query_box_delete_callback,
@@ -876,6 +879,7 @@ message_box (char        *message,
   msg_box = (MessageBox *) g_malloc (sizeof (MessageBox));
 
   mbox = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (mbox), "gimp_message", "Gimp");
   gtk_window_set_title (GTK_WINDOW (mbox), "GIMP Message");
   gtk_window_position (GTK_WINDOW (mbox), GTK_WIN_POS_MOUSE);
   gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (mbox)->action_area), 2);

app/fileops.c

@@ -477,6 +477,7 @@ file_open_callback (GtkWidget *w,
     {
       fileload = gtk_file_selection_new ("Load Image");
       gtk_window_position (GTK_WINDOW (fileload), GTK_WIN_POS_MOUSE);
+      gtk_window_set_wmclass (GTK_WINDOW (fileload), "load_image", "Gimp");
       gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (fileload)->cancel_button), "clicked",
 			  (GtkSignalFunc) file_cancel_callback, fileload);
       gtk_signal_connect (GTK_OBJECT (fileload), "delete_event",
@@ -561,6 +562,7 @@ file_save_as_callback (GtkWidget *w,
   if (!filesave)
     {
       filesave = gtk_file_selection_new ("Save Image");
+      gtk_window_set_wmclass (GTK_WINDOW (filesave), "save_image", "Gimp");
       gtk_window_position (GTK_WINDOW (filesave), GTK_WIN_POS_MOUSE);
       gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesave)->cancel_button), "clicked",
 			  (GtkSignalFunc) file_cancel_callback, filesave);
@@ -961,6 +963,7 @@ file_overwrite (char *filename, char* raw_filename)
   overwrite_box->full_filename = filename;
   overwrite_box->raw_filename = raw_filename;
   overwrite_box->obox = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (overwrite_box->obox), "fiel_exists", "Gimp");
   gtk_window_set_title (GTK_WINDOW (overwrite_box->obox), "File Exists!");
   gtk_window_position (GTK_WINDOW (overwrite_box->obox), GTK_WIN_POS_MOUSE);
 

app/gdisplay_ops.c

@@ -326,6 +326,8 @@ gdisplay_close_warning_dialog (char     *image_name,
   menus_set_sensitive ("<Image>/File/Close", FALSE);
 
   warning_dialog = mbox = gtk_dialog_new ();
+  /* should this be imaeg_window or the actual image naem??? */
+  gtk_window_set_wmclass (GTK_WINDOW (mbox), "image_window", "Gimp");
   gtk_window_set_title (GTK_WINDOW (mbox), image_name);
   gtk_window_position (GTK_WINDOW (mbox), GTK_WIN_POS_MOUSE);
   gtk_object_set_user_data (GTK_OBJECT (mbox), gdisp);

app/gimage.c

@@ -1999,6 +1999,7 @@ gimage_merge_layers (GImage *gimage, link_ptr merge_list, MergeType merge_type)
        */
       layer -> mode =NORMAL;
       bottom = layer;
+
     }
 
   while (reverse_list)

app/gimpdrawable-offset.c

@@ -101,6 +101,7 @@ channel_ops_offset (void *gimage_ptr)
   off_d->gimage_id = gimage->ID;
 
   off_d->dlg = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (off_d->dlg), "offset", "Gimp");
   gtk_window_set_title (GTK_WINDOW (off_d->dlg), "Offset");
 
   /* handle the wm close signal */

app/gimpimage-convert.c

@@ -308,6 +308,7 @@ convert_to_indexed (void *gimage_ptr)
   dialog->monopal_flag = FALSE;
   dialog->reusepal_flag = FALSE;
   dialog->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (dialog->shell), "indexed_color_conversion", "Gimp");
   gtk_window_set_title (GTK_WINDOW (dialog->shell), "Indexed Color Conversion");
   gtk_signal_connect (GTK_OBJECT (dialog->shell), "delete_event",
 		      GTK_SIGNAL_FUNC (indexed_delete_callback),

app/gimpimage-duplicate.c

@@ -101,6 +101,7 @@ channel_ops_offset (void *gimage_ptr)
   off_d->gimage_id = gimage->ID;
 
   off_d->dlg = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (off_d->dlg), "offset", "Gimp");
   gtk_window_set_title (GTK_WINDOW (off_d->dlg), "Offset");
 
   /* handle the wm close signal */

app/gimprc.c

@@ -322,7 +322,8 @@ parse_gimprc_file (char *filename)
   if (!parse_info.fp)
     return;
 
-  g_print ("parsing \"%s\"\n", filename);
+  if (be_verbose == TRUE)
+    g_print ("parsing \"%s\"\n", filename);
 
   cur_token = -1;
   next_token = -1;

app/global_edit.c

@@ -589,6 +589,7 @@ paste_named_buffer (GDisplay *gdisp)
   pn_dlg->gdisp = gdisp;
 
   pn_dlg->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (pn_dlg->shell), "paste_named_buffer", "Gimp");
   gtk_window_set_title (GTK_WINDOW (pn_dlg->shell), "Paste Named Buffer");
   gtk_window_position (GTK_WINDOW (pn_dlg->shell), GTK_WIN_POS_MOUSE);
 

app/gradient.c

@@ -763,6 +763,7 @@ grad_create_gradient_editor(void)
 	/* Shell and main vbox */
 
 	g_editor->shell = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_wmclass (GTK_WINDOW(g_editor->shell), "gradiet_editor", "Gimp");
 	gtk_container_border_width(GTK_CONTAINER(g_editor->shell), 0);
 	gtk_window_set_title(GTK_WINDOW(g_editor->shell), "Gradient Editor");
 	gtk_window_position(GTK_WINDOW(g_editor->shell), GTK_WIN_POS_CENTER);

app/gradient_editor.c

@@ -763,6 +763,7 @@ grad_create_gradient_editor(void)
 	/* Shell and main vbox */
 
 	g_editor->shell = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_wmclass (GTK_WINDOW(g_editor->shell), "gradiet_editor", "Gimp");
 	gtk_container_border_width(GTK_CONTAINER(g_editor->shell), 0);
 	gtk_window_set_title(GTK_WINDOW(g_editor->shell), "Gradient Editor");
 	gtk_window_position(GTK_WINDOW(g_editor->shell), GTK_WIN_POS_CENTER);

app/gui/about-dialog.c

@@ -57,6 +57,7 @@ static char *scroll_text[] =
   "Simon Janes",
   "Tim Janik",
   "Tuomas Kuosmanen",
+  "Peter Kirchgessner", 
   "Karl LaRocca",
   "Jens Lautenbacher",
   "Raph Levien",
@@ -111,6 +112,7 @@ about_dialog_create (int timeout)
   if (!about_dialog)
     {
       about_dialog = gtk_window_new (GTK_WINDOW_DIALOG);
+      gtk_window_set_wmclass (GTK_WINDOW (about_dialog), "about_dialog", "Gimp");
       gtk_window_set_title (GTK_WINDOW (about_dialog), "About the GIMP");
       gtk_window_set_policy (GTK_WINDOW (about_dialog), FALSE, FALSE, FALSE);
       gtk_window_position (GTK_WINDOW (about_dialog), GTK_WIN_POS_CENTER);

app/gui/brush-select.c

@@ -137,6 +137,7 @@ brush_select_new ()
 
   /*  The shell and main vbox  */
   bsp->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (bsp->shell), "brushselection", "Gimp");
   gtk_window_set_title (GTK_WINDOW (bsp->shell), "Brush Selection");
   gtk_window_set_policy(GTK_WINDOW(bsp->shell), TRUE, TRUE, FALSE);
   vbox = gtk_vbox_new (FALSE, 1);

app/gui/channels-dialog.c

@@ -518,7 +518,7 @@ channels_dialog_set_menu_sensitivity ()
   /* lower channel */
   gtk_widget_set_sensitive (channels_ops[2].widget, !fs_sensitive && aux_sensitive);
   /* duplicate channel */
-  gtk_widget_set_sensitive (channels_ops[3].widget, !fs_sensitive && aux_sensitive);
+  gtk_widget_set_sensitive (channels_ops[3].widget, !fs_sensitive );
   /* delete channel */
   gtk_widget_set_sensitive (channels_ops[4].widget, !fs_sensitive && aux_sensitive);
   /* channel to selection */
@@ -1722,6 +1722,7 @@ channels_dialog_new_channel_query (int gimage_id)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "new_channel_options", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "New Channel Options");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 
@@ -1895,6 +1896,7 @@ channels_dialog_edit_channel_query (ChannelWidget *channel_widget)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "edit_channel_atributes", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Edit Channel Attributes");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 

app/gui/color-select.c

@@ -175,6 +175,7 @@ color_select_new (int                  r,
   color_select_update_pos (csp);
 
   csp->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (csp->shell), "color_selection", "Gimp");
   gtk_window_set_title (GTK_WINDOW (csp->shell), "Color Selection");
   gtk_window_set_policy (GTK_WINDOW (csp->shell), FALSE, FALSE, FALSE);
   gtk_widget_set_uposition (csp->shell, color_select_x, color_select_y);

app/gui/commands.c

@@ -312,6 +312,7 @@ file_new_cmd_callback (GtkWidget *widget,
     vals->type = RGB;    /* no indexed images */
 
   vals->dlg = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (vals->dlg), "new_image", "Gimp");
   gtk_window_set_title (GTK_WINDOW (vals->dlg), "New Image");
   gtk_window_position (GTK_WINDOW (vals->dlg), GTK_WIN_POS_MOUSE);
 
@@ -995,6 +996,7 @@ file_pref_cmd_callback (GtkWidget *widget,
       file_prefs_strset (&old_gradient_path, edit_gradient_path);
 
       prefs_dlg = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (prefs_dlg), "preferences", "Gimp");
       gtk_window_set_title (GTK_WINDOW (prefs_dlg), "Preferences");
 
       /* handle the wm close signal */
@@ -2109,6 +2111,7 @@ image_resize_cmd_callback (GtkWidget *widget,
 
   /*  the dialog  */
   image_resize->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (image_resize->shell), "image_resize", "Gimp");
   gtk_window_set_title (GTK_WINDOW (image_resize->shell), "Image Resize");
   gtk_window_set_policy (GTK_WINDOW (image_resize->shell), FALSE, FALSE, TRUE);
   gtk_window_position (GTK_WINDOW (image_resize->shell), GTK_WIN_POS_MOUSE);
@@ -2155,6 +2158,7 @@ image_scale_cmd_callback (GtkWidget *widget,
 
   /*  the dialog  */
   image_scale->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (image_scale->shell), "image_scale", "Gimp");
   gtk_window_set_title (GTK_WINDOW (image_scale->shell), "Image Scale");
   gtk_window_set_policy (GTK_WINDOW (image_scale->shell), FALSE, FALSE, TRUE);
   gtk_window_position (GTK_WINDOW (image_scale->shell), GTK_WIN_POS_MOUSE);

app/gui/gradient-editor.c

@@ -763,6 +763,7 @@ grad_create_gradient_editor(void)
 	/* Shell and main vbox */
 
 	g_editor->shell = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_wmclass (GTK_WINDOW(g_editor->shell), "gradiet_editor", "Gimp");
 	gtk_container_border_width(GTK_CONTAINER(g_editor->shell), 0);
 	gtk_window_set_title(GTK_WINDOW(g_editor->shell), "Gradient Editor");
 	gtk_window_position(GTK_WINDOW(g_editor->shell), GTK_WIN_POS_CENTER);

app/gui/help-commands.c

@@ -312,6 +312,7 @@ file_new_cmd_callback (GtkWidget *widget,
     vals->type = RGB;    /* no indexed images */
 
   vals->dlg = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (vals->dlg), "new_image", "Gimp");
   gtk_window_set_title (GTK_WINDOW (vals->dlg), "New Image");
   gtk_window_position (GTK_WINDOW (vals->dlg), GTK_WIN_POS_MOUSE);
 
@@ -995,6 +996,7 @@ file_pref_cmd_callback (GtkWidget *widget,
       file_prefs_strset (&old_gradient_path, edit_gradient_path);
 
       prefs_dlg = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (prefs_dlg), "preferences", "Gimp");
       gtk_window_set_title (GTK_WINDOW (prefs_dlg), "Preferences");
 
       /* handle the wm close signal */
@@ -2109,6 +2111,7 @@ image_resize_cmd_callback (GtkWidget *widget,
 
   /*  the dialog  */
   image_resize->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (image_resize->shell), "image_resize", "Gimp");
   gtk_window_set_title (GTK_WINDOW (image_resize->shell), "Image Resize");
   gtk_window_set_policy (GTK_WINDOW (image_resize->shell), FALSE, FALSE, TRUE);
   gtk_window_position (GTK_WINDOW (image_resize->shell), GTK_WIN_POS_MOUSE);
@@ -2155,6 +2158,7 @@ image_scale_cmd_callback (GtkWidget *widget,
 
   /*  the dialog  */
   image_scale->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (image_scale->shell), "image_scale", "Gimp");
   gtk_window_set_title (GTK_WINDOW (image_scale->shell), "Image Scale");
   gtk_window_set_policy (GTK_WINDOW (image_scale->shell), FALSE, FALSE, TRUE);
   gtk_window_position (GTK_WINDOW (image_scale->shell), GTK_WIN_POS_MOUSE);

app/gui/info-dialog.c

@@ -83,6 +83,7 @@ info_dialog_new (char *title)
   idialog->field_list = NULL;
 
   shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (shell), "info_dialog", "Gimp");
   gtk_window_set_title (GTK_WINDOW (shell), title);
   gtk_widget_set_uposition (shell, info_x, info_y);
 

app/gui/layer-select.c

@@ -95,6 +95,7 @@ layer_select_init (GImage  *gimage,
 
       /*  The shell and main vbox  */
       layer_select->shell = gtk_window_new (GTK_WINDOW_POPUP);
+      gtk_window_set_wmclass (GTK_WINDOW (layer_select->shell), "layer_select", "Gimp");
       gtk_window_set_title (GTK_WINDOW (layer_select->shell), "Layer Select");
       gtk_window_position (GTK_WINDOW (layer_select->shell), GTK_WIN_POS_MOUSE);
       gtk_signal_connect (GTK_OBJECT (layer_select->shell), "event",

app/gui/layers-dialog.c

@@ -274,6 +274,7 @@ lc_dialog_create (int gimage_id)
       lc_shell = gtk_dialog_new ();
       
       gtk_window_set_title (GTK_WINDOW (lc_shell), "Layers & Channels");
+      gtk_window_set_wmclass (GTK_WINDOW (lc_shell), "layers_and_channels", "Gimp");
       gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (lc_shell)->vbox), 2);
       gtk_signal_connect (GTK_OBJECT (lc_shell), "delete_event", 
 			  GTK_SIGNAL_FUNC (lc_dialog_close_callback),
@@ -2979,6 +2980,7 @@ layers_dialog_new_layer_query (int gimage_id)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "new_layer_options", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "New Layer Options");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 
@@ -3157,6 +3159,7 @@ layers_dialog_edit_layer_query (LayerWidget *layer_widget)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "edit_layer_attrributes", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Edit Layer Attributes");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 
@@ -3314,6 +3317,7 @@ layers_dialog_add_mask_query (Layer *layer)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "add_mask_options", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Add Mask Options");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 
@@ -3441,6 +3445,7 @@ layers_dialog_apply_mask_query (Layer *layer)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "layer_mask_options", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Layer Mask Options");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 
@@ -3564,6 +3569,7 @@ layers_dialog_scale_layer_query (Layer *layer)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "scale_layer", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Scale Layer");
   gtk_window_set_policy (GTK_WINDOW (options->query_box), FALSE, FALSE, TRUE);
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
@@ -3684,6 +3690,7 @@ layers_dialog_resize_layer_query (Layer *layer)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "resize_layer", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Resize Layer");
   gtk_window_set_policy (GTK_WINDOW (options->query_box), FALSE, TRUE, TRUE);
   gtk_window_set_policy (GTK_WINDOW (options->query_box), FALSE, FALSE, TRUE);
@@ -3831,6 +3838,7 @@ layers_dialog_layer_merge_query (GImage *gimage,
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "layer_merge_options", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Layer Merge Options");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 

app/gui/palette-editor.c

@@ -166,6 +166,7 @@ palette_create ()
 
       /*  The shell and main vbox  */
       palette->shell = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (palette->shell), "color_palette", "Gimp");
       gtk_window_set_policy (GTK_WINDOW (palette->shell), FALSE, FALSE, FALSE);
       gtk_window_set_title (GTK_WINDOW (palette->shell), "Color Palette");
       vbox = gtk_vbox_new (FALSE, 1);

app/gui/pattern-select.c

@@ -91,6 +91,7 @@ pattern_select_new ()
 
   /*  The shell and main vbox  */
   psp->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (psp->shell), "patternselection", "Gimp");
   gtk_window_set_title (GTK_WINDOW (psp->shell), "Pattern Selection");
   vbox = gtk_vbox_new (FALSE, 1);
   gtk_container_border_width (GTK_CONTAINER (vbox), 1);

app/gui/plug-in-commands.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/gui/plug-in-menus.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/gui/tips-dialog.c

@@ -52,6 +52,7 @@ tips_dialog_create ()
   if (!tips_dialog)
     {
       tips_dialog = gtk_window_new (GTK_WINDOW_DIALOG);
+      gtk_window_set_wmclass (GTK_WINDOW (tips_dialog), "tip_of_the_day", "Gimp");
       gtk_window_set_title (GTK_WINDOW (tips_dialog), "GIMP Tip of the day");
       gtk_window_position (GTK_WINDOW (tips_dialog), GTK_WIN_POS_CENTER);
       gtk_signal_connect (GTK_OBJECT (tips_dialog), "delete_event",

app/gui/user-install-dialog.c

@@ -97,6 +97,7 @@ install_help (InstallCallback callback)
   GdkFont   *font;
 
   help_widget = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (help_widget), "gimp_installation", "Gimp");
   gtk_window_set_title (GTK_WINDOW (help_widget), "GIMP Installation");
   gtk_window_position (GTK_WINDOW (help_widget), GTK_WIN_POS_CENTER);
 
@@ -339,6 +340,7 @@ install_run (InstallCallback callback)
   int executable = TRUE;
 
   install_widget = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (install_widget), "installation_log", "Gimp");
   gtk_window_set_title (GTK_WINDOW (install_widget), "Installation Log");
   gtk_window_position (GTK_WINDOW (install_widget), GTK_WIN_POS_CENTER);
   vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));

app/histogram_tool.c

@@ -453,6 +453,7 @@ histogram_tool_new_dialog ()
 
   /*  The shell and main vbox  */
   htd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (htd->shell), "histogram", "Gimp");
   gtk_window_set_title (GTK_WINDOW (htd->shell), "Histogram");
 
   /* handle the wm close signal */

app/hue_saturation.c

@@ -447,6 +447,7 @@ hue_saturation_new_dialog ()
 
   /*  The shell and main vbox  */
   hsd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (hsd->shell), "hue_saturation", "Gimp");
   gtk_window_set_title (GTK_WINDOW (hsd->shell), "Hue-Saturation");
   
   /* handle the wm close signal */

app/indexed_palette.c

@@ -129,6 +129,7 @@ indexed_palette_create (int gimage_id)
 
       /*  The shell and main vbox  */
       indexedP->shell = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (indexedP->shell), "indexed_color_palette", "Gimp");
       gtk_window_set_title (GTK_WINDOW (indexedP->shell), "Indexed Color Palette");
       gtk_window_add_accelerator_table (GTK_WINDOW (indexedP->shell), table);
 

app/info_dialog.c

@@ -83,6 +83,7 @@ info_dialog_new (char *title)
   idialog->field_list = NULL;
 
   shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (shell), "info_dialog", "Gimp");
   gtk_window_set_title (GTK_WINDOW (shell), title);
   gtk_widget_set_uposition (shell, info_x, info_y);
 

app/install.c

@@ -97,6 +97,7 @@ install_help (InstallCallback callback)
   GdkFont   *font;
 
   help_widget = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (help_widget), "gimp_installation", "Gimp");
   gtk_window_set_title (GTK_WINDOW (help_widget), "GIMP Installation");
   gtk_window_position (GTK_WINDOW (help_widget), GTK_WIN_POS_CENTER);
 
@@ -339,6 +340,7 @@ install_run (InstallCallback callback)
   int executable = TRUE;
 
   install_widget = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (install_widget), "installation_log", "Gimp");
   gtk_window_set_title (GTK_WINDOW (install_widget), "Installation Log");
   gtk_window_position (GTK_WINDOW (install_widget), GTK_WIN_POS_CENTER);
   vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));

app/interface.c

@@ -502,6 +502,7 @@ create_toolbox ()
   GtkAcceleratorTable *table;
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_wmclass (GTK_WINDOW (window), "toolbox", "Gimp");
   gtk_window_set_title (GTK_WINDOW (window), "The GIMP");
   gtk_widget_set_uposition (window, toolbox_x, toolbox_y);
   gtk_signal_connect (GTK_OBJECT (window), "delete_event",
@@ -611,6 +612,7 @@ create_display_shell (int   gdisp_id,
   /*  The toplevel shell */
   gdisp->shell = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (gdisp->shell), title);
+  gtk_window_set_wmclass (GTK_WINDOW (gdisp->shell), "image_window", "Gimp");
   gtk_window_set_policy (GTK_WINDOW (gdisp->shell), TRUE, TRUE, TRUE);
   gtk_object_set_user_data (GTK_OBJECT (gdisp->shell), (gpointer) gdisp);
   gtk_widget_set_events (gdisp->shell, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
@@ -744,6 +746,7 @@ query_string_box (char        *title,
 
   qbox = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (qbox), title);
+  gtk_window_set_wmclass (GTK_WINDOW (qbox), "query_box", "Gimp");
   gtk_window_position (GTK_WINDOW (qbox), GTK_WIN_POS_MOUSE);
   gtk_signal_connect (GTK_OBJECT (qbox), "delete_event",
 		      (GtkSignalFunc) query_box_delete_callback,
@@ -876,6 +879,7 @@ message_box (char        *message,
   msg_box = (MessageBox *) g_malloc (sizeof (MessageBox));
 
   mbox = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (mbox), "gimp_message", "Gimp");
   gtk_window_set_title (GTK_WINDOW (mbox), "GIMP Message");
   gtk_window_position (GTK_WINDOW (mbox), GTK_WIN_POS_MOUSE);
   gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (mbox)->action_area), 2);

app/layer_select.c

@@ -95,6 +95,7 @@ layer_select_init (GImage  *gimage,
 
       /*  The shell and main vbox  */
       layer_select->shell = gtk_window_new (GTK_WINDOW_POPUP);
+      gtk_window_set_wmclass (GTK_WINDOW (layer_select->shell), "layer_select", "Gimp");
       gtk_window_set_title (GTK_WINDOW (layer_select->shell), "Layer Select");
       gtk_window_position (GTK_WINDOW (layer_select->shell), GTK_WIN_POS_MOUSE);
       gtk_signal_connect (GTK_OBJECT (layer_select->shell), "event",

app/layers_dialog.c

@@ -274,6 +274,7 @@ lc_dialog_create (int gimage_id)
       lc_shell = gtk_dialog_new ();
       
       gtk_window_set_title (GTK_WINDOW (lc_shell), "Layers & Channels");
+      gtk_window_set_wmclass (GTK_WINDOW (lc_shell), "layers_and_channels", "Gimp");
       gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (lc_shell)->vbox), 2);
       gtk_signal_connect (GTK_OBJECT (lc_shell), "delete_event", 
 			  GTK_SIGNAL_FUNC (lc_dialog_close_callback),
@@ -2979,6 +2980,7 @@ layers_dialog_new_layer_query (int gimage_id)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "new_layer_options", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "New Layer Options");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 
@@ -3157,6 +3159,7 @@ layers_dialog_edit_layer_query (LayerWidget *layer_widget)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "edit_layer_attrributes", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Edit Layer Attributes");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 
@@ -3314,6 +3317,7 @@ layers_dialog_add_mask_query (Layer *layer)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "add_mask_options", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Add Mask Options");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 
@@ -3441,6 +3445,7 @@ layers_dialog_apply_mask_query (Layer *layer)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "layer_mask_options", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Layer Mask Options");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 
@@ -3564,6 +3569,7 @@ layers_dialog_scale_layer_query (Layer *layer)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "scale_layer", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Scale Layer");
   gtk_window_set_policy (GTK_WINDOW (options->query_box), FALSE, FALSE, TRUE);
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
@@ -3684,6 +3690,7 @@ layers_dialog_resize_layer_query (Layer *layer)
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "resize_layer", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Resize Layer");
   gtk_window_set_policy (GTK_WINDOW (options->query_box), FALSE, TRUE, TRUE);
   gtk_window_set_policy (GTK_WINDOW (options->query_box), FALSE, FALSE, TRUE);
@@ -3831,6 +3838,7 @@ layers_dialog_layer_merge_query (GImage *gimage,
 
   /*  the dialog  */
   options->query_box = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "layer_merge_options", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options->query_box), "Layer Merge Options");
   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
 

app/levels.c

@@ -518,6 +518,7 @@ levels_new_dialog ()
 
   /*  The shell and main vbox  */
   ld->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (ld->shell), "levels", "Gimp");
   gtk_window_set_title (GTK_WINDOW (ld->shell), "Levels");
 
   /* handle the wm close signal */

app/main.c

@@ -41,6 +41,7 @@ static void       init (void);
 /* GLOBAL data */
 int no_interface;
 int no_data;
+int be_verbose;
 int use_shm;
 char *prog_name;		/* The path name we are invoked with */
 char **batch_cmds;
@@ -135,6 +136,10 @@ main (int argc, char **argv)
 	{
 	  no_data = TRUE;
 	}
+      else if (strcmp (argv[i], "--verbose") == 0)
+	{
+	  be_verbose = TRUE;
+	}
       else if (strcmp (argv[i], "--no-shm") == 0)
 	{
 	  use_shm = FALSE;
@@ -160,6 +165,7 @@ main (int argc, char **argv)
       g_print ("  -b --batch <commands>  Run in batch mode.\n");
       g_print ("  -n --no-interface      Run without a user interface.\n");
       g_print ("  --no-data              Do not load patterns, gradients, palettes, brushes.\n");
+      g_print ("  --verbose              Show startup messages.\n");
       g_print ("  --no-shm               Do not use shared memory between GIMP and its plugins.\n");
       g_print ("  --no-xshm              Do not use the X Shared Memory extension.\n");
       g_print ("  --display <display>    Use the designated X display.\n\n");

app/menus/plug-in-menus.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/palette.c

@@ -166,6 +166,7 @@ palette_create ()
 
       /*  The shell and main vbox  */
       palette->shell = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (palette->shell), "color_palette", "Gimp");
       gtk_window_set_policy (GTK_WINDOW (palette->shell), FALSE, FALSE, FALSE);
       gtk_window_set_title (GTK_WINDOW (palette->shell), "Color Palette");
       vbox = gtk_vbox_new (FALSE, 1);

app/pattern_select.c

@@ -91,6 +91,7 @@ pattern_select_new ()
 
   /*  The shell and main vbox  */
   psp->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (psp->shell), "patternselection", "Gimp");
   gtk_window_set_title (GTK_WINDOW (psp->shell), "Pattern Selection");
   vbox = gtk_vbox_new (FALSE, 1);
   gtk_container_border_width (GTK_CONTAINER (vbox), 1);

app/plug-in/gimpplugin-message.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/gimpplugin-progress.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/gimpplugin.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/gimppluginmanager-call.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/gimppluginmanager-run.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/gimppluginmanager.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/gimppluginshm.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/plug-in-def.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/plug-in-message.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/plug-in-params.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/plug-in-progress.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/plug-in-run.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/plug-in-shm.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/plug-in.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug-in/plug-ins.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/plug_in.c

@@ -304,6 +304,7 @@ plug_in_init ()
   g_print ("Starting extensions: ");
   app_init_update_status("Extensions", "", 0);
   nplugins = g_slist_length(tmp); nth = 0;
+
   while (tmp)
     {
       proc_def = tmp->data;
@@ -313,9 +314,11 @@ plug_in_init ()
 	  (proc_def->db_info.num_args == 0) &&
 	  (proc_def->db_info.proc_type == PDB_EXTENSION))
 	{
+
 	  g_print ("%s ", proc_def->db_info.name);
 	  app_init_update_status(NULL, proc_def->db_info.name,
 				 nth/nplugins);
+
 	  plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
 	}
     }
@@ -2861,6 +2864,7 @@ plug_in_progress_init (PlugIn *plug_in,
   if (!plug_in->progress)
     {
       plug_in->progress = gtk_dialog_new ();
+      gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp");
       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
       gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",

app/posterize.c

@@ -285,6 +285,7 @@ posterize_new_dialog ()
 
   /*  The shell and main vbox  */
   pd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (pd->shell), "posterize", "Gimp");
   gtk_window_set_title (GTK_WINDOW (pd->shell), "Posterize");
 
   gtk_signal_connect (GTK_OBJECT (pd->shell), "delete_event",

app/text_tool.c

@@ -387,6 +387,7 @@ text_create_dialog (TextTool *text_tool)
 
   /* Create the shell and vertical & horizontal boxes */
   text_tool->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (text_tool->shell), "text_tool", "Gimp");
   gtk_window_set_title (GTK_WINDOW (text_tool->shell), "Text Tool");
   gtk_window_set_policy (GTK_WINDOW (text_tool->shell), FALSE, TRUE, TRUE);
   gtk_window_position (GTK_WINDOW (text_tool->shell), GTK_WIN_POS_MOUSE);

app/threshold.c

@@ -390,6 +390,7 @@ threshold_new_dialog ()
 
   /*  The shell and main vbox  */
   td->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (td->shell), "threshold", "Gimp");
   gtk_window_set_title (GTK_WINDOW (td->shell), "Threshold");
 
   /* handle the wm close signal */

app/tips_dialog.c

@@ -52,6 +52,7 @@ tips_dialog_create ()
   if (!tips_dialog)
     {
       tips_dialog = gtk_window_new (GTK_WINDOW_DIALOG);
+      gtk_window_set_wmclass (GTK_WINDOW (tips_dialog), "tip_of_the_day", "Gimp");
       gtk_window_set_title (GTK_WINDOW (tips_dialog), "GIMP Tip of the day");
       gtk_window_position (GTK_WINDOW (tips_dialog), GTK_WIN_POS_CENTER);
       gtk_signal_connect (GTK_OBJECT (tips_dialog), "delete_event",

app/tools.c

@@ -378,6 +378,7 @@ tools_options_dialog_new ()
 
   /*  The shell and main vbox  */
   options_shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (options_shell), "tool_options", "Gimp");
   gtk_window_set_title (GTK_WINDOW (options_shell), "Tool Options");
   gtk_window_set_policy (GTK_WINDOW (options_shell), FALSE, TRUE, TRUE);
   gtk_widget_set_uposition (options_shell, tool_options_x, tool_options_y);

app/tools/brightness_contrast.c

@@ -329,6 +329,7 @@ brightness_contrast_new_dialog ()
 
   /*  The shell and main vbox  */
   bcd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (bcd->shell), "brightness_contrast", "Gimp");
   gtk_window_set_title (GTK_WINDOW (bcd->shell), "Brightness-Contrast");
   
   /* handle wm close signal */

app/tools/by_color_select.c

@@ -559,6 +559,7 @@ by_color_select_new_dialog ()
 
   /*  The shell and main vbox  */
   bcd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (bcd->shell), "by_color_selection", "Gimp");
   gtk_window_set_title (GTK_WINDOW (bcd->shell), "By Color Selection");
   gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (bcd->shell)->action_area), 2);
 

app/tools/color_balance.c

@@ -383,6 +383,7 @@ color_balance_new_dialog ()
 
   /*  The shell and main vbox  */
   cbd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (cbd->shell), "color_balance", "Gimp");
   gtk_window_set_title (GTK_WINDOW (cbd->shell), "Color Balance");
   
   /* handle the wm close signal */

app/tools/curves.c

@@ -440,6 +440,7 @@ curves_new_dialog ()
 
   /*  The shell and main vbox  */
   cd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (cd->shell), "curves", "Gimp");
   gtk_window_set_title (GTK_WINDOW (cd->shell), "Curves");
 
   gtk_signal_connect (GTK_OBJECT (cd->shell), "delete_event",

app/tools/gimpbrightnesscontrasttool.c

@@ -329,6 +329,7 @@ brightness_contrast_new_dialog ()
 
   /*  The shell and main vbox  */
   bcd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (bcd->shell), "brightness_contrast", "Gimp");
   gtk_window_set_title (GTK_WINDOW (bcd->shell), "Brightness-Contrast");
   
   /* handle wm close signal */

app/tools/gimpbycolorselecttool.c

@@ -559,6 +559,7 @@ by_color_select_new_dialog ()
 
   /*  The shell and main vbox  */
   bcd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (bcd->shell), "by_color_selection", "Gimp");
   gtk_window_set_title (GTK_WINDOW (bcd->shell), "By Color Selection");
   gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (bcd->shell)->action_area), 2);
 

app/tools/gimpcolorbalancetool.c

@@ -383,6 +383,7 @@ color_balance_new_dialog ()
 
   /*  The shell and main vbox  */
   cbd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (cbd->shell), "color_balance", "Gimp");
   gtk_window_set_title (GTK_WINDOW (cbd->shell), "Color Balance");
   
   /* handle the wm close signal */

app/tools/gimpcurvestool.c

@@ -440,6 +440,7 @@ curves_new_dialog ()
 
   /*  The shell and main vbox  */
   cd->shell = gtk_dialog_new ();
+  gtk_window_set_wmclass (GTK_WINDOW (cd->shell), "curves", "Gimp");
   gtk_window_set_title (GTK_WINDOW (cd->shell), "Curves");
 
   gtk_signal_connect (GTK_OBJECT (cd->shell), "delete_event",