aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@src.gnome.org>2005-03-15 10:54:10 +0800
committerJP Rosevear <jpr@src.gnome.org>2005-03-15 10:54:10 +0800
commitca63caf245590c8725255e5be842cbf1123641f9 (patch)
tree690f9cde3a5d7af12fbd126e97a47f508f9d3c53
parentd9e4b12a581e71d6f11747568a302eceb65dff7c (diff)
downloadgsoc2013-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
-rw-r--r--ChangeLog4
-rw-r--r--NEWS28
-rw-r--r--calendar/ChangeLog4
-rw-r--r--calendar/calendar-errors.xml.h2
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c2
-rw-r--r--calendar/gui/calendar-component.c2
-rw-r--r--configure.in8
7 files changed, 44 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9bbcf5c99b..381e930b62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-07 JP Rosevear <jpr@novell.com>
+
+ * configure.in: bump version, requires
+
2005-02-28 JP Rosevear <jpr@novell.com>
* configure.in: bump version, requires
diff --git a/NEWS b/NEWS
index a3866bbdbb..7b5d4b2d0e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+Evolution 2.2.0, 2005-03-07
+---------------------------
+
+Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
+
+ * Addressbook
+ #73152 - Assigning Color To Default Personal Contacts, Creates Duplicate (Siva)
+
+ * Calendar
+ #72835 - Alarm notify crashes always (Rodrigo)
+ #73152 - Assigning Color To Default Personal Calendar, Creates Duplicate (Siva)
+
+Other bugs
+
+ * Plugins
+ - Fix exchange plugin description for OOF (Sushma)
+
+Updated translations:
+ - pt_BR (Raphael Higino)
+ - hu (Laszlo Dvornik)
+ - sr (Danilo Segan, Igor Nestorovic)
+ - sr@Latn (Danilo Segan, Igor Nestorovic)
+ - nl (Tino Meinen)
+ - lt (Zygimantas Berucka)
+ - sq (Gintautas Miliauskas, Laurent Dhima)
+ - ja (Takeshi AIHANA)
+ - bg (Iassen Pramataro)
+
Evolution 2.1.6, 2005-02-28
---------------------------
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 {
diff --git a/configure.in b/configure.in
index 362a58bbdb..5dceebef26 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT(evolution, 2.1.6, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.2.0, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
AC_CONFIG_SRCDIR(README)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -1098,11 +1098,11 @@ fi
dnl --- Required version numbers
-GAL_REQUIRED=2.3.5
+GAL_REQUIRED=2.4.0
GAL_PACKAGE=2.4
-GTKHTML_REQUIRED=3.5.7
+GTKHTML_REQUIRED=3.6.0
GTKHTML_PACKAGE=3.6
-EDS_REQUIRED=1.1.6
+EDS_REQUIRED=1.2.0
EDS_PACKAGE=1.2
BONOBOUI_REQUIRED=2.4.2
GNOME_VFS_REQUIRED=2.4