Re: [evolution-patches] (Address book) Fix for 206774 & 242154

[Srinivasa Ragavan <sragavan novell com>]

sorry for that
On Fri, 2005-07-01 at 13:36 +0530, Sushma Rai wrote:
> I don't see any attachment.
> 
> Just send the patch for #206774, I've already looked at the 
> patch for #242154.
> 
> -Sushma.
> 
> On Fri, 2005-07-01 at 06:40 +0000, Srinivasa Ragavan  wrote:
> > Hi,
> > 
> > I have attached the consolidated patch.
> > 
> > Please review and get back.
> > 
> > Thanks
> > Srini.
> > 
> > _______________________________________________
> > evolution-patches mailing list
> > evolution-patches lists ximian com
> > http://lists.ximian.com/mailman/listinfo/evolution-patches

Index: gui/widgets/e-addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v
retrieving revision 1.165
diff -u -p -r1.165 e-addressbook-view.c
--- gui/widgets/e-addressbook-view.c	17 Jun 2005 15:20:26 -0000	1.165
+++ gui/widgets/e-addressbook-view.c	1 Jul 2005 06:41:50 -0000
@@ -897,6 +897,15 @@ move_to_folder (EPopup *ep, EPopupItem *
 }
 
 static void
+open_contact (EPopup *ep, EPopupItem *pitem, void *data)
+{
+	ContactAndBook *contact_and_book = data;
+
+	eab_view_view (contact_and_book->view);
+}
+
+
+static void
 new_card (EPopup *ep, EPopupItem *pitem, void *data)
 {
 	/*ContactAndBook *contact_and_book = data;*/
@@ -917,13 +926,18 @@ new_list (EPopup *ep, EPopupItem *pitem,
 }
 
 static EPopupItem eabv_popup_items[] = {
+	{ E_POPUP_ITEM, "05.open", N_("_Open"), open_contact, NULL, NULL, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_BAR, "10.bar" },
 	{ E_POPUP_ITEM, "10.new",  N_("New Contact..."), new_card, NULL, "stock_contact", 0, EAB_POPUP_SELECT_EDITABLE},
 	{ E_POPUP_ITEM, "15.newlist", N_("New Contact List..."), new_list, NULL, "stock_contact-list", 0, EAB_POPUP_SELECT_EDITABLE },
 
 	{ E_POPUP_BAR, "20.bar" },
 	{ E_POPUP_ITEM, "30.saveas", N_("Save as VCard..."), save_as, NULL, "stock_save-as", 0, EAB_POPUP_SELECT_ANY },
-	{ E_POPUP_ITEM, "40.forward", N_("Forward Contact"), send_as, NULL, "stock_mail-forward", 0, EAB_POPUP_SELECT_ANY },
-	{ E_POPUP_ITEM, "50.mailto", N_("Send Message to Contact"), send_to, NULL, "stock_mail-send", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EMAIL },
+	{ E_POPUP_ITEM, "40.forward", N_("Forward Contact"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, "40.forward", N_("Forward Contacts"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_MANY },
+	{ E_POPUP_ITEM, "50.mailto", N_("Send Message to Contact"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT },
+	{ E_POPUP_ITEM, "50.mailto", N_("Send Message to List"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST },
+	{ E_POPUP_ITEM, "50.mailto", N_("Send Message to Contacts"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL },
 	{ E_POPUP_ITEM, "60.print", N_("Print"), print, NULL, "stock_print", 0, EAB_POPUP_SELECT_ANY },
 
 	{ E_POPUP_BAR, "70.bar" },
Index: gui/widgets/eab-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-popup.c,v
retrieving revision 1.6
diff -u -p -r1.6 eab-popup.c
--- gui/widgets/eab-popup.c	23 Dec 2004 02:42:11 -0000	1.6
+++ gui/widgets/eab-popup.c	1 Jul 2005 06:41:51 -0000
@@ -155,6 +155,13 @@ eab_popup_target_new_select(EABPopup *ea
 		}
 	}
 
+	if (cards->len == 1) {
+		if (e_contact_get (E_CONTACT(cards->pdata[0]), E_CONTACT_IS_LIST))
+			mask &= ~EAB_POPUP_LIST;
+		else
+			mask &= ~EAB_POPUP_CONTACT;
+	}
+
 	if (has_email)
 		mask &= ~EAB_POPUP_SELECT_EMAIL;
 
Index: gui/widgets/eab-popup.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-popup.h,v
retrieving revision 1.4
diff -u -p -r1.4 eab-popup.h
--- gui/widgets/eab-popup.h	23 Dec 2004 02:42:11 -0000	1.4
+++ gui/widgets/eab-popup.h	1 Jul 2005 06:41:51 -0000
@@ -65,6 +65,8 @@ enum _eab_popup_target_select_t {
 	EAB_POPUP_SELECT_ANY = 1<<2,
 	EAB_POPUP_SELECT_EDITABLE = 1<<3,
 	EAB_POPUP_SELECT_EMAIL = 1<<4,
+	EAB_POPUP_LIST = 1<<5,
+	EAB_POPUP_CONTACT = 1<<6,
 };
 
 /**