From cb26587ff86340697343b0388694306fea769460 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 31 Jan 2002 20:14:18 +0000 Subject: Install a Default RC file that sets the tooltips color to yellow. (#58542) Thu Jan 31 14:50:16 2002 Owen Taylor * gtk/gtkrc.default gtk/Makefile.am: Install a Default RC file that sets the tooltips color to yellow. (#58542) * gtk/gtksettings.c (gtk_settings_class_init): make the default theme "Default", not NULL. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/Makefile.am | 8 ++++---- gtk/gtksettings.c | 2 +- 9 files changed, 61 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 089dd01ec..87fd763d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Jan 31 14:50:16 2002 Owen Taylor + + * gtk/gtkrc.default gtk/Makefile.am: Install a Default + RC file that sets the tooltips color to yellow. (#58542) + + * gtk/gtksettings.c (gtk_settings_class_init): make + the default theme "Default", not NULL. + Thu Jan 31 11:33:52 2002 Owen Taylor * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 089dd01ec..87fd763d2 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Thu Jan 31 14:50:16 2002 Owen Taylor + + * gtk/gtkrc.default gtk/Makefile.am: Install a Default + RC file that sets the tooltips color to yellow. (#58542) + + * gtk/gtksettings.c (gtk_settings_class_init): make + the default theme "Default", not NULL. + Thu Jan 31 11:33:52 2002 Owen Taylor * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 089dd01ec..87fd763d2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Thu Jan 31 14:50:16 2002 Owen Taylor + + * gtk/gtkrc.default gtk/Makefile.am: Install a Default + RC file that sets the tooltips color to yellow. (#58542) + + * gtk/gtksettings.c (gtk_settings_class_init): make + the default theme "Default", not NULL. + Thu Jan 31 11:33:52 2002 Owen Taylor * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 089dd01ec..87fd763d2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Thu Jan 31 14:50:16 2002 Owen Taylor + + * gtk/gtkrc.default gtk/Makefile.am: Install a Default + RC file that sets the tooltips color to yellow. (#58542) + + * gtk/gtksettings.c (gtk_settings_class_init): make + the default theme "Default", not NULL. + Thu Jan 31 11:33:52 2002 Owen Taylor * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 089dd01ec..87fd763d2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Thu Jan 31 14:50:16 2002 Owen Taylor + + * gtk/gtkrc.default gtk/Makefile.am: Install a Default + RC file that sets the tooltips color to yellow. (#58542) + + * gtk/gtksettings.c (gtk_settings_class_init): make + the default theme "Default", not NULL. + Thu Jan 31 11:33:52 2002 Owen Taylor * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 089dd01ec..87fd763d2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Thu Jan 31 14:50:16 2002 Owen Taylor + + * gtk/gtkrc.default gtk/Makefile.am: Install a Default + RC file that sets the tooltips color to yellow. (#58542) + + * gtk/gtksettings.c (gtk_settings_class_init): make + the default theme "Default", not NULL. + Thu Jan 31 11:33:52 2002 Owen Taylor * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 089dd01ec..87fd763d2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Thu Jan 31 14:50:16 2002 Owen Taylor + + * gtk/gtkrc.default gtk/Makefile.am: Install a Default + RC file that sets the tooltips color to yellow. (#58542) + + * gtk/gtksettings.c (gtk_settings_class_init): make + the default theme "Default", not NULL. + Thu Jan 31 11:33:52 2002 Owen Taylor * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix diff --git a/gtk/Makefile.am b/gtk/Makefile.am index bcdcb3d41..dce331ac3 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -581,14 +581,13 @@ libgtk_target_ldflags = $(gtk_win32_symbols) -lwsock32 endif EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la libgtk-win32-1.3.la - -# We create a dummy theme for the default GTK+ theme +# Install a RC file for the default GTK+ theme install-data-local: install-ms-lib install-libtool-import-lib $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0 - echo "# Empty gtkrc for default theme" > $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc - rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc + $(INSTALL) gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib + rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la $(top_builddir)/gdk/$(gdktargetlib) @@ -628,6 +627,7 @@ EXTRA_DIST += @STRIP_BEGIN@ \ gtk.def \ gtk-win32.rc \ gtk-win32.rc.in \ + gtkrc.default \ makefile.mingw \ makefile.mingw.in \ makefile.msc \ diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 5832a1bbe..14f44f1ca 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -178,7 +178,7 @@ gtk_settings_class_init (GtkSettingsClass *class) g_param_spec_string ("gtk-theme-name", _("Theme Name"), _("Name of theme RC file to load"), - NULL, + "Default", G_PARAM_READWRITE), NULL); g_assert (result == PROP_THEME_NAME); -- cgit v1.2.1