Update libpng and libjpeg URLs, remove note about building without since

Mon Apr 19 17:59:17 2004  Owen Taylor  <otaylor@redhat.com>

        * INSTALL.in: Update libpng and libjpeg URLs, remove
        note about building without since that's not the normal
        case.

Sun Apr 11 09:45:11 2004  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkicontheme.c (load_themes): Fix a couple of typos in
        handling of SVG/non-SVG unthemed icons.

7 files changed, 59 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 7836c18b9..fc01ee0a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon Apr 19 17:59:17 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* INSTALL.in: Update libpng and libjpeg URLs, remove
+	note about building without since that's not the normal
+	case.
+
+Sun Apr 11 09:45:11 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkicontheme.c (load_themes): Fix a couple of typos in
+	handling of SVG/non-SVG unthemed icons.
+
 2004-04-19  Morten Welinder  <terra@gnome.org>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_focus): Don't leak list of
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7836c18b9..fc01ee0a3 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Mon Apr 19 17:59:17 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* INSTALL.in: Update libpng and libjpeg URLs, remove
+	note about building without since that's not the normal
+	case.
+
+Sun Apr 11 09:45:11 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkicontheme.c (load_themes): Fix a couple of typos in
+	handling of SVG/non-SVG unthemed icons.
+
 2004-04-19  Morten Welinder  <terra@gnome.org>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_focus): Don't leak list of
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7836c18b9..fc01ee0a3 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Mon Apr 19 17:59:17 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* INSTALL.in: Update libpng and libjpeg URLs, remove
+	note about building without since that's not the normal
+	case.
+
+Sun Apr 11 09:45:11 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkicontheme.c (load_themes): Fix a couple of typos in
+	handling of SVG/non-SVG unthemed icons.
+
 2004-04-19  Morten Welinder  <terra@gnome.org>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_focus): Don't leak list of
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7836c18b9..fc01ee0a3 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Mon Apr 19 17:59:17 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* INSTALL.in: Update libpng and libjpeg URLs, remove
+	note about building without since that's not the normal
+	case.
+
+Sun Apr 11 09:45:11 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkicontheme.c (load_themes): Fix a couple of typos in
+	handling of SVG/non-SVG unthemed icons.
+
 2004-04-19  Morten Welinder  <terra@gnome.org>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_focus): Don't leak list of
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7836c18b9..fc01ee0a3 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Mon Apr 19 17:59:17 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* INSTALL.in: Update libpng and libjpeg URLs, remove
+	note about building without since that's not the normal
+	case.
+
+Sun Apr 11 09:45:11 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkicontheme.c (load_themes): Fix a couple of typos in
+	handling of SVG/non-SVG unthemed icons.
+
 2004-04-19  Morten Welinder  <terra@gnome.org>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_focus): Don't leak list of
diff --git a/INSTALL.in b/INSTALL.in
index e75e27782..8f98713ff 100644
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -12,12 +12,8 @@ GTK+ requires the following packages:
    these libraries are available from:
 
     http://www.libtiff.org/
-    ftp://swrinde.nde.swri.edu/pub/png/src/
-    ftp://ftp.uu.net/graphics/jpeg/
-
-   If these libraries are not available, the corresponding 
-   image loaders will simply not be built. However, this
-   may cause applications using GTK+ not to function properly.
+    http://www.libpng.org/
+    http://www.ijg.org/
 
 Simple install procedure
 ========================
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index f6bc2132b..29d9741fc 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -994,7 +994,7 @@ load_themes (GtkIconTheme *icon_theme)
 		{
 		  if (new_suffix == ICON_SUFFIX_SVG)
 		    {
-		      if (unthemed_icon->no_svg_filename)
+		      if (unthemed_icon->svg_filename)
 			g_free (abs_file);
 		      else
 			unthemed_icon->svg_filename = abs_file;
@@ -1025,7 +1025,7 @@ load_themes (GtkIconTheme *icon_theme)
 		  if (new_suffix == ICON_SUFFIX_SVG)
 		    unthemed_icon->svg_filename = abs_file;
 		  else
-		    unthemed_icon->svg_filename = abs_file;
+		    unthemed_icon->no_svg_filename = abs_file;
 		  
 		  g_hash_table_insert (priv->unthemed_icons,
 				       base_name,