From 6760cc72334346b8654fcd9fe1440890db55ac1b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 7 Nov 2008 22:25:30 +0000 Subject: Merge revisions 36730:36736 from trunk. svn path=/branches/kill-bonobo/; revision=36764 --- ChangeLog | 4 ++ NEWS | 84 ++++++++++++++++++++++++++++++++ configure.in | 4 +- e-util/ChangeLog | 37 ++++++++++++++ e-util/e-non-intrusive-error-dialog.c | 1 - plugins/groupwise-features/ChangeLog | 7 +++ plugins/groupwise-features/proxy-login.c | 2 +- po/ChangeLog | 8 +++ po/POTFILES.in | 1 + 9 files changed, 144 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8422a41733..0907509177 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-11-03 Srinivasa Ragavan + + * configure.in, NEWS: Evolution 2.25.1 release and version bump + 2008-11-03 Sankar P License Changed from GPL to LGPL diff --git a/NEWS b/NEWS index 020caf47d5..6bd61eb263 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,87 @@ +Evolution 2.25.1 2008-11-03 +--------------------------- + +New in 2.25.1: + New UI for Edit->Preferences->Autocompletion, to be able to setup whether show mail address for the autocompleted contact (Milan Crha) + +Bug Fixes: + #272391: New UI for Edit->Preferences->Autocompletion, with the checkbox for the key "/apps/evolution/addressbook/completion/show_address" to be able to setup whether show mail address for the autocompleted contact (Milan Crha) + #311479: Rephrasing the heading in Evolution Import Assistant (Kandepu Prasad) + #313225: Show meeting icon in 'Attachment' column on messages with '$has_cal' user flag set (Milan Crha) + #364542: Stop when camel operation has been canceled. Also check for cancellation when opening EBook, thus the UI (preview) will not freeze with slow address books. (Milan Crha) + #424818: (Novell Bugzilla) Integrate the mark-calendar-offline plugin into the main code as we already have a similar per-calendar option which does the same thing (Suman Manjunath) + #438155: Guard access to the 'regen' list with a lock (Milan Crha) + #497928: Set URI to empty string when user deletes previously selected source (Milan Crha) + #503898: Replace all occurences of the word "criteria" with "condition" (Matthew Barnes) + #511918: Use TRUE/FALSE texts for boolean values and do not free returned value for them, otherwise it crashes (Milan Crha) + #511947: Check for NULL values to prevent runtime warnings. (Milan Crha) + #514989: Calculate tomorrow from current time, not from the date to convert (Milan Crha) + #519491: Convert texts to valid UTF-8 texts before passing them to Gtk+ functions which requires that (Milan Crha) + #528816: We do not support vCalendar importer when we can parse the iCalendar from the file, because the latter holds more information, like timezones (Milan Crha) + #530606: Check validity of returned pointer before using it (Milan Crha) + #530691: Remove folders in its own thread, not in main thread (Milan Crha) + #530716: Differentiate between response with valid message pointer and with one already freed (Milan Crha) + #530872: Check for NULL soon enough to not crash (Milan Crha) + #535248: Check if log file has been opened successfully before using it (Milan Crha) + #541121: Improved itip formatter: allow replying to forwarded and already imported invitations; honor RVSP flag in invitation (Patrick Ohly) + #545045: Don't show SMTP in the Send/Receive dialogue if there are no unsent mails (Philip Withnall) + #548469: Drop support for deprecated libnm-glib (Matthew Barnes) + #549025: Restrict libmono linkage to the mono plugin, so that downstream packagers can isolate the mono dependency to a subpackage. Add configuration summary lines indicating whether the Mono and Python bindings are enabled (Matthew Barnes) + #550441: Use the proper functions to traverse messages in a folder's summary. Ignore if summary not there. (Milan Crha, Srinivasa Ragavan) + #551121: Standardise use of "SpamAssassin" vs. "spamassassin" or "Spamassassin". (Philip Withnall) + #552551: Add a NULL check for search_word before calling strcmp (Philip Withnall) + #552575: Register default callbacks to composer to be able to send/save draft (Milan Crha) + #552583: Do not hide auth_mech from the URL. (Sebastian Keller) + #552851: Add translator comments to the accept/decline strings, and improve some other strings in the file (Philip Withnall) + #553067, #553070, #553105, #553106: Mark some forgotten strings for translation (Gabor Kelemen) + #553148: Standardise "GroupWise" usage in translatable strings (Philip Withnall) + #553273: Always end e_error_run/e_error_new calls with NULL parameter (Milan Crha) + #553297: Do not try to access uninitialized variables (Milan Crha) + #553461, #553389: Rename the "SSH" option to "Secure FTP (SSH)" and update the code accordingly. Also, change a related string to use better terminology. (Philip Withnall) + #553479: String capitalisation improvements (Philip Withnall) + #553527: Do the EBook work in a separate thread to have better performance on reply with slow address books (Milan Crha) + #553609: Do not do any changes when the view has not been shown yet (Milan Crha) + #553715: Set end time for the event properly, not same as start time (Milan Crha) + #554107: Add "Subject - Trimmed" column which enables to read mailing list mails in a better way (Hans Petter Jansson) + #554297: Add translator comment to the occurrences of the Proxy term (Gabor Kelemen) + #554349: Expand threads and select messages, if user has given select-all (Sankar P) + #554418: Guess mime_type based on the filename only (Milan Crha) + #554458: Use content-type to call of g_app_info_get_all_for_type (Milan Crha) + #554548: French translation update (Hanka Zalska) + #554566: New function to update current selected rule (Lucian Langa) + #554664: Call attach_remote_file when knows the URI points to it. (Milan Crha) + #554832: Updated Spanish translation (Jorge Gonzalez) + #555203: Use the url value in cases where the account goes NULL. Fixes the issue of Exchange not sending mails, because it does not have a valid transport url to use (Bharath Acharya) + #555276: Don't load a vfolder as a sub folder (Srinivasa Ragavan) + #555494: Category icons are not themed. Load by file, not by icon name (Matthew Barnes) + #555775: Include e-util-private.h for Win32 redefinition of EVOLUTION_UIDIR and build the filename using it (Bharath Acharya) + #555958: Add the UI manager's accelerator group to the editor window so that menu shortcut keys work (Anis Elleuch) + #556059: Allow building outside the source tree (Matt Davey) + #556191: Remove org-gnome-mark-calendar-offline.eplug.xml (Matthew Barnes) + #556284: Fixes for fetching the store using mail_component_peek_local_store. Fixes the right-click crash issues caused on OS_WIN32 by Templates plugin (Bharath Acharya) + #557563: Updated German translation (Ronny Standke) + #558726: Fix a potential format string crash. (Frederic van Starbmann) + +Updated Translations: + Gabor Kelemen (hu) + Kenneth Nielsen (da) + Ivar Smolin (et) + Daniel Nylander (sv) + Mikel González (ast) + Ronny Standke (de) + Theppitak Karoonboonyanan (th) + Marcel Telka (sk) + Jorge Gonzalez (es) + Leonardo Ferreira Fontenelle (pt_BR) + Ignacio Casal Quinteiro (gl) + Ilkka Tuohela (fi) + Og Maciel (pt_BR) + Kjartan Maraas (nb) + Alexander Shopov (bg) + Wouter Bolsterlee (nl) + Goran Raki (sr, sr@latin) + Hari Vishnu (ml) + Evolution 2.24.0 2008-09-22 --------------------------- diff --git a/configure.in b/configure.in index 5389d69e70..afd2695b98 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.25.1, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution) +AC_INIT(evolution, 2.25.2, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution) AC_CONFIG_SRCDIR(README) # Some requirements have versioned package names @@ -1497,7 +1497,7 @@ else E_UTIL_X11_CFLAGS="" E_UTIL_X11_LIBS="" fi -EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS) +EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS) AC_SUBST(E_UTIL_CFLAGS) AC_SUBST(E_UTIL_LIBS) diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 00e2a0aac1..f61b43a003 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,40 @@ +<<<<<<< .working +======= +2008-11-04 Akhil Laddha + + * e-non-intrusive-error-dialog.c (eni_query_tooltip_cb), + (eni_render_pixbuf), (eni_render_date), (eni_append_logs), + (eni_config_get_error_level), (eni_config_get_error_timeout), + (eni_error_timeout_changed), (eni_error_level_value_changed), + (eni_show_logger): + * e-non-intrusive-error-dialog.h: + Missed commiting these files in the previous commit. + +2008-11-03 Ashish Shrivastava + + ** Support for Non-intrusive error in calendar. + + * Makefile.am: Added new files: + * e-non-intrusive-error-dialog.c, e-non-intrusive-error-dialog.h: + +2008-11-02 Matthew Barnes + + * e-util.c (do_format_number_as_float): + Remove this unused internal function. + +2008-10-30 Matthew Barnes + + * e-icon-factory.c: + Only include the toplevel GTK+ header. + +2008-10-29 Sankar P + +License Changes + + * e-plugin-ui.c: + * e-plugin-ui.h: + +>>>>>>> .merge-right.r36736 2008-10-06 Sankar P * widgets/table/e-cell-float.c: diff --git a/e-util/e-non-intrusive-error-dialog.c b/e-util/e-non-intrusive-error-dialog.c index 070c1e9bef..5fd98cacd2 100644 --- a/e-util/e-non-intrusive-error-dialog.c +++ b/e-util/e-non-intrusive-error-dialog.c @@ -305,4 +305,3 @@ eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, gtk_widget_show_all (window); } - diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog index 884301b517..9f9161496f 100644 --- a/plugins/groupwise-features/ChangeLog +++ b/plugins/groupwise-features/ChangeLog @@ -1,3 +1,10 @@ +2008-11-04 Sankar P + + ** Fix for bug bnc #434968 + + * plugins/groupwise-features/proxy-login.c: + Show correct icon for the proxy login dialog + 2008-10-17 Matthew Barnes * send-options.c (org_gnome_send-options): diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 1dc35e940b..46210d0956 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -441,7 +441,7 @@ proxy_login_update_tree (void) char *proxy_email; EGwConnection *cnc; proxyLoginPrivate *priv = pld->priv; - gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", 48); + gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", E_ICON_SIZE_DIALOG); broken_image = file_name ? gdk_pixbuf_new_from_file (file_name, NULL) : NULL; cnc = proxy_login_get_cnc (pld->account, priv->main ? (GTK_WINDOW (gtk_widget_get_toplevel (priv->main))) : NULL); diff --git a/po/ChangeLog b/po/ChangeLog index 849e2990df..8d83627df0 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,11 @@ +2008-11-03 Srinivasa Ragavan + + * POTFILES.in: Added addressbook/gui/component/autocompletion-config.c + +2008-11-03 Maxim Dziumanenko + + * uk.po: Update Ukrainian translation. + 2008-11-03 Leonardo Ferreira Fontenelle * pt_BR.po: Merged Brazilian Portuguese translation from branch diff --git a/po/POTFILES.in b/po/POTFILES.in index be71ad3d8c..204945c529 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -30,6 +30,7 @@ addressbook/gui/component/addressbook-migrate.c addressbook/gui/component/addressbook-view.c addressbook/gui/component/addressbook.c addressbook/gui/component/apps_evolution_addressbook.schemas.in +addressbook/gui/component/autocompletion-config.c addressbook/gui/component/ldap-config.glade addressbook/gui/contact-editor/contact-editor.glade addressbook/gui/contact-editor/e-contact-editor-address.c -- cgit v1.2.3