Use themed icons for WM hint.

28 files changed, 86 insertions, 15 deletions

diff --git a/capplets/accessibility/at-properties/ChangeLog b/capplets/accessibility/at-properties/ChangeLog
index 3c01edacd..c5e168108 100644
--- a/capplets/accessibility/at-properties/ChangeLog
+++ b/capplets/accessibility/at-properties/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* main.c: (setup_dialog):
+	Use themed icon for window hint.
+
 2004-04-15  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.6.1
diff --git a/capplets/accessibility/at-properties/main.c b/capplets/accessibility/at-properties/main.c
index 570339ede..98cd8ac17 100644
--- a/capplets/accessibility/at-properties/main.c
+++ b/capplets/accessibility/at-properties/main.c
@@ -257,7 +257,7 @@ setup_dialog (GladeXML *dialog)
 			  dialog);
 	
 	widget = WID ("at_properties_dialog");
-	capplet_set_icon (widget, "at-enable-capplet.png");
+	capplet_set_icon (widget, "gnome-settings-accessibility-technologies");
 	
 	g_signal_connect (G_OBJECT (widget),
 			  "response",
diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog
index 77f0e1573..6544f8a16 100644
--- a/capplets/accessibility/keyboard/ChangeLog
+++ b/capplets/accessibility/keyboard/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* gnome-accessibility-keyboard-properties.c: (main):
+	Use themed icon for window hint.
+
 2004-07-06  Padraig O'Briain <padraig.obriain@sun.com>
 
 	* gnome-accessibility-keyboard-properties.glade:  Add label-for/
diff --git a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
index afe621066..8646e3d69 100644
--- a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
+++ b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
@@ -108,7 +108,7 @@ main (int argc, char **argv)
 	g_signal_connect (G_OBJECT (dialog),
 		"response",
 		G_CALLBACK (dialog_response), changeset);
-	capplet_set_icon (dialog, "accessibility-keyboard-capplet.png");
+	capplet_set_icon (dialog, "gnome-settings-accessibility-keyboard");
 	gtk_widget_show_all (dialog);
 	gtk_main ();
 
diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index c053246b4..c66216dbb 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* gnome-wp-capplet.c: (gnome_wp_icon_theme_changed),
+	(wallpaper_properties_init):
+	Use themed icon for window hint.
+
 2004-08-16  Rodney Dawes  <dobey@novell.com>
 
 	* gnome-wp-capplet.c (wallpaper_properties_clicked):
diff --git a/capplets/background/gnome-wp-capplet.c b/capplets/background/gnome-wp-capplet.c
index 491a9fae9..971416a83 100644
--- a/capplets/background/gnome-wp-capplet.c
+++ b/capplets/background/gnome-wp-capplet.c
@@ -1085,7 +1085,7 @@ static void gnome_wp_icon_theme_changed (GnomeIconTheme * theme,
   gchar * icofile;
 
   icofile = gnome_icon_theme_lookup_icon (capplet->theme,
-					  "background-capplet",
+					  "gnome-settings-background",
 					  48, NULL, NULL);
   if (icofile != NULL) {
     pixbuf = gdk_pixbuf_new_from_file (icofile, NULL);
@@ -1252,7 +1252,7 @@ static void wallpaper_properties_init (void) {
   capplet->window = glade_xml_get_widget (dialog,"gnome_wp_properties");
 
   icofile = gnome_icon_theme_lookup_icon (capplet->theme,
-					  "background-capplet",
+					  "gnome-settings-background",
 					  48, NULL, NULL);
   if (icofile != NULL) {
     pixbuf = gdk_pixbuf_new_from_file (icofile, NULL);
diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index 9caf9de9e..337eec54f 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	reviewed by: <delete if not using a buddy>
+
+	* gnome-default-applications-properties.c: (create_dialog):
+
 2004-04-15  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.6.1
diff --git a/capplets/default-applications/gnome-default-applications-properties.c b/capplets/default-applications/gnome-default-applications-properties.c
index df666c8c9..3c750ad57 100644
--- a/capplets/default-applications/gnome-default-applications-properties.c
+++ b/capplets/default-applications/gnome-default-applications-properties.c
@@ -565,7 +565,7 @@ create_dialog (GConfClient *client)
 	GList *strings = NULL, *li;
 	gint i;
 	dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-default-applications-properties.glade", NULL, NULL);
-	capplet_set_icon (WID ("default_applications_dialog"), "default-applications-capplet.png");
+	capplet_set_icon (WID ("default_applications_dialog"), "gnome-settings-default-applications");
 
 	setup_peditors (client, dialog);
 
diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog
index dd0c0c85e..8c8dff5e5 100644
--- a/capplets/font/ChangeLog
+++ b/capplets/font/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* main.c: (setup_dialog):
+	Use themed icon for window hint.
+
 2004-04-15  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.6.1
diff --git a/capplets/font/main.c b/capplets/font/main.c
index b13ffcc3c..ec8ad9b72 100644
--- a/capplets/font/main.c
+++ b/capplets/font/main.c
@@ -584,7 +584,7 @@ setup_dialog (GladeXML *dialog)
   metacity_titlebar_load_sensitivity (client, dialog);
 
   widget = WID ("font_dialog");
-  capplet_set_icon (widget, "font-capplet.png");
+  capplet_set_icon (widget, "gnome-settings-font");
 
 #ifdef HAVE_XFT2
   setup_font_pair (WID ("monochrome_radio"),    WID ("monochrome_sample"),    ANTIALIAS_NONE,      HINT_FULL);
diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index 3ad2979a9..0ce61cb35 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* gnome-keybinding-properties.c: (setup_dialog):
+	Use themed icon for window hint.
+
 2004-04-15  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.6.1
diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c
index c6ca43aed..7d13e2215 100644
--- a/capplets/keybindings/gnome-keybinding-properties.c
+++ b/capplets/keybindings/gnome-keybinding-properties.c
@@ -1029,7 +1029,7 @@ setup_dialog (GladeXML *dialog)
   reload_key_entries (wm_common_get_current_window_manager(), dialog);
 
   widget = WID ("gnome-keybinding-dialog");
-  capplet_set_icon (widget, "keyboard-shortcut.png");
+  capplet_set_icon (widget, "gnome-settings-keybindings");
   gtk_widget_show (widget);
 
   g_signal_connect (G_OBJECT (widget), "response", G_CALLBACK(cb_dialog_response), NULL);
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index 6066ebf6c..f62f1faa0 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* gnome-keyboard-properties.c: (main):
+	Use themed icon for window hint.	
+
 2004-04-15  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.6.1
diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c
index 9fc1c9234..67871496b 100644
--- a/capplets/keyboard/gnome-keyboard-properties.c
+++ b/capplets/keyboard/gnome-keyboard-properties.c
@@ -252,7 +252,7 @@ main (int argc, char **argv)
 			gtk_notebook_set_current_page (GTK_NOTEBOOK (WID ("keyboard_notebook")), 1);
 		}
 		capplet_set_icon (WID ("keyboard_dialog"),
-				  "keyboard-capplet.png");
+				  "gnome-dev-keyboard");
 		gtk_widget_show (WID ("keyboard_dialog"));
 		gtk_main ();
 	}
diff --git a/capplets/mouse/.cvsignore b/capplets/mouse/.cvsignore
index 2ee3662d9..bebdc1b90 100644
--- a/capplets/mouse/.cvsignore
+++ b/capplets/mouse/.cvsignore
@@ -7,3 +7,4 @@ Makefile.in
 *.la
 gnome-mouse-properties
 mouse.desktop
+gnome-settings-mouse.desktop
diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index d32e562c9..9aaba6814 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* .cvsignore:
+	quiet CVS.
+	* gnome-mouse-properties.c: (main):
+	Use themed icon for WM hint.
+
 2004-04-15  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.6.1
diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c
index 703f3f05f..24d102cac 100644
--- a/capplets/mouse/gnome-mouse-properties.c
+++ b/capplets/mouse/gnome-mouse-properties.c
@@ -841,7 +841,7 @@ main (int argc, char **argv)
 		g_signal_connect (dialog_win, "response",
 				  G_CALLBACK (dialog_response_cb), changeset);
 
-		capplet_set_icon (dialog_win, "mouse-capplet.png");
+		capplet_set_icon (dialog_win, "gnome-dev-mouse-optical");
 		gtk_widget_show (dialog_win);
 
 		gtk_main ();
diff --git a/capplets/sound/.cvsignore b/capplets/sound/.cvsignore
index f1494e164..167034d70 100644
--- a/capplets/sound/.cvsignore
+++ b/capplets/sound/.cvsignore
@@ -7,3 +7,4 @@ Makefile.in
 *.o
 gnome-sound-properties
 sound.desktop
+gnome-settings-sound.desktop
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index 803588c78..daabb1506 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* .cvsignore:
+	Quiet CVS.
+
+	* sound-properties-capplet.c: (main):
+	Use themed icon for window hint.
+
 2004-04-15  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.6.1
diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c
index 5beaac949..4c87e66fa 100644
--- a/capplets/sound/sound-properties-capplet.c
+++ b/capplets/sound/sound-properties-capplet.c
@@ -246,7 +246,7 @@ main (int argc, char **argv)
 		gtk_dialog_set_default_response (GTK_DIALOG (dialog_win), GTK_RESPONSE_CLOSE);
 		g_signal_connect (G_OBJECT (dialog_win), "response", (GCallback) dialog_button_clicked_cb, changeset);
 		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_win)->vbox), WID ("prefs_widget"), TRUE, TRUE, 0);
