Remove gtk_rc_append_default_pixmap_path(), since it wasn't adding an

Fri Jul 14 14:05:02 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkrc.c (gtk_rc_parse_pixmap_path_string): Remove
	gtk_rc_append_default_pixmap_path(), since it wasn't
	adding an interesting path and we don't have a meaningful
	default for this value.

diff --git a/ChangeLog b/ChangeLog
index dbe40ce79c337d3219d23cf45df63b02149b5bad..ed7b7efad003bc0f4c33bdbe25b08ea8eb7d0081 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jul 14 14:05:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_parse_pixmap_path_string): Remove
+       gtk_rc_append_default_pixmap_path(), since it wasn't
+       adding an interesting path and we don't have a meaningful
+       default for this value.
+
 Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am gtk-config.m4 gtk.m4: Move
@@ -28,7 +35,7 @@ Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
        * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations
        $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir
        to THEMENAME/gtk-2.0/. Move engine directory  to
-       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines.
        
 2000-07-12  Tor Lillqvist  <tml@iki.fi>
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index dbe40ce79c337d3219d23cf45df63b02149b5bad..ed7b7efad003bc0f4c33bdbe25b08ea8eb7d0081 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Fri Jul 14 14:05:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_parse_pixmap_path_string): Remove
+       gtk_rc_append_default_pixmap_path(), since it wasn't
+       adding an interesting path and we don't have a meaningful
+       default for this value.
+
 Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am gtk-config.m4 gtk.m4: Move
@@ -28,7 +35,7 @@ Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
        * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations
        $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir
        to THEMENAME/gtk-2.0/. Move engine directory  to
-       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines.
        
 2000-07-12  Tor Lillqvist  <tml@iki.fi>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dbe40ce79c337d3219d23cf45df63b02149b5bad..ed7b7efad003bc0f4c33bdbe25b08ea8eb7d0081 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Fri Jul 14 14:05:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_parse_pixmap_path_string): Remove
+       gtk_rc_append_default_pixmap_path(), since it wasn't
+       adding an interesting path and we don't have a meaningful
+       default for this value.
+
 Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am gtk-config.m4 gtk.m4: Move
@@ -28,7 +35,7 @@ Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
        * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations
        $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir
        to THEMENAME/gtk-2.0/. Move engine directory  to
-       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines.
        
 2000-07-12  Tor Lillqvist  <tml@iki.fi>
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index dbe40ce79c337d3219d23cf45df63b02149b5bad..ed7b7efad003bc0f4c33bdbe25b08ea8eb7d0081 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Fri Jul 14 14:05:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_parse_pixmap_path_string): Remove
+       gtk_rc_append_default_pixmap_path(), since it wasn't
+       adding an interesting path and we don't have a meaningful
+       default for this value.
+
 Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am gtk-config.m4 gtk.m4: Move
@@ -28,7 +35,7 @@ Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
        * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations
        $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir
        to THEMENAME/gtk-2.0/. Move engine directory  to
-       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines.
        
 2000-07-12  Tor Lillqvist  <tml@iki.fi>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index dbe40ce79c337d3219d23cf45df63b02149b5bad..ed7b7efad003bc0f4c33bdbe25b08ea8eb7d0081 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Fri Jul 14 14:05:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_parse_pixmap_path_string): Remove
+       gtk_rc_append_default_pixmap_path(), since it wasn't
+       adding an interesting path and we don't have a meaningful
+       default for this value.
+
 Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am gtk-config.m4 gtk.m4: Move
@@ -28,7 +35,7 @@ Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
        * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations
        $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir
        to THEMENAME/gtk-2.0/. Move engine directory  to
-       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines.
        
 2000-07-12  Tor Lillqvist  <tml@iki.fi>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index dbe40ce79c337d3219d23cf45df63b02149b5bad..ed7b7efad003bc0f4c33bdbe25b08ea8eb7d0081 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Fri Jul 14 14:05:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_parse_pixmap_path_string): Remove
+       gtk_rc_append_default_pixmap_path(), since it wasn't
+       adding an interesting path and we don't have a meaningful
+       default for this value.
+
 Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am gtk-config.m4 gtk.m4: Move
@@ -28,7 +35,7 @@ Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
        * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations
        $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir
        to THEMENAME/gtk-2.0/. Move engine directory  to
-       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines.
        
 2000-07-12  Tor Lillqvist  <tml@iki.fi>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index dbe40ce79c337d3219d23cf45df63b02149b5bad..ed7b7efad003bc0f4c33bdbe25b08ea8eb7d0081 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Fri Jul 14 14:05:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_parse_pixmap_path_string): Remove
+       gtk_rc_append_default_pixmap_path(), since it wasn't
+       adding an interesting path and we don't have a meaningful
+       default for this value.
+
 Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am gtk-config.m4 gtk.m4: Move
@@ -28,7 +35,7 @@ Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>
        * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations
        $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir
        to THEMENAME/gtk-2.0/. Move engine directory  to
-       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+       $(libdir)/gtk-2.0/$(GTK_VERSION)/engines.
        
 2000-07-12  Tor Lillqvist  <tml@iki.fi>
 

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 41c6b2e29159993a04198afa6d3af019fcac8407..d693edfdd71661cfa2611ebf0962f6cd53107909 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -131,7 +131,6 @@ static void        gtk_rc_clear_hash_node            (gpointer         key,
                                                       gpointer         data,
                                                       gpointer         user_data);
 static void        gtk_rc_clear_styles               (void);
-static void        gtk_rc_append_default_pixmap_path (void);
 static void        gtk_rc_append_default_module_path (void);
 static void        gtk_rc_add_initial_default_files  (void);
 
@@ -330,32 +329,6 @@ gtk_rc_get_module_dir(void)
   return path;
 }
 
-static void
-gtk_rc_append_default_pixmap_path(void)
-{
-  gchar *var, *path;
-  gint n;
-
-#ifndef G_OS_WIN32
-  var = getenv("GTK_DATA_PREFIX");
-  if (var)
-    path = g_strdup_printf("%s%s", var, "/share/gtk/themes");
-  else
-    path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/gtk/themes");
-#else
-  path = g_strdup (get_themes_directory ());
-#endif      
-  
-  for (n = 0; pixmap_path[n]; n++) ;
-  if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1)
-    {
-      g_free (path);
-      return;
-    }
-  pixmap_path[n++] = path;
-  pixmap_path[n] = NULL;
-}
-
 static void
 gtk_rc_append_default_module_path(void)
 {
@@ -560,7 +533,6 @@ gtk_rc_init (void)
 
       pixmap_path[0] = NULL;
       module_path[0] = NULL;
-      gtk_rc_append_default_pixmap_path();
       gtk_rc_append_default_module_path();
       
       gtk_rc_add_initial_default_files ();
@@ -2313,7 +2285,6 @@ gtk_rc_parse_pixmap_path_string (gchar *pix_path)
        }
     }
   g_free (buf);
-  gtk_rc_append_default_pixmap_path();
 }
 
 static guint