reviewed by: Darin Adler <darin@eazel.com>

2000-12-15  John Harper  <jsh@eazel.com>

	reviewed by: Darin Adler <darin@eazel.com>

	* components/html/gnome-dialogs.c: (get_progress),
	(glibwww_prompt), (glibwww_prompt_password),
	(glibwww_prompt_username_and_password):
	* components/music/configure.c: (mpg123_configure):
	* components/music/fileinfo.c: (mpg123_file_info_box):
	* components/music/nautilus-music-view.c: (image_button_callback):
	* helper-utilities/error-dialog/nautilus-error-dialog.c:
	(show_message_box):
	* libnautilus-extensions/nautilus-file-operations-progress.c:
	(nautilus_file_operations_progress_new):
	* libnautilus-extensions/nautilus-global-preferences.c:
	(nautilus_global_preferences_set_dialog_title):
	* libnautilus-extensions/nautilus-program-chooser.c:
	(run_program_configurator_callback),
	(nautilus_program_chooser_new):
	* libnautilus-extensions/nautilus-stock-dialogs.c:
	(timed_wait_callback), (nautilus_simple_dialog),
	(show_message_box):
	* src/file-manager/fm-icon-text-window.c:
	(create_icon_text_window):
	* src/file-manager/fm-properties-window.c:
	(create_properties_window), (select_image_button_callback):
	* src/nautilus-about.c: (nautilus_about_initialize):
	* src/nautilus-bookmarks-window.c: (create_bookmarks_window):
	* src/nautilus-first-time-druid.c:
	(nautilus_first_time_druid_show):
	* src/nautilus-link-set-window.c:
	(nautilus_link_set_configure_window):
	* src/nautilus-property-browser.c:
	(nautilus_property_browser_initialize),
	(nautilus_emblem_dialog_new), (add_new_pattern):
	* src/nautilus-shell.c: (display_caveat):
	* src/nautilus-theme-selector.c:
	(nautilus_theme_selector_initialize),
	(add_new_theme_button_callback):

	Added calls to gtk_window_set_wmclass with suitable instance
	names and `Nautilus' class name

23 files changed, 78 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 3eb4b74c1..5eaf4c6af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2000-12-15  John Harper  <jsh@eazel.com>
+
+	reviewed by: Darin Adler <darin@eazel.com>
+
+	* components/html/gnome-dialogs.c: (get_progress),
+	(glibwww_prompt), (glibwww_prompt_password),
+	(glibwww_prompt_username_and_password):
+	* components/music/configure.c: (mpg123_configure):
+	* components/music/fileinfo.c: (mpg123_file_info_box):
+	* components/music/nautilus-music-view.c: (image_button_callback):
+	* helper-utilities/error-dialog/nautilus-error-dialog.c:
+	(show_message_box):
+	* libnautilus-extensions/nautilus-file-operations-progress.c:
+	(nautilus_file_operations_progress_new):
+	* libnautilus-extensions/nautilus-global-preferences.c:
+	(nautilus_global_preferences_set_dialog_title):
+	* libnautilus-extensions/nautilus-program-chooser.c:
+	(run_program_configurator_callback),
+	(nautilus_program_chooser_new):
+	* libnautilus-extensions/nautilus-stock-dialogs.c:
+	(timed_wait_callback), (nautilus_simple_dialog),
+	(show_message_box):
+	* src/file-manager/fm-icon-text-window.c:
+	(create_icon_text_window):
+	* src/file-manager/fm-properties-window.c:
+	(create_properties_window), (select_image_button_callback):
+	* src/nautilus-about.c: (nautilus_about_initialize):
+	* src/nautilus-bookmarks-window.c: (create_bookmarks_window):
+	* src/nautilus-first-time-druid.c:
+	(nautilus_first_time_druid_show):
+	* src/nautilus-link-set-window.c:
+	(nautilus_link_set_configure_window):
+	* src/nautilus-property-browser.c:
+	(nautilus_property_browser_initialize),
+	(nautilus_emblem_dialog_new), (add_new_pattern):
+	* src/nautilus-shell.c: (display_caveat):
+	* src/nautilus-theme-selector.c:
+	(nautilus_theme_selector_initialize),
+	(add_new_theme_button_callback):
+
+	Added calls to gtk_window_set_wmclass with suitable instance
+	names and `Nautilus' class name
+
 2000-12-15  Andy Hertzfeld  <andy@eazel.com>
 
 	reviewed by: Pavel Cisler <pavel@eazel.com>
