diff options
author | Owen Taylor <otaylor@redhat.com> | 2000-07-14 20:20:03 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2000-07-14 20:20:03 +0000 |
commit | ed7408e1ff3b2fcb59b1566b80c1af29d1b40367 (patch) | |
tree | 36f035b1c66d56a0e354fdce186e85059a602cb5 | |
parent | bb268900245f3760ccd65c33d53602ab53fe2752 (diff) | |
download | gdk-pixbuf-ed7408e1ff3b2fcb59b1566b80c1af29d1b40367.tar.gz |
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.
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 9 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 9 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 9 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
-rw-r--r-- | gtk/gtkrc.c | 29 |
8 files changed, 56 insertions, 36 deletions
@@ -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 dbe40ce79..ed7b7efad 100644 --- 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 dbe40ce79..ed7b7efad 100644 --- 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 dbe40ce79..ed7b7efad 100644 --- 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 dbe40ce79..ed7b7efad 100644 --- 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 dbe40ce79..ed7b7efad 100644 --- 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 dbe40ce79..ed7b7efad 100644 --- 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 41c6b2e29..d693edfdd 100644 --- 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); @@ -331,32 +330,6 @@ gtk_rc_get_module_dir(void) } 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) { gchar *var, *path; @@ -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 |