Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.229
diff -u -r1.229 theme.inc
--- includes/theme.inc	13 Apr 2005 17:59:39 -0000	1.229
+++ includes/theme.inc	18 Apr 2005 23:49:47 -0000
@@ -227,6 +227,7 @@
   $defaults = array(
     'primary_links'                 =>  l(t('edit primary links'), 'admin/themes/settings'),
     'secondary_links'               =>  l(t('edit secondary links'), 'admin/themes/settings'),
+    'favicon'                       =>  'favicon.ico',
     'mission'                       =>  '',
     'default_logo'                  =>  1,
     'logo_path'                     =>  '',
Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.205
diff -u -r1.205 system.module
--- modules/system.module	11 Apr 2005 19:05:52 -0000	1.205
+++ modules/system.module	18 Apr 2005 23:49:48 -0000
@@ -651,6 +651,7 @@
     file_check_directory(variable_get('file_directory_path', 'files'), FILE_CREATE_DIRECTORY, 'file_directory_path');
     $group .= form_file(t('Upload logo image'), 'logo_upload', 40, t("If you don't have direct file access to the server, use this field to upload your logo."));
     $group .= form_button(t('Upload'), 'fileop');
+    $group .= form_textfield(t('Path to favorite icon'), "$var][favicon", $settings['favicon'], 50, 128, t('Enter the relative path to the file you would like to use for your favorite icon.'));
 
     $form = form_group(t('Logo image settings'), $group);
 
Index: themes/bluemarine/xtemplate.xtmpl
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/xtemplate.xtmpl,v
retrieving revision 1.6
diff -u -r1.6 xtemplate.xtmpl
--- themes/bluemarine/xtemplate.xtmpl	14 Nov 2004 19:34:09 -0000	1.6
+++ themes/bluemarine/xtemplate.xtmpl	18 Apr 2005 23:49:48 -0000
@@ -6,6 +6,8 @@
   {head}
   {styles}
   <script type="text/javascript"> </script>
+  <link rel="icon" type="shortcut icon" href="{favicon}">
+  <link rel="shortcut icon" href="{favicon}">
 </head>
 
 <body{onload_attributes}>
Index: themes/chameleon/chameleon.theme
===================================================================
RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.theme,v
retrieving revision 1.25
diff -u -r1.25 chameleon.theme
--- themes/chameleon/chameleon.theme	31 Mar 2005 09:25:33 -0000	1.25
+++ themes/chameleon/chameleon.theme	18 Apr 2005 23:49:48 -0000
@@ -26,6 +26,8 @@
   $output .= " <title>". ($title ? strip_tags($title) ." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")) ."</title>\n";
   $output .= drupal_get_html_head();
   $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"themes/chameleon/common.css\" />\n";
+  $output .= " <link rel=\"icon\" type=\"shortcut icon\" href=\"" . theme_get_setting('favicon') . "\" />\n";
+  $output .= " <link rel=\"shortcut icon\" href=\"" . theme_get_setting('favicon') . "\" />\n";
   $output .= theme_get_styles();
   $output .= "</head>";
   $output .= "<body". theme_onload_attribute() .">\n";
Index: themes/engines/xtemplate/xtemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/xtemplate/xtemplate.engine,v
retrieving revision 1.12
diff -u -r1.12 xtemplate.engine
--- themes/engines/xtemplate/xtemplate.engine	31 Mar 2005 09:25:33 -0000	1.12
+++ themes/engines/xtemplate/xtemplate.engine	18 Apr 2005 23:49:48 -0000
@@ -121,7 +121,8 @@
     "styles" => theme_get_styles(),
     "onload_attributes" => theme_onload_attribute(),
     "primary_links" => theme_get_setting('primary_links'),
-    "secondary_links" => theme_get_setting('secondary_links')
+    "secondary_links" => theme_get_setting('secondary_links'),
+    "favicon" => theme_get_setting('favicon')
    ));
 
   if ($logo = theme_get_setting('logo')) {
Index: themes/pushbutton/xtemplate.xtmpl
===================================================================
RCS file: /cvs/drupal/drupal/themes/pushbutton/xtemplate.xtmpl,v
retrieving revision 1.5
diff -u -r1.5 xtemplate.xtmpl
--- themes/pushbutton/xtemplate.xtmpl	31 Oct 2004 03:03:27 -0000	1.5
+++ themes/pushbutton/xtemplate.xtmpl	18 Apr 2005 23:49:48 -0000
@@ -5,6 +5,8 @@
   {head}
   {styles}
   <script type="text/javascript"> </script>
+  <link rel="icon" type="shortcut icon" href="{favicon}">
+  <link rel="shortcut icon" href="{favicon}">
 </head>
 
 <body bgcolor="#ffffff" {onload_attributes}>