diff options
| author | JP Rosevear <jpr@src.gnome.org> | 2005-03-15 10:54:10 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2005-03-15 10:54:10 +0800 |
| commit | ca63caf245590c8725255e5be842cbf1123641f9 (patch) | |
| tree | 690f9cde3a5d7af12fbd126e97a47f508f9d3c53 /calendar | |
| parent | d9e4b12a581e71d6f11747568a302eceb65dff7c (diff) | |
| download | gsoc2013-evolution-ca63caf245590c8725255e5be842cbf1123641f9.tar gsoc2013-evolution-ca63caf245590c8725255e5be842cbf1123641f9.tar.gz gsoc2013-evolution-ca63caf245590c8725255e5be842cbf1123641f9.tar.bz2 gsoc2013-evolution-ca63caf245590c8725255e5be842cbf1123641f9.tar.lz gsoc2013-evolution-ca63caf245590c8725255e5be842cbf1123641f9.tar.xz gsoc2013-evolution-ca63caf245590c8725255e5be842cbf1123641f9.tar.zst gsoc2013-evolution-ca63caf245590c8725255e5be842cbf1123641f9.zip | |
Merge from 2.10 branch
svn path=/trunk/; revision=29019
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 4 | ||||
| -rw-r--r-- | calendar/calendar-errors.xml.h | 2 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 2 | ||||
| -rw-r--r-- | calendar/gui/calendar-component.c | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 8c355e81ee..e9ce944b24 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -38,6 +38,10 @@ (comp_editor_notify_client_changed):Assign the updated client to priv->client and unref the old one. +2005-03-07 JP Rosevear <jpr@novell.com> + + * gui/alarm-notify/alarm-queue.c: add remove_client_alarms prototype + 2005-03-06 Rodrigo Moya <rodrigo@novell.com> * gui/dialogs/recur-comp.c (recur_component_dialog): disable dialog for diff --git a/calendar/calendar-errors.xml.h b/calendar/calendar-errors.xml.h index 963f7d251d..926a2acf1b 100644 --- a/calendar/calendar-errors.xml.h +++ b/calendar/calendar-errors.xml.h @@ -143,4 +143,4 @@ char *s = N_("Server Version"); /* calendar:server-version primary */ char *s = N_("Your server needs to be updated"); /* calendar:server-version secondary */ -char *s = N_(" Some features may not work correctly with your current server version"); +char *s = N_(" Some features may not work correctly with your current server version "); diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 2d73b45ad8..9b62f131de 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -131,6 +131,8 @@ static void procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpoin static void query_objects_changed_cb (ECal *client, GList *objects, gpointer data); static void query_objects_removed_cb (ECal *client, GList *objects, gpointer data); +static void remove_client_alarms (ClientAlarms *ca); + /* Alarm queue engine */ diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index fd838385d8..ea227f3211 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -559,7 +559,7 @@ popup_event_cb(ESourceSelector *selector, ESource *insource, GdkEventButton *eve group = e_source_selector_get_primary_source_group (selector); g_object_ref (group); - ((EPopupItem) ecc_source_popups [0]).user_data = group; + ecc_source_popups [0].user_data = group; menus = g_slist_prepend (menus, &ecc_source_popups [0]); } else { |