[evolution-patches] Re: [Evolution-hackers] about #40762

[Li Yuan <Li Yuan Sun COM>]

Hi, HPJ

   Could you help me to review the addressbook's part?
   Thank you very much.

Li

Li Yuan wrote:

> here is the patch. please help me to review it, thanks.
>
> Li
>
> JP Rosevear wrote:
>
> > On Fri, 2005-03-04 at 17:20 +0800, Li Yuan wrote:
> >  
> >
> > > Hi JP,
> > >
> > > About #40762, we can popup a dialog or just disable the edit button.
> > > I already had a patch to disable the edit button.
> > > Which one do you prefer?
> > >   
> >
> >
> > We talked in IRC, but to re-iterate, I prefer the latter.
> >
> > -JP
> >  
>
> ------------------------------------------------------------------------
>
> Index: addressbook/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
> retrieving revision 1.1927
> diff -u -r1.1927 ChangeLog
> --- addressbook/ChangeLog	5 Mar 2005 08:40:50 -0000	1.1927
> +++ addressbook/ChangeLog	16 Mar 2005 04:55:49 -0000
> @@ -1,3 +1,10 @@
> +2005-03-16  Li Yuan  <li yuan sun com>
> +
> +	* gui/widgets/gal-view-minicard.c: (gal_view_minicard_class_init):
> +	remove the edit function.
> +
> +	Fixes #40762
> +
> 2005-03-03   Sivaiah Nallagatla <snallagatla novell com>
>
> 	* gui/component/addressbook.c (load_source_auth_cb):
> Index: addressbook/gui/widgets/gal-view-minicard.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/gal-view-minicard.c,v
> retrieving revision 1.12
> diff -u -r1.12 gal-view-minicard.c
> --- addressbook/gui/widgets/gal-view-minicard.c	14 Aug 2003 07:18:17 -0000	1.12
> +++ addressbook/gui/widgets/gal-view-minicard.c	16 Mar 2005 04:55:52 -0000
> @@ -17,12 +17,6 @@
>
> static GalViewClass *gal_view_minicard_parent_class;
>
> -static void
> -gal_view_minicard_edit            (GalView *view, GtkWindow *parent_window)
> -{
> -	/* GalViewMinicard *minicard_view = GAL_VIEW_MINICARD(view); */
> -}
> -
> static void  
> gal_view_minicard_load (GalView *view,
> 			const char *filename)
> @@ -106,7 +100,7 @@
> 	GalViewClass *gal_view_class  = GAL_VIEW_CLASS(object_class);
> 	gal_view_minicard_parent_class  = g_type_class_ref (PARENT_TYPE);
>
> -	gal_view_class->edit          = gal_view_minicard_edit         ;
> +	gal_view_class->edit          = NULL			       ;
> 	gal_view_class->load          = gal_view_minicard_load         ;
> 	gal_view_class->save          = gal_view_minicard_save         ;
> 	gal_view_class->get_title     = gal_view_minicard_get_title    ;
> Index: calendar/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
> retrieving revision 1.2688
> diff -u -r1.2688 ChangeLog
> --- calendar/ChangeLog	15 Mar 2005 02:53:25 -0000	1.2688
> +++ calendar/ChangeLog	16 Mar 2005 04:57:31 -0000
> @@ -1,3 +1,10 @@
> +2005-03-16  Li Yuan  <li yuan sun com>
> +
> +	* gui/calendar-view.c: (calendar_view_class_init):
> +	remove the edit function.
> +
> +	Fixes # 40762
> +
> 2005-03-13  JP Rosevear  <jpr novell com>
>
> 	Fixes #73563
> Index: calendar/gui/calendar-view.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/calendar/gui/calendar-view.c,v
> retrieving revision 1.9
> diff -u -r1.9 calendar-view.c
> --- calendar/gui/calendar-view.c	14 Oct 2004 15:02:32 -0000	1.9
> +++ calendar/gui/calendar-view.c	16 Mar 2005 04:57:33 -0000
> @@ -39,7 +39,6 @@
>
> static void calendar_view_finalize (GObject *object);
>
> -static void calendar_view_edit (GalView *view, GtkWindow *parent_window);
> static void calendar_view_load (GalView *view, const char *filename);
> static void calendar_view_save (GalView *view, const char *filename);
> static const char *calendar_view_get_title (GalView *view);
> @@ -59,7 +58,7 @@
> 	gal_view_class = (GalViewClass *) class;
> 	object_class = (GObjectClass *) class;
>
> -	gal_view_class->edit = calendar_view_edit;
> +	gal_view_class->edit = NULL;
> 	gal_view_class->load = calendar_view_load;
> 	gal_view_class->save = calendar_view_save;
> 	gal_view_class->get_title = calendar_view_get_title;
> @@ -108,13 +107,6 @@
> }
>
> 
> -
> -/* edit method of the calendar view */
> -static void
> -calendar_view_edit (GalView *view, GtkWindow *parent_window)
> -{
> -	/* nothing */
> -}
>
> /* load method of the calendar view */
> static void
>  
>
> ------------------------------------------------------------------------
>
> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/gal/gal/menus/ChangeLog,v
> retrieving revision 1.76
> diff -u -r1.76 ChangeLog
> --- ChangeLog	4 Aug 2004 09:16:19 -0000	1.76
> +++ ChangeLog	16 Mar 2005 04:40:27 -0000
> @@ -1,3 +1,9 @@
> +2005-03-16  Li Yuan  <li yuan sun com>
> +
> +	* gal-define-views-dialog.c: (etable_selection_change_forall_cb):
> +
> +	Fixes #40762
> +
> 2004-08-02  Radek Doulik  <rodo ximian com>
>
> 	* gal-define-views-dialog.c: save collection on exit
> Index: gal-define-views-dialog.c
> ===================================================================
> RCS file: /cvs/gnome/gal/gal/menus/gal-define-views-dialog.c,v
> retrieving revision 1.29
> diff -u -r1.29 gal-define-views-dialog.c
> --- gal-define-views-dialog.c	4 Aug 2004 09:16:19 -0000	1.29
> +++ gal-define-views-dialog.c	16 Mar 2005 04:40:28 -0000
> @@ -211,9 +211,16 @@
> 	if (row != -1) {
> 		GalViewCollectionItem *item = gal_view_collection_get_view_item (dialog->collection, row);
>
> -		if (item)
> +		if (item) {
> 			gtk_widget_set_sensitive (glade_xml_get_widget (dialog->gui, "button-delete"),
> 						  !item->built_in);
> +			if (GAL_VIEW_GET_CLASS (item->view)->edit)
> +				gtk_widget_set_sensitive (glade_xml_get_widget (dialog->gui, "button-modify"),
> +						item->built_in);
> +			else
> +				gtk_widget_set_sensitive (glade_xml_get_widget (dialog->gui, "button-modify"),
> +						!item->built_in);
> +		}
> 	}
> }
>
>