diff options
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/gnome-month-item.c | 2 | ||||
| -rw-r--r-- | calendar/gui/gnome-month-item.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 7f71d04c2a..f592cc8569 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +1999-07-16 Miguel de Icaza <miguel@gnu.org> + + * gnome-month-item.c (gnome_month_item_set_arg): Merge fix from + gnome-pim-1-0: Fixed cut&paste bug for day fontsets. + 1999-07-14 Miguel de Icaza <miguel@gnu.org> * calobj.c (ical_gen_uid): Returns a UID. diff --git a/calendar/gnome-month-item.c b/calendar/gnome-month-item.c index ec799112de..4b8a9d75ac 100644 --- a/calendar/gnome-month-item.c +++ b/calendar/gnome-month-item.c @@ -1020,7 +1020,7 @@ gnome_month_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) case ARG_DAY_FONTSET: gdk_font_unref (mitem->day_font); - mitem->head_font = gdk_fontset_load (GTK_VALUE_STRING (*arg)); + mitem->day_font = gdk_fontset_load (GTK_VALUE_STRING (*arg)); if (!mitem->day_font) { mitem->day_font = gdk_fontset_load ("-*-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*"); diff --git a/calendar/gui/gnome-month-item.c b/calendar/gui/gnome-month-item.c index ec799112de..4b8a9d75ac 100644 --- a/calendar/gui/gnome-month-item.c +++ b/calendar/gui/gnome-month-item.c @@ -1020,7 +1020,7 @@ gnome_month_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) case ARG_DAY_FONTSET: gdk_font_unref (mitem->day_font); - mitem->head_font = gdk_fontset_load (GTK_VALUE_STRING (*arg)); + mitem->day_font = gdk_fontset_load (GTK_VALUE_STRING (*arg)); if (!mitem->day_font) { mitem->day_font = gdk_fontset_load ("-*-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*"); |