diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | calendar/gui/e-itip-control.c | 6 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | mail/mail-errors.xml.h | 7 |
5 files changed, 28 insertions, 8 deletions
@@ -1,3 +1,7 @@ +2004-08-27 JP Rosevear <jpr@novell.com> + + * configure.in: bump version, requirements + 2004-08-23 Jeffrey Stedfast <fejj@novell.com> * configure.in: Added some comments about --enable-openssl @@ -6,6 +10,7 @@ 2004-08-18 Kjartan Maraas <kmaraas@gnome.org> * configure.in: Added «nb» to ALL_LINGUAS. + 2004-08-13 JP Rosevear <jpr@novell.com> * configure.in: bump version. requires @@ -1,4 +1,4 @@ -Evolution 1.5.94, xxxx-xx-xx +Evolution 1.5.94, 2004-08-27 ---------------------------- Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi): @@ -44,6 +44,12 @@ Other bugs - Crash in em-utils on GtkFileChooser with no name selected (Hans Petter) + * Misc + + - avoid warnings on dialogs with GTK 2.4 (Frederic) + - upgrade egg tray icon (Rodrigo) + - fix memory corruption when pilot syncing tasks/events (JP) + Evolution 1.4.1, 2003-06-25 --------------------------- diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 983b56b4e0..ac12316988 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -2192,16 +2192,20 @@ rsvp_clicked_cb (GtkWidget *widget, gpointer data) priv = itip->priv; - priv->rsvp = TRUE; + priv->rsvp = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); } static void insert_rsvp (GtkWidget *hbox, EItipControl *itip) { + EItipControlPrivate *priv; GtkWidget *btn; + + priv = itip->priv; btn = gtk_check_button_new_with_label ("RSVP"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (btn), TRUE); + priv->rsvp = TRUE; g_signal_connect (btn, "clicked", G_CALLBACK (rsvp_clicked_cb), itip); diff --git a/configure.in b/configure.in index 4ae97af8a3..fb45f3dc35 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, 1.5.93, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution) +AC_INIT(evolution, 1.5.94, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution) AC_CONFIG_SRCDIR(README) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) @@ -1043,9 +1043,9 @@ fi dnl --- Required version numbers -GAL_REQUIRED=2.1.14 -GTKHTML_REQUIRED=3.1.20 -EDS_REQUIRED=0.0.98 +GAL_REQUIRED=2.2.0 +GTKHTML_REQUIRED=3.2.0 +EDS_REQUIRED=0.0.99 BONOBOUI_REQUIRED=2.4.2 AC_SUBST(GAL_REQUIRED) @@ -1147,7 +1147,7 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) fi dnl --- evolution-calendar flags -EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.2 >= 2.1.8) +EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.2 >= 2.2.0) AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) diff --git a/mail/mail-errors.xml.h b/mail/mail-errors.xml.h index 4cc60de336..e2eed775d3 100644 --- a/mail/mail-errors.xml.h +++ b/mail/mail-errors.xml.h @@ -231,4 +231,9 @@ char *s = N_("Ignore"); char *s = N_("_Overwrite"); char *s = N_("_Append"); /* mail:gw-accountsetup-error primary */ -char *s = N_("Could not connect to {0}. Groupwise account setup is incomplete. You may need to setup the account again"); +char *s = N_("Unable to connect to the GroupWise\n" + "server."); +/* mail:gw-accountsetup-error secondary */ +char *s = N_("\n" + "Please check your account settings and try again.\n" + ""); |