-		capplet_set_icon (dialog_win, "sound-capplet.png");
+		capplet_set_icon (dialog_win, "gnome-settings-sound");
 		gtk_widget_show_all (dialog_win);
 
 		gtk_main ();
diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog
index c26b7a862..c38d0e354 100644
--- a/capplets/theme-switcher/ChangeLog
+++ b/capplets/theme-switcher/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* gnome-theme-details.c: (gnome_theme_details_init):
+	* gnome-theme-manager.c: (setup_dialog):
+	* theme-switcher.c: (setup_dialog):
+	Use themed icon for window hint.
+
 2004-05-27  Padraig O'Briain <padraig.obriain@sun.com>
 
 	* theme-properties.glade: Set accessible name for GtkTreeViews
diff --git a/capplets/theme-switcher/gnome-theme-details.c b/capplets/theme-switcher/gnome-theme-details.c
index 288c0ec7a..4c7ce04f0 100644
--- a/capplets/theme-switcher/gnome-theme-details.c
+++ b/capplets/theme-switcher/gnome-theme-details.c
@@ -339,7 +339,7 @@ gnome_theme_details_init (void)
   g_signal_connect (G_OBJECT (parent), "drag-leave", G_CALLBACK (gnome_theme_manager_drag_leave_cb), NULL);
   g_signal_connect (G_OBJECT (parent), "drag-data-received", G_CALLBACK (gnome_theme_manager_drag_data_received_cb), NULL);
 
