AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Owen Taylor 2000-07-14 20:20:03 +00:00 committed by Owen Taylor
parent bb26890024
commit ed7408e1ff
8 changed files with 56 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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>

9
ChangeLog.pre-2-0
View File

@ -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>

9
ChangeLog.pre-2-10
View File

@ -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>

9
ChangeLog.pre-2-2
View File

@ -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>

9
ChangeLog.pre-2-4
View File

@ -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>

9
ChangeLog.pre-2-6
View File

@ -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>

9
ChangeLog.pre-2-8
View File

@ -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>

29
gtk/gtkrc.c
View File

@ -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