GNOME.org
 

[evolution-patches] patch to add Groupwsie IM ids to contacts

Hi,
I have added E_CONTACT_IM_GROUPWISE field to EContact to store groupwise
instant messenger user ids. Also i added "Novell Groupwise" to list of
im service types in contact editor gui.

gw_im_evo.diff has changes made in evolution
gw_im_eds.diff has changes made in e-d-s

I have tested things like storing of gw ims in contacts and drag and
drop of ims form one contact to another etc. They seem to work.

Thanks,
Sivaiah 

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1591
diff -u -r1.1591 ChangeLog
--- ChangeLog	25 Feb 2004 01:36:31 -0000	1.1591
+++ ChangeLog	25 Feb 2004 04:36:57 -0000
@@ -1,3 +1,12 @@
+2004-02-25 Sivaiah Nallagatla <snallagatla novell com>
+	* gui/contact-editor/e-contact-editor-im.c : added 
+	groupwise im related label and icon image file name
+	
+	* gui/contact-editor/e-contact-editor.c : 
+	(im_treeview_drag_data_get_cb), (im_treeview_drag_data_rcv_cb) :
+	(set_im_fields) : added code to add Gw Im id to contact-editor 
+	
+
 2004-02-24  Hans petter Jansson  <hpj ximian com>
 
 	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):
