aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/prop.c5
-rw-r--r--calendar/prop.c5
3 files changed, 9 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 81cec3d366..8b76a9df4f 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+1998-04-30 Miguel de Icaza <miguel@nuclecu.unam.mx>
+
+ * prop.c (prop_apply): Do not call prop_cancel, ths is now using
+ GnomePropertyDialog.
+
1998-04-29 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gncal-week-view.c (sync_week): Use gnome_calendar_tag_calendar.
diff --git a/calendar/gui/prop.c b/calendar/gui/prop.c
index 8032e919f1..9021947a75 100644
--- a/calendar/gui/prop.c
+++ b/calendar/gui/prop.c
@@ -62,7 +62,7 @@ prop_cancel (void)
}
static void
-prop_ok (void)
+prop_apply (void)
{
day_begin = GTK_ADJUSTMENT (sa)->value;
day_end = GTK_ADJUSTMENT (ea)->value;
@@ -74,7 +74,6 @@ prop_ok (void)
gnome_config_sync ();
- prop_cancel ();
day_range_changed ();
}
@@ -145,7 +144,7 @@ properties (void)
GTK_SIGNAL_FUNC (prop_cancel), NULL);
gtk_signal_connect (GTK_OBJECT (prop_win), "apply",
- GTK_SIGNAL_FUNC (prop_ok), NULL);
+ GTK_SIGNAL_FUNC (prop_apply), NULL);
gtk_widget_show_all (prop_win);
}
diff --git a/calendar/prop.c b/calendar/prop.c
index 8032e919f1..9021947a75 100644
--- a/calendar/prop.c
+++ b/calendar/prop.c
@@ -62,7 +62,7 @@ prop_cancel (void)
}
static void
-prop_ok (void)
+prop_apply (void)
{
day_begin = GTK_ADJUSTMENT (sa)->value;
day_end = GTK_ADJUSTMENT (ea)->value;
@@ -74,7 +74,6 @@ prop_ok (void)
gnome_config_sync ();
- prop_cancel ();
day_range_changed ();
}
@@ -145,7 +144,7 @@ properties (void)
GTK_SIGNAL_FUNC (prop_cancel), NULL);
gtk_signal_connect (GTK_OBJECT (prop_win), "apply",
- GTK_SIGNAL_FUNC (prop_ok), NULL);
+ GTK_SIGNAL_FUNC (prop_apply), NULL);
gtk_widget_show_all (prop_win);
}