-  capplet_set_icon (parent, "gnome-ccthemes.png");
+  capplet_set_icon (parent, "gnome-settings-theme");
 
   gnome_theme_details_reread_themes_from_disk ();
 }
diff --git a/capplets/theme-switcher/gnome-theme-manager.c b/capplets/theme-switcher/gnome-theme-manager.c
index 70cff3d08..b07465f55 100644
--- a/capplets/theme-switcher/gnome-theme-manager.c
+++ b/capplets/theme-switcher/gnome-theme-manager.c
@@ -1163,7 +1163,7 @@ setup_dialog (GladeXML *dialog)
   g_signal_connect (G_OBJECT (parent), "drag-leave", G_CALLBACK (gnome_theme_manager_drag_leave_cb), NULL);
   g_signal_connect (G_OBJECT (parent), "drag-data-received",G_CALLBACK (gnome_theme_manager_drag_data_received_cb), NULL);
 
-  capplet_set_icon (parent, "gnome-ccthemes.png");
+  capplet_set_icon (parent, "gnome-settings-theme");
 
   update_font_button_state (dialog);
   gtk_widget_show (parent);
diff --git a/capplets/theme-switcher/theme-switcher.c b/capplets/theme-switcher/theme-switcher.c
index 593032fdc..5ad78b00b 100644
--- a/capplets/theme-switcher/theme-switcher.c
+++ b/capplets/theme-switcher/theme-switcher.c
@@ -806,7 +806,7 @@ setup_dialog (GladeXML *dialog)
 		    G_CALLBACK (drag_data_received_cb),
 		    dialog);
 
-  capplet_set_icon (parent, "gnome-ccthemes.png");
+  capplet_set_icon (parent, "gnome-settings-theme");
   gtk_widget_show (parent);
 }
 
diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog
index b06b20576..62453916c 100644
--- a/capplets/ui-properties/ChangeLog
+++ b/capplets/ui-properties/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* gnome-ui-properties.c: (setup_dialog):
+	Use themed icon for window hint.
+
 2004-04-15  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.6.1
diff --git a/capplets/ui-properties/gnome-ui-properties.c b/capplets/ui-properties/gnome-ui-properties.c
index b2128eab2..c84cebc23 100644
--- a/capplets/ui-properties/gnome-ui-properties.c
+++ b/capplets/ui-properties/gnome-ui-properties.c
@@ -274,7 +274,7 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
   g_free (toolbar_style);
 
   gtk_window_set_resizable (GTK_WINDOW (widget), FALSE);
-  capplet_set_icon (widget, "behavior-capplet.png");
+  capplet_set_icon (widget, "gnome-settings-ui-behavior");
   gtk_widget_show_all (widget);
 }
 
diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog
index 12aaf6f51..4a5de04db 100644
--- a/capplets/windows/ChangeLog
+++ b/capplets/windows/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* gnome-window-properties.c: (main):
+	Use themed icon for window hint.
+
 2004-07-06  Padraig O'Briain <padraig.obriain@sun.com>
 
 	* gnome-window-properties.glade:  Add mnemnoic widget for
diff --git a/capplets/windows/gnome-window-properties.c b/capplets/windows/gnome-window-properties.c
index 0fcb922af..7a1bb5de2 100644
--- a/capplets/windows/gnome-window-properties.c
+++ b/capplets/windows/gnome-window-properties.c
@@ -516,7 +516,7 @@ main (int argc, char **argv)
                 ++i;
         }
         
-        capplet_set_icon (dialog_win, "window-capplet.png");
+        capplet_set_icon (dialog_win, "gnome-window-manager");
         gtk_widget_show (dialog_win);
         
         gtk_main ();