Index: gui/contact-editor/e-contact-editor-im.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor-im.c,v
retrieving revision 1.1
diff -u -r1.1 e-contact-editor-im.c
--- gui/contact-editor/e-contact-editor-im.c	12 Jan 2004 03:35:22 -0000	1.1
+++ gui/contact-editor/e-contact-editor-im.c	25 Feb 2004 04:36:57 -0000
@@ -60,6 +60,7 @@
 
 static const char *im_labels[] = {
 	N_("AOL Instant Messenger"),
+        N_("Novell Groupwise"),
 	N_("Jabber"),
 	N_("Yahoo Messenger"),
 	N_("MSN Messenger"),
@@ -68,6 +69,7 @@
 
 static const char *im_images[] = {
 	"im-aim.png",
+	"im-nov.png",
 	"im-jabber.png",
 	"im-yahoo.png",
 	"im-msn.png",
Index: gui/contact-editor/e-contact-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor.c,v
retrieving revision 1.168
diff -u -r1.168 e-contact-editor.c
--- gui/contact-editor/e-contact-editor.c	21 Feb 2004 01:51:19 -0000	1.168
+++ gui/contact-editor/e-contact-editor.c	25 Feb 2004 04:36:59 -0000
@@ -530,7 +530,7 @@
 		GString *str;
 		char *mime_str;
 		EContactField service_field;
-		static char *protocols[] = { "aim", "jabber", "yahoo", "msn", "icq" };
+		static char *protocols[] = { "aim", "nov", "jabber", "yahoo", "msn", "icq" };
 
 		ref = g_object_get_data(G_OBJECT(dc), "gtk-tree-view-source-row");
 		sourcerow = gtk_tree_row_reference_get_path(ref);
@@ -631,6 +631,8 @@
 
 			if (!strcmp(protocol, "aim"))
 				field = E_CONTACT_IM_AIM;
+			else if (!strcmp(protocol, "nov"))
+				field = E_CONTACT_IM_GROUPWISE;
 			else if (!strcmp(protocol, "icq"))
 				field = E_CONTACT_IM_ICQ;
 			else if (!strcmp(protocol, "yahoo"))
@@ -2853,6 +2855,7 @@
 	add_im_field(editor, E_CONTACT_IM_YAHOO,  "yahoo",  _("Yahoo"));
 	add_im_field(editor, E_CONTACT_IM_MSN,    "msn",    _("MSN"));
 	add_im_field(editor, E_CONTACT_IM_ICQ,    "icq",    _("ICQ"));
+	add_im_field(editor, E_CONTACT_IM_GROUPWISE, "nov", _("GroupWise"));
 }
 
 static void
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/art/ChangeLog,v
retrieving revision 1.165
diff -u -r1.165 ChangeLog
--- ChangeLog	2 Feb 2004 23:09:06 -0000	1.165
+++ ChangeLog	25 Feb 2004 04:54:53 -0000
@@ -1,3 +1,7 @@
+2004-02-25 Sivaiah Nallagatla <snallagatla novell com>
+	* Makefile.am : added im-nov.png (icon for Groupwise im)
+	to images_DATA
+
 2004-02-03  Jakub Steiner <jimmac ximian com>
 
 	* im-jabber.png: 16x16 jabber
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/art/Makefile.am,v
retrieving revision 1.113
diff -u -r1.113 Makefile.am
--- Makefile.am	15 Jan 2004 01:19:01 -0000	1.113
+++ Makefile.am	25 Feb 2004 04:54:53 -0000
@@ -93,6 +93,7 @@
 	im-login.png \
 	im-logout.png \
 	im-msn.png \
+	im-nov.png \
 	im-na.png \
 	im-notauthorized.png \
 	im-occupied.png \

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/ChangeLog,v
retrieving revision 1.94
diff -u -r1.94 ChangeLog
--- ChangeLog	25 Feb 2004 01:22:40 -0000	1.94
+++ ChangeLog	25 Feb 2004 04:45:45 -0000
@@ -1,4 +1,9 @@
-2004-02-24  Hans Petter Jansson  <hpj ximian com>
+2004-02-25  Sivaiah Nallagatla  <snallagatla novell com>
+	* libebook/e-vcard.h : added EVC_X_GROUPWISE definition 
+	* libebook/e-contact.[ch] : added E_CONTACT_IM_GROUPWISE field to EContact 
+	to store groupwise im ids
+
+2dd E_004-02-24  Hans Petter Jansson  <hpj ximian com>
 
 	* libebook/e-book-async.c (_default_book_response_dtor): Don't
 	unref the *new* book after returning it to user. This was causing
Index: libebook/e-vcard.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-vcard.h,v
retrieving revision 1.4
diff -u -r1.4 e-vcard.h
--- libebook/e-vcard.h	23 Jan 2004 20:16:12 -0000	1.4
+++ libebook/e-vcard.h	25 Feb 2004 04:45:45 -0000
@@ -76,6 +76,7 @@
 #define EVC_X_TTYTDD        "X-EVOLUTION-TTYTDD"
 #define EVC_X_WANTS_HTML    "X-MOZILLA-HTML"
 #define EVC_X_YAHOO         "X-YAHOO"
+#define EVC_X_GROUPWISE     "X-GROUPWISE"
 
 typedef enum {
 	EVC_FORMAT_VCARD_21,
Index: libebook/e-contact.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-contact.h,v
retrieving revision 1.10
diff -u -r1.10 e-contact.h
--- libebook/e-contact.h	21 Feb 2004 01:20:46 -0000	1.10
+++ libebook/e-contact.h	25 Feb 2004 04:45:45 -0000
@@ -154,11 +154,12 @@
 
 	/* Instant Messaging fields */
 	E_CONTACT_IM_AIM,     	 /* Multi-valued */
+	E_CONTACT_IM_GROUPWISE,   /* Multi-valued */
 	E_CONTACT_IM_JABBER,  	 /* Multi-valued */
 	E_CONTACT_IM_YAHOO,   	 /* Multi-valued */
 	E_CONTACT_IM_MSN,     	 /* Multi-valued */
 	E_CONTACT_IM_ICQ,     	 /* Multi-valued */
-
+       
 	E_CONTACT_WANTS_HTML,    /* boolean field */
 
 	/* fields used for describing contact lists.  a contact list
Index: libebook/e-contact.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-contact.c,v
retrieving revision 1.23
diff -u -r1.23 e-contact.c
--- libebook/e-contact.c	24 Feb 2004 23:44:39 -0000	1.23
+++ libebook/e-contact.c	25 Feb 2004 04:45:46 -0000
@@ -154,7 +154,8 @@
 	MULTI_LIST_FIELD (E_CONTACT_IM_YAHOO,  EVC_X_YAHOO,  "im_yahoo",  N_("Yahoo! Screen Name List"), FALSE),
 	MULTI_LIST_FIELD (E_CONTACT_IM_MSN,    EVC_X_MSN,    "im_msn",    N_("MSN Screen Name List"),    FALSE),
 	MULTI_LIST_FIELD (E_CONTACT_IM_ICQ,    EVC_X_ICQ,    "im_icq",    N_("ICQ Id List"),             FALSE),
-
+        MULTI_LIST_FIELD (E_CONTACT_IM_GROUPWISE, EVC_X_GROUPWISE, "im_groupwise", N_("Groupwise Id List"), FALSE),
+ 
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_AIM_HOME_1,    EVC_X_AIM,    "im_aim_home_1",    N_("AIM Home Screen Name 1"),    FALSE, "HOME", 0),
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_AIM_HOME_2,    EVC_X_AIM,    "im_aim_home_2",    N_("AIM Home Screen Name 2"),    FALSE, "HOME", 1),
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_AIM_HOME_3,    EVC_X_AIM,    "im_aim_home_3",    N_("AIM Home Screen Name 3"),    FALSE, "HOME", 2),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]