aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog12
-rw-r--r--calendar/cal-client/Makefile.am15
-rw-r--r--calendar/gui/Makefile.am3
-rw-r--r--calendar/gui/dialogs/task-editor.c10
-rw-r--r--calendar/gui/event-editor.c30
5 files changed, 37 insertions, 33 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 737de50376..a5eb43042f 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2000-11-03 Federico Mena Quintero <federico@helixcode.com>
+
+ * gui/Makefile.am: Clean the idl-generated sources properly.
+ * cal-client/Makefile.am: Likewise.
+
+2000-11-02 Federico Mena Quintero <federico@helixcode.com>
+
+ * gui/dialogs/task-editor.c (init_widgets): The date editor's
+ signal is now "changed".
+ (completed_changed): Renamed callback to reflect the name of the
+ signal.
+
2000-11-01 Gediminas Paulauskas <menesis@delfi.lt>
* gui/main.c: (main): added call to bindtextdomain and textdomain, so
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index 56757e3946..dd5f3e60d2 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -71,16 +71,5 @@ client_test_LDADD = \
$(top_builddir)/libical/src/libical/libical.a \
libcal-client.la
-
-
-
-
-
-
-
-
-
-
-
-
-
+BUILT_SOURCES = $(CORBA_GENERATED)
+CLEANFILES += $(BUILT_SOURCES)
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 87b61977dd..df1391fa36 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -160,3 +160,6 @@ evolution-calendar.pure: evolution-calendar
$(PLINK) $(evolution_calendar_LDFLAGS) $(evolution_calendar_OBJECTS) $(evolution_calendar_LDADD) $(LIBS)
endif
+
+BUILT_SOURCES = $(IDL_GENERATED)
+CLEANFILES += $(BUILT_SOURCES)
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 8ae2c7d1d6..f26bae2e09 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -158,7 +158,7 @@ static int priority_index_to_value (TaskEditorPriority priority);
static int status_string_to_value (const char *status_string);
static const char* status_value_to_string (int status);
-static void completed_date_changed (EDateEdit *dedit,
+static void completed_changed (EDateEdit *dedit,
TaskEditor *tedit);
static void status_changed (GtkMenu *menu,
TaskEditor *tedit);
@@ -424,10 +424,8 @@ init_widgets (TaskEditor *tedit)
/* Connect signals. The Status, Percent Complete & Date Completed
properties are closely related so whenever one changes we may need
to update the other 2. */
- gtk_signal_connect (GTK_OBJECT (priv->completed_date), "date_changed",
- GTK_SIGNAL_FUNC (completed_date_changed), tedit);
- gtk_signal_connect (GTK_OBJECT (priv->completed_date), "time_changed",
- GTK_SIGNAL_FUNC (completed_date_changed), tedit);
+ gtk_signal_connect (GTK_OBJECT (priv->completed_date), "changed",
+ GTK_SIGNAL_FUNC (completed_changed), tedit);
gtk_signal_connect (GTK_OBJECT (GTK_OPTION_MENU (priv->status)->menu),
"deactivate",
@@ -1083,7 +1081,7 @@ status_value_to_string (int status)
static void
-completed_date_changed (EDateEdit *dedit,
+completed_changed (EDateEdit *dedit,
TaskEditor *tedit)
{
TaskEditorPrivate *priv;
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
index fc3764e102..19a170a90f 100644
--- a/calendar/gui/event-editor.c
+++ b/calendar/gui/event-editor.c
@@ -753,8 +753,8 @@ sync_entries (GtkEditable *source, GtkEditable *dest)
gtk_signal_handler_unblock_by_data (GTK_OBJECT (dest), source);
}
-/* Syncs the contents of two date editor widgets, while blocking signals from
- * each other.
+/* Syncs the contents of two date editor widgets, while blocking signals on the
+ * specified data.
*/
static void
sync_date_edits (EDateEdit *source, EDateEdit *dest)
@@ -805,9 +805,9 @@ init_widgets (EventEditor *ee)
/* Start dates in the main and recurrence pages */
- gtk_signal_connect (GTK_OBJECT (priv->start_time), "date_changed",
+ gtk_signal_connect (GTK_OBJECT (priv->start_time), "changed",
GTK_SIGNAL_FUNC (start_date_changed_cb), priv->recurrence_starting_date);
- gtk_signal_connect (GTK_OBJECT (priv->recurrence_starting_date), "date_changed",
+ gtk_signal_connect (GTK_OBJECT (priv->recurrence_starting_date), "changed",
GTK_SIGNAL_FUNC (start_date_changed_cb), priv->start_time);
/* Start and end times */
@@ -923,7 +923,7 @@ clear_widgets (EventEditor *ee)
gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
- e_date_edit_set_time (E_DATE_EDIT (priv->start_time), now);
+ e_date_edit_set_time (E_DATE_EDIT (priv->start_time), now); /* will set recur start too */
e_date_edit_set_time (E_DATE_EDIT (priv->end_time), now);
gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
@@ -1253,9 +1253,6 @@ fill_widgets (EventEditor *ee)
/* Start and end times */
- gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
- gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
-
/* All-day events are inclusive, i.e. if the end date shown is 2nd Feb
then the event includes all of the 2nd Feb. We would normally show
3rd Feb as the end date, since it really ends at midnight on 3rd,
@@ -1270,7 +1267,10 @@ fill_widgets (EventEditor *ee)
dtend = time_add_day (dtend, -1);
}
- e_date_edit_set_time (E_DATE_EDIT (priv->start_time), dtstart);
+ gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
+ gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
+
+ e_date_edit_set_time (E_DATE_EDIT (priv->start_time), dtstart); /* will set recur start too */
e_date_edit_set_time (E_DATE_EDIT (priv->end_time), dtend);
gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
@@ -2260,8 +2260,8 @@ set_all_day (GtkWidget *toggle, EventEditor *ee)
else
start_tm.tm_hour = day_begin;
- e_date_edit_set_time (E_DATE_EDIT (priv->start_time),
- mktime (&start_tm));
+ /* will set recur start too */
+ e_date_edit_set_time (E_DATE_EDIT (priv->start_time), mktime (&start_tm));
end_t = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
end_tm = *localtime (&end_t);
@@ -2317,7 +2317,7 @@ check_dates (EDateEdit *dedit, EventEditor *ee)
tm_start.tm_mon = tm_end.tm_mon;
tm_start.tm_mday = tm_end.tm_mday;
-#if 0
+#if 0 /* FIXME: is this right? */
gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
e_date_edit_set_time (E_DATE_EDIT (priv->start_time),
mktime (&tm_start));
@@ -2377,8 +2377,10 @@ check_times (EDateEdit *dedit, EventEditor *ee)
}
gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
- e_date_edit_set_time (E_DATE_EDIT (priv->start_time),
- mktime (&tm_start));
+
+ /* will set recur start too */
+ e_date_edit_set_time (E_DATE_EDIT (priv->start_time), mktime (&tm_start));
+
gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 16:04:45 +0800