diff --git a/components/html/gnome-dialogs.c b/components/html/gnome-dialogs.c
index 0cc2cec91..cb9a26ea2 100644
--- a/components/html/gnome-dialogs.c
+++ b/components/html/gnome-dialogs.c
@@ -85,6 +85,7 @@ get_progress(HTRequest *req)
 	if (prog_win == NULL) {
 		prog_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 		gtk_window_set_title(GTK_WINDOW(prog_win), _("Transfer Progress"));
+		gtk_window_set_wmclass(GTK_WINDOW(prog_win), "html_progress", "Nautilus");
 		gtk_window_set_policy(GTK_WINDOW(prog_win), FALSE, FALSE, TRUE);
 		gtk_signal_connect(GTK_OBJECT(prog_win), "delete_event",
 				   GTK_SIGNAL_FUNC(hide_win), NULL);
@@ -275,6 +276,7 @@ glibwww_prompt(HTRequest *request, HTAlertOpcode op,
 	}
 
 	dlg = gnome_dialog_new(_("Enter Text"), GNOME_STOCK_BUTTON_OK, NULL);
+	gtk_window_set_wmclass(GTK_WINDOW(dlg), "html_prompt", "Nautilus");
 	if (input) {
 		gchar *tmp = g_strconcat(HTDialogs[msgnum], " (",
 					 (char *)input, ")", NULL);
@@ -316,6 +318,7 @@ glibwww_prompt_password(HTRequest *request, HTAlertOpcode op,
 	gint button;
 
 	dlg = gnome_dialog_new(_("Enter Password"), GNOME_STOCK_BUTTON_OK, NULL);
+	gtk_window_set_wmclass(GTK_WINDOW(dlg), "html_prompt", "Nautilus");
 	if (input) {
 		gchar *tmp = g_strconcat(HTDialogs[msgnum], " (",
 					 (char *)input, ")", NULL);
@@ -358,6 +361,7 @@ glibwww_prompt_username_and_password(HTRequest *request, HTAlertOpcode op,
 
 	dlg = gnome_dialog_new(_("Enter Password"), GNOME_STOCK_BUTTON_OK,
 			       GNOME_STOCK_BUTTON_CANCEL, NULL);
+	gtk_window_set_wmclass(GTK_WINDOW(dlg), "html_prompt", "Nautilus");
 	if (input) {
 		gchar *tmp = g_strconcat(HTDialogs[msgnum], " (",
 					 (char *)input, ")", NULL);
diff --git a/components/music/configure.c b/components/music/configure.c
index 416dbe96f..1c0c0d1ed 100644
--- a/components/music/configure.c
+++ b/components/music/configure.c
@@ -278,6 +278,7 @@ void mpg123_configure(void)
 	gtk_signal_connect(GTK_OBJECT(mpg123_configurewin), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &mpg123_configurewin);
 	gtk_signal_connect(GTK_OBJECT(mpg123_configurewin), "destroy", GTK_SIGNAL_FUNC(configure_destroy), &mpg123_configurewin);
 	gtk_window_set_title(GTK_WINDOW(mpg123_configurewin), _("MPG123 Configuration"));
+	gtk_window_set_wmclass(GTK_WINDOW(mpg123_configurewin), "mpg123_configuration", "Nautilus");
 	gtk_window_set_policy(GTK_WINDOW(mpg123_configurewin), FALSE, FALSE, FALSE);
 	/*  gtk_window_set_position(GTK_WINDOW(mpg123_configurewin), GTK_WIN_POS_MOUSE); */
 	gtk_container_border_width(GTK_CONTAINER(mpg123_configurewin), 10);
diff --git a/components/music/fileinfo.c b/components/music/fileinfo.c
index 0c4c3688d..654467ba3 100644
--- a/components/music/fileinfo.c
+++ b/components/music/fileinfo.c
@@ -362,6 +362,7 @@ void mpg123_file_info_box(char *filename)
 
 	title = g_strdup_printf(_("File Info - %s"), g_basename(filename));
 	gtk_window_set_title(GTK_WINDOW(window), title);
+	gtk_window_set_wmclass(GTK_WINDOW(window), "mpg123_file_info", "Nautilus");
 	g_free(title);
 
 	gtk_entry_set_text(GTK_ENTRY(filename_entry), filename);
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index 505d1fade..744dacf9b 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -579,6 +579,7 @@ image_button_callback (GtkWidget * widget, NautilusMusicView *music_view)
 					   GTK_OBJECT(file_dialog));
 
 		gtk_window_set_position (GTK_WINDOW (file_dialog), GTK_WIN_POS_MOUSE);
+		gtk_window_set_wmclass (GTK_WINDOW (file_dialog), "file_selector", "Nautilus");
 		gtk_widget_show (GTK_WIDGET(file_dialog));
 	}
 }
diff --git a/helper-utilities/error-dialog/nautilus-error-dialog.c b/helper-utilities/error-dialog/nautilus-error-dialog.c
index 9c168428f..e8fbb3a0b 100644
--- a/helper-utilities/error-dialog/nautilus-error-dialog.c
+++ b/helper-utilities/error-dialog/nautilus-error-dialog.c
@@ -112,6 +112,7 @@ show_message_box (const char *message,
 
 	box = gnome_message_box_new (message, type, button_one, button_two, NULL);
 	gtk_window_set_title (GTK_WINDOW (box), dialog_title);
+	gtk_window_set_wmclass (GTK_WINDOW (box), "error_dialog", "Nautilus");
 	
 	/* A bit of a hack. We want to use gnome_message_box_new,
 	 * but we want the message to be wrapped. So, we search
diff --git a/libnautilus-extensions/nautilus-file-operations-progress.c b/libnautilus-extensions/nautilus-file-operations-progress.c
index 2e3a1a0c5..7a8aeaa6a 100644
--- a/libnautilus-extensions/nautilus-file-operations-progress.c
+++ b/libnautilus-extensions/nautilus-file-operations-progress.c
@@ -272,6 +272,7 @@ nautilus_file_operations_progress_new (const char *title,
 	nautilus_file_operations_progress_set_total (dialog, total_files, total_bytes);
 
 	gtk_window_set_title (GTK_WINDOW (widget), title);
+	gtk_window_set_wmclass (GTK_WINDOW (widget), "file_progress", "Nautilus");
 
 	gnome_dialog_append_button (GNOME_DIALOG (widget), GNOME_STOCK_BUTTON_CANCEL);
 
diff --git a/libnautilus-extensions/nautilus-global-preferences.c b/libnautilus-extensions/nautilus-global-preferences.c
index 1340f8ab9..fce757dcf 100644
--- a/libnautilus-extensions/nautilus-global-preferences.c
+++ b/libnautilus-extensions/nautilus-global-preferences.c
@@ -1090,6 +1090,7 @@ nautilus_global_preferences_set_dialog_title (const char *title)
 	dialog = global_preferences_get_dialog ();
 
 	gtk_window_set_title (GTK_WINDOW (dialog), title);
+	gtk_window_set_wmclass (GTK_WINDOW (dialog), "global_preferences", "Nautilus");
 }
 
 void
diff --git a/libnautilus-extensions/nautilus-program-chooser.c b/libnautilus-extensions/nautilus-program-chooser.c
index 788642a8d..1cd69ca8d 100644
--- a/libnautilus-extensions/nautilus-program-chooser.c
+++ b/libnautilus-extensions/nautilus-program-chooser.c
@@ -953,6 +953,7 @@ run_program_configurator_callback (GtkWidget *button, gpointer callback_data)
 				   GNOME_STOCK_BUTTON_CANCEL,
 				   NULL);
 	g_free (title);
+	gtk_window_set_wmclass (GTK_WINDOW (dialog), "program_chooser", "Nautilus");
 
 	/* Labeled frame to avoid repeating text in each radio button,
 	 * and to look nice.
@@ -1237,6 +1238,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type,
 	gtk_window_set_default_size (GTK_WINDOW (window), 
 				     NO_DEFAULT_MAGIC_NUMBER,
 				     PROGRAM_CHOOSER_DEFAULT_HEIGHT);
+	gtk_window_set_wmclass (GTK_WINDOW (window), "program_chooser", "Nautilus");
 
 	gtk_object_set_data (GTK_OBJECT (window), "type", GINT_TO_POINTER (action_type));
 
diff --git a/libnautilus-extensions/nautilus-stock-dialogs.c b/libnautilus-extensions/nautilus-stock-dialogs.c
index 7851adc7d..75e5172c5 100644
--- a/libnautilus-extensions/nautilus-stock-dialogs.c
+++ b/libnautilus-extensions/nautilus-stock-dialogs.c
@@ -159,6 +159,7 @@ timed_wait_callback (gpointer callback_data)
 	dialog = GNOME_DIALOG (gnome_dialog_new (wait->window_title,
 						 GNOME_STOCK_BUTTON_CANCEL,
 						 NULL));
+	gtk_window_set_wmclass (GTK_WINDOW (dialog), "dialog", "Nautilus");
 	add_label_to_dialog (dialog, wait->wait_message);
 	gnome_dialog_set_close (dialog, TRUE);
 	gtk_widget_show_all (GTK_WIDGET (dialog));
@@ -303,6 +304,7 @@ nautilus_simple_dialog (GtkWidget *parent, gboolean ignore_close_box,
 	
         gnome_dialog_set_close (GNOME_DIALOG (dialog), TRUE);
 
+	gtk_window_set_wmclass (GTK_WINDOW (dialog), "dialog", "Nautilus");
 
 	/* Parent it if asked to. */
         if (parent != NULL) {
@@ -371,6 +373,7 @@ show_message_box (const char *message,
 
 	box = gnome_message_box_new (message, type, button_one, button_two, NULL);
 	gtk_window_set_title (GTK_WINDOW (box), dialog_title);
+	gtk_window_set_wmclass (GTK_WINDOW (box), "stock_dialog", "Nautilus");
 	
 	/* A bit of a hack. We want to use gnome_message_box_new,
 	 * but we want the message to be wrapped. So, we search
diff --git a/libnautilus-private/nautilus-file-operations-progress.c b/libnautilus-private/nautilus-file-operations-progress.c
index 2e3a1a0c5..7a8aeaa6a 100644
--- a/libnautilus-private/nautilus-file-operations-progress.c
+++ b/libnautilus-private/nautilus-file-operations-progress.c
@@ -272,6 +272,7 @@ nautilus_file_operations_progress_new (const char *title,
 	nautilus_file_operations_progress_set_total (dialog, total_files, total_bytes);
 
 	gtk_window_set_title (GTK_WINDOW (widget), title);
+	gtk_window_set_wmclass (GTK_WINDOW (widget), "file_progress", "Nautilus");
 
 	gnome_dialog_append_button (GNOME_DIALOG (widget), GNOME_STOCK_BUTTON_CANCEL);
 
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 1340f8ab9..fce757dcf 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -1090,6 +1090,7 @@ nautilus_global_preferences_set_dialog_title (const char *title)
 	dialog = global_preferences_get_dialog ();
 
 	gtk_window_set_title (GTK_WINDOW (dialog), title);
+	gtk_window_set_wmclass (GTK_WINDOW (dialog), "global_preferences", "Nautilus");
 }
 
 void
diff --git a/libnautilus-private/nautilus-program-chooser.c b/libnautilus-private/nautilus-program-chooser.c
index 788642a8d..1cd69ca8d 100644
--- a/libnautilus-private/nautilus-program-chooser.c
+++ b/libnautilus-private/nautilus-program-chooser.c
@@ -953,6 +953,7 @@ run_program_configurator_callback (GtkWidget *button, gpointer callback_data)
 				   GNOME_STOCK_BUTTON_CANCEL,
 				   NULL);
 	g_free (title);
+	gtk_window_set_wmclass (GTK_WINDOW (dialog), "program_chooser", "Nautilus");
 
 	/* Labeled frame to avoid repeating text in each radio button,
 	 * and to look nice.
@@ -1237,6 +1238,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type,
 	gtk_window_set_default_size (GTK_WINDOW (window), 
 				     NO_DEFAULT_MAGIC_NUMBER,
 				     PROGRAM_CHOOSER_DEFAULT_HEIGHT);
+	gtk_window_set_wmclass (GTK_WINDOW (window), "program_chooser", "Nautilus");
 
 	gtk_object_set_data (GTK_OBJECT (window), "type", GINT_TO_POINTER (action_type));
 
diff --git a/libnautilus-private/nautilus-stock-dialogs.c b/libnautilus-private/nautilus-stock-dialogs.c
index 7851adc7d..75e5172c5 100644
--- a/libnautilus-private/nautilus-stock-dialogs.c
+++ b/libnautilus-private/nautilus-stock-dialogs.c
@@ -159,6 +159,7 @@ timed_wait_callback (gpointer callback_data)
 	dialog = GNOME_DIALOG (gnome_dialog_new (wait->window_title,
 						 GNOME_STOCK_BUTTON_CANCEL,
 						 NULL));
+	gtk_window_set_wmclass (GTK_WINDOW (dialog), "dialog", "Nautilus");
 	add_label_to_dialog (dialog, wait->wait_message);
 	gnome_dialog_set_close (dialog, TRUE);
 	gtk_widget_show_all (GTK_WIDGET (dialog));
@@ -303,6 +304,7 @@ nautilus_simple_dialog (GtkWidget *parent, gboolean ignore_close_box,
 	
         gnome_dialog_set_close (GNOME_DIALOG (dialog), TRUE);
 
+	gtk_window_set_wmclass (GTK_WINDOW (dialog), "dialog", "Nautilus");
 
 	/* Parent it if asked to. */
         if (parent != NULL) {
@@ -371,6 +373,7 @@ show_message_box (const char *message,
 
 	box = gnome_message_box_new (message, type, button_one, button_two, NULL);
 	gtk_window_set_title (GTK_WINDOW (box), dialog_title);
+	gtk_window_set_wmclass (GTK_WINDOW (box), "stock_dialog", "Nautilus");
 	
 	/* A bit of a hack. We want to use gnome_message_box_new,
 	 * but we want the message to be wrapped. So, we search
diff --git a/src/file-manager/fm-icon-text-window.c b/src/file-manager/fm-icon-text-window.c
index c9b8647e8..41e0f0567 100644
--- a/src/file-manager/fm-icon-text-window.c
+++ b/src/file-manager/fm-icon-text-window.c
@@ -261,6 +261,7 @@ create_icon_text_window (void)
 	nautilus_gtk_window_set_up_close_accelerator (GTK_WINDOW (window));
   	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
   	gtk_window_set_title (GTK_WINDOW (window), _("Icon Captions"));
+	gtk_window_set_wmclass (GTK_WINDOW (window), "icon_captions", "Nautilus");
   	gtk_window_set_policy (GTK_WINDOW (window), FALSE, FALSE, FALSE);
 
   	contents_vbox = gtk_vbox_new (FALSE, 0);
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 99d43f3e2..db8b6a077 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -1843,6 +1843,7 @@ create_properties_window (NautilusFile *file)
 	
   	gtk_container_set_border_width (GTK_CONTAINER (window), GNOME_PAD);
   	gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
+	gtk_window_set_wmclass (GTK_WINDOW (window), "file_properties", "Nautilus");
 
 	/* Set initial window title */
 	update_properties_window_title (GTK_WINDOW (window), window->details->file);
@@ -2092,6 +2093,7 @@ select_image_button_callback (GtkWidget *widget, NautilusFile *file)
 
 	gtk_window_set_position (GTK_WINDOW (file_dialog), GTK_WIN_POS_MOUSE);
 	gtk_window_set_transient_for (GTK_WINDOW (file_dialog), GTK_WINDOW (window));
+ 	gtk_window_set_wmclass (GTK_WINDOW (file_dialog), "file_selector", "Nautilus");
 	gtk_widget_show (GTK_WIDGET (file_dialog));
 }
 
diff --git a/src/nautilus-about.c b/src/nautilus-about.c
index df4e91cb8..34a1c0c96 100644
--- a/src/nautilus-about.c
+++ b/src/nautilus-about.c
@@ -137,6 +137,7 @@ nautilus_about_initialize (NautilusAbout *about)
 
 	/* set the window title and standard close key accelerator */
 	gtk_window_set_title (GTK_WINDOW (about), _("About Nautilus"));
+	gtk_window_set_wmclass (GTK_WINDOW (about), "about", "Nautilus");
 	nautilus_gtk_window_set_up_close_accelerator (GTK_WINDOW (about));
 	
 	/* allocate a frame to hold the drawing area */
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index eb1c5d61f..39bad2b03 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -125,6 +125,7 @@ create_bookmarks_window (NautilusBookmarkList *list, GtkObject *undo_manager_sou
 	nautilus_undo_share_undo_manager (GTK_OBJECT (window), undo_manager_source);
 	gtk_container_set_border_width (GTK_CONTAINER (window), GNOME_PAD);
 	gtk_window_set_title (GTK_WINDOW (window), _("Bookmarks"));
+	gtk_window_set_wmclass (GTK_WINDOW (window), "bookmarks", "Nautilus");
 	gtk_widget_set_usize (window, 
 			      BOOKMARKS_WINDOW_MIN_WIDTH, 
 			      BOOKMARKS_WINDOW_MIN_HEIGHT);
diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c
index a373bf2c5..7d9fb9e86 100644
--- a/src/nautilus-first-time-druid.c
+++ b/src/nautilus-first-time-druid.c
@@ -763,6 +763,7 @@ nautilus_first_time_druid_show (NautilusApplication *application, gboolean manag
 	dialog = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title (GTK_WINDOW (dialog),
 			      _("Nautilus First Time Setup"));
+	gtk_window_set_wmclass (GTK_WINDOW (dialog), "initial_preferences", "Nautilus");
   	gtk_container_set_border_width (GTK_CONTAINER (dialog), 0);
   	gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, FALSE, FALSE);
   	/* Ensure there's a main event loop while the druid is running. */
diff --git a/src/nautilus-link-set-window.c b/src/nautilus-link-set-window.c
index ec428abe9..3c15c3495 100644
--- a/src/nautilus-link-set-window.c
+++ b/src/nautilus-link-set-window.c
@@ -189,6 +189,7 @@ nautilus_link_set_configure_window (const char *directory_path, GtkWindow *windo
  		
 	/* set the window title */
   	gtk_window_set_title (window, _("Link sets"));
+	gtk_window_set_wmclass (window, "link_sets", "Nautilus");
 	
 	/* fetch the link set names */
 	link_set_names = get_link_set_names();	
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index ce36c098c..602b8c4d0 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -252,6 +252,7 @@ nautilus_property_browser_initialize (GtkObject *object)
 
 	/* set the title and standard close accelerator */
 	gtk_window_set_title(GTK_WINDOW(widget), _("Backgrounds and Emblems"));
+	gtk_window_set_wmclass(GTK_WINDOW(widget), "property_browser", "Nautilus");
 	nautilus_gtk_window_set_up_close_accelerator (GTK_WINDOW (widget));
 	
 	/* set up the background */
@@ -1054,6 +1055,7 @@ nautilus_emblem_dialog_new(NautilusPropertyBrowser *property_browser)
 	gtk_widget_show(table);	
 	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), table, TRUE, TRUE, GNOME_PAD);
 	gnome_dialog_set_default(GNOME_DIALOG(dialog), GNOME_OK);
+	gtk_window_set_wmclass(GTK_WINDOW(dialog), "emblem_dialog", "Nautilus");
 	
 	return dialog;
 }
@@ -1198,6 +1200,7 @@ add_new_pattern (NautilusPropertyBrowser *property_browser)
 
 		gtk_window_set_position (GTK_WINDOW (file_dialog), GTK_WIN_POS_MOUSE);
 		gtk_window_set_transient_for (GTK_WINDOW (file_dialog), GTK_WINDOW (property_browser));
+ 		gtk_window_set_wmclass (GTK_WINDOW (file_dialog), "file_selector", "Nautilus");
 		gtk_widget_show (GTK_WIDGET (file_dialog));
 	}
 }
diff --git a/src/nautilus-shell.c b/src/nautilus-shell.c
index 31fc8e8ce..a4a2bf26d 100644
--- a/src/nautilus-shell.c
+++ b/src/nautilus-shell.c
@@ -169,6 +169,7 @@ display_caveat (GtkWindow *parent_window)
 				   NULL);
   	gtk_container_set_border_width (GTK_CONTAINER (dialog), GNOME_PAD);
   	gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, FALSE, FALSE);
+	gtk_window_set_wmclass (GTK_WINDOW (dialog), "caveat", "Nautilus");
 
   	hbox = gtk_hbox_new (FALSE, GNOME_PAD);
   	gtk_container_set_border_width (GTK_CONTAINER (hbox), GNOME_PAD);
diff --git a/src/nautilus-theme-selector.c b/src/nautilus-theme-selector.c
index 76a74be5b..b234623d0 100644
--- a/src/nautilus-theme-selector.c
+++ b/src/nautilus-theme-selector.c
@@ -155,6 +155,7 @@ nautilus_theme_selector_initialize (GtkObject *object)
 
 	/* set the title and standard close accelerator */
 	gtk_window_set_title (GTK_WINDOW (widget), _("Nautilus Theme Selector"));
+	gtk_window_set_wmclass(GTK_WINDOW(widget), "theme_selector", "Nautilus");
 	nautilus_gtk_window_set_up_close_accelerator (GTK_WINDOW (widget));
 	
 	/* set up the background */	
@@ -461,6 +462,7 @@ add_new_theme_button_callback(GtkWidget *widget, NautilusThemeSelector *theme_se
 
 		gtk_window_set_position (GTK_WINDOW (file_dialog), GTK_WIN_POS_MOUSE);
 		gtk_window_set_transient_for (GTK_WINDOW (file_dialog), GTK_WINDOW (theme_selector));
+ 		gtk_window_set_wmclass (GTK_WINDOW (file_dialog), "file_selector", "Nautilus");
 		gtk_widget_show (GTK_WIDGET(file_dialog));
 	}
 }