Re: [evolution-patches] Removal of duplicated files in evolution/e-util, possible partly fix for bug #323529e

["Veerapuram Varadhan" <vvaradhan novell com>]

On Fri, 2005-12-09 at 08:54 +0000, Irene Huang  wrote:
> Index: e-util/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
> retrieving revision 1.563
> diff -u -r1.563 ChangeLog
> --- e-util/ChangeLog    26 Nov 2005 03:51:16 -0000      1.563
> +++ e-util/ChangeLog    9 Dec 2005 08:34:07 -0000
> @@ -1,3 +1,17 @@
> +2005-12-09  set REAL_NAME environment variable  <set EMAIL_ADDRESS
> environment variable>
> +
> +       reviewed by: <delete if not using a buddy>
> +
> +       * Makefile.am: Remove e-list.[c|h], e-list-iterator.[c|h] and
> +       e-iterator.[c|h].
> +       * e-list-iterator.h:
> +       * e-list.h:
> +       * e-signature-list.h:
> +       Change inclusion of <e-util/e-list.h> to
> <libedataserver/e-list.h>,
> +       <e-util/e-list-iterator.h> to
> <libedataserver/e-list-iterator.h> 
> +       and  <e-util/e-iterator.h>
> +       to <libedataserver/e-iterator.h>.
> +
>  2005-11-26  Tor Lillqvist  <tml novell com>
>  

I guess that is a *generic* header, unless otherwise you missed to run
some tools to put your name there. :-)

>         * e-dialog-utils.c
> Index: e-util/e-list-iterator.h
> ===================================================================
> RCS file: /cvs/gnome/evolution/e-util/e-list-iterator.h,v
> retrieving revision 1.4
> diff -u -r1.4 e-list-iterator.h
> --- e-util/e-list-iterator.h    3 Nov 2002 05:46:46 -0000       1.4
> +++ e-util/e-list-iterator.h    9 Dec 2005 08:34:07 -0000
> @@ -18,8 +18,8 @@
>  #include <glib.h>
>  #include <glib-object.h>
>  
> -#include <e-util/e-iterator.h>
> -#include <e-util/e-list.h>
> +#include <libedataserver/e-iterator.h>
> +#include <libedataserver/e-list.h>
>  
>  #define E_TYPE_LIST_ITERATOR            (e_list_iterator_get_type ())
>  #define E_LIST_ITERATOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST
> ((obj), E_TYPE_LIST_ITERATOR, EListIterator))
> Index: e-util/e-list.h
> ===================================================================
> RCS file: /cvs/gnome/evolution/e-util/e-list.h,v
> retrieving revision 1.7
> diff -u -r1.7 e-list.h
> --- e-util/e-list.h     16 Jan 2003 19:38:44 -0000      1.7
> +++ e-util/e-list.h     9 Dec 2005 08:34:07 -0000
> @@ -17,7 +17,7 @@
>  #include <time.h>
>  #include <glib.h>
>  #include <glib-object.h>
> -#include <e-util/e-list-iterator.h>
> +#include <libedataserver/e-list-iterator.h>
>  
>  #define E_TYPE_LIST            (e_list_get_type ())
>  #define E_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj),
> E_TYPE_LIST, EList))
> Index: e-util/e-signature-list.h
> ===================================================================
> RCS file: /cvs/gnome/evolution/e-util/e-signature-list.h,v
> retrieving revision 1.2
> diff -u -r1.2 e-signature-list.h
> --- e-util/e-signature-list.h   12 Apr 2004 17:43:33 -0000      1.2
> +++ e-util/e-signature-list.h   9 Dec 2005 08:34:07 -0000
> @@ -24,7 +24,7 @@
>  #ifndef __E_SIGNATURE_LIST__
>  #define __E_SIGNATURE_LIST__
>  
> -#include <e-util/e-list.h>
> +#include <libedataserver/e-list.h>
>  #include <e-util/e-signature.h>
>  
>  #include <gconf/gconf-client.h>
> 

I guess we don't need to change these files anymore as they are
expiring. 

> Index: ./widgets/menus/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/widgets/menus/Makefile.am,v
> retrieving revision 1.6
> diff -u -r1.6 Makefile.am
> --- ./widgets/menus/Makefile.am 17 Jun 2005 15:20:32 -0000      1.6
> +++ ./widgets/menus/Makefile.am 8 Dec 2005 13:54:45 -0000
> @@ -9,7 +9,8 @@
>         $(EXTRA_GNOME_CFLAGS)                   \
>         $(GNOME_INCLUDEDIR)                     \
>         $(ICONV_CFLAGS)                         \
> -       $(GNOME_FULL_CFLAGS)
> +       $(GNOME_FULL_CFLAGS)                    \
> +       $(E_WIDGETS_CFLAGS)

I guess the diff is not for current HEAD.  Kindly recheck.

Apart from the above mentioned changes, the patch looks good to commit.


Thanks,

V. Varadhan