diff options
| author | Owen Taylor <otaylor@redhat.com> | 1998-11-13 21:28:36 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-11-13 21:28:36 +0000 |
| commit | a0ca2a7b0d905c7aa4eba64d213853afa3e87e33 (patch) | |
| tree | 9537aa88ace45d6d1172aa58e720568b7e8e2547 /gtk/gtkrc.c | |
| parent | 8b621ad059cf6727c5a23942beed1ad180cc7b84 (diff) | |
| download | gdk-pixbuf-a0ca2a7b0d905c7aa4eba64d213853afa3e87e33.tar.gz | |
New function gdk_pixmap_foreign_new(). (gtk-blizzard-981005-0. Christopher
Fri Nov 13 11:22:38 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixmap.c: New function gdk_pixmap_foreign_new().
(gtk-blizzard-981005-0.
Christopher Blizzard <blizzard@applied-theory.com)
* gdk/gdk.h gdk/gdkx.h: Moved gdk_window_foreign_new and
gdk_pixmap_foreign_new to gdkx.h.
Fri Nov 13 16:06:48 1998 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Added rules to generate an empty
GTK+ theme called "Default" upon installation.
* gtk/gtkrc.c (gtk_rc_parse_style): Fix inheritance
of fonts and fontsets.
(gtk-matsu-980924. Takashi Matsuda matsu@arch.comp.kyutech.ac.jp)
* gtk/gtkmain.c: Change test to detect glibc's
utf8 based mb* functions to be more specific.
* gtk/gtkwindow.[ch] gtk/gtkfixed.c: Indentation
cleanups.
Diffstat (limited to 'gtk/gtkrc.c')
| -rw-r--r-- | gtk/gtkrc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index fb006fb24..59dc6f481 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -1117,14 +1117,16 @@ gtk_rc_parse_style (GScanner *scanner) rc_style->base[i] = parent_style->base[i]; } - if (rc_style->fontset_name) + if (parent_style->fontset_name) { - g_free (rc_style->fontset_name); + if (rc_style->fontset_name) + g_free (rc_style->fontset_name); rc_style->fontset_name = g_strdup (parent_style->fontset_name); } - else if (rc_style->font_name) + else if (parent_style->font_name) { - g_free (rc_style->font_name); + if (rc_style->font_name) + g_free (rc_style->font_name); rc_style->font_name = g_strdup (parent_style->font_name); } |