pidgin: src/protocols/novell/novell.c comparison

comparison src/protocols/novell/novell.c @ 9268:54fb1f466953

[gaim-migrate @ 10069] " - Added keepalive support - Improved handling of character sets in RTF (improves intl interoperability between Gaim and the Windows/XPLAT Messenger clients)." --Mike Stoddard of Novell committer: Tailor Script <tailor@pidgin.im>

author	Luke Schierer <lschiere@pidgin.im>
date	Sat, 12 Jun 2004 15:13:29 +0000
parents	7ab20f829190
children	7a8aa87164ae

comparison

equal deleted inserted replaced

-:3e8619644a8a
+:54fb1f466953
 #define DEFAULT_PORT			8300
 #define NOVELL_CONNECT_STEPS	4
 static GaimPlugin *my_protocol = NULL;
-static gboolean set_permit = FALSE;
 static gboolean
 _is_disconnect_error(NMERR_T err);
 static gboolean
 _check_for_disconnect(NMUser * user, NMERR_T err);
 			if (alias)
 				gaim_account_set_alias(user->client_data, alias);
 		}
 		_sync_contact_list(user);
-		_sync_privacy_lists(user);
 		/* Tell Gaim that we are connected */
 		gaim_connection_set_state(gc, GAIM_CONNECTED);
 		serv_finish_login(gc);
 	NMUserRecord *user_record = NULL;
 	NMContact *contact = NULL;
 	GaimConversation *gconv;
 	NMConference *conference;
 	GaimConvImFlags imflags;
+	char *text = NULL;
+	text = g_markup_escape_text(nm_event_get_text(event), -1);
 	conference = nm_event_get_conference(event);
 	if (conference) {
 		GaimConversation *chat = nm_conference_get_data(conference);
 				if (nm_event_get_type(event) == NMEVT_RECEIVE_AUTOREPLY)
 					imflags |= GAIM_CONV_IM_AUTO_RESP;
 				serv_got_im(gaim_account_get_connection(user->client_data),
 							nm_user_record_get_display_id(user_record),
-							nm_event_get_text(event), imflags,
+							text, imflags,
 							nm_event_get_gmt(event));
 				gconv =	gaim_find_conversation_with_account(
 					nm_user_record_get_display_id(user_record),
 					(GaimAccount *) user->client_data);
 					contact = nm_find_contact(user, nm_event_get_source(event));
 					if (contact) {
 						gaim_conversation_set_title(
-							gconv,
+							gconv, nm_contact_get_display_name(contact));
-							nm_contact_get_display_name(contact));
 					} else {
 						const char *name =
 						name = nm_user_record_get_display_id(user_record);
 				}
 				serv_got_chat_in(gaim_account_get_connection(user->client_data),
 								 gaim_conv_chat_get_id(GAIM_CONV_CHAT(chat)),
-								 name,
+								 name, 0, text, nm_event_get_gmt(event));
-								 0, nm_event_get_text(event),
+			}
-								 nm_event_get_gmt(event));
+		}
-			}
+	}
-		}
-	}
+	g_free(text);
 }
 static void
 _evt_conference_left(NMUser * user, NMEvent * event)
 {
 	user = gc->proto_data;
 	if (user == NULL)
 		return 0;
 	/* Create a new message */
-	message = nm_create_message(gaim_markup_strip_html(message_body));
+	message = nm_create_message(message_body);
 	/* Need to get the DN for the buddy so we can look up the convo */
 	dn = nm_lookup_dn(user, name);
 	/* Do we already know about the sender? */
 	user = gc->proto_data;
 	if (user == NULL)
 		return -1;
-	message = nm_create_message(gaim_markup_strip_html(text));
+	message = nm_create_message(text);
 	for (cnode = user->conferences; cnode != NULL; cnode = cnode->next) {
 		conference = cnode->data;
 		if (conference && (chat = nm_conference_get_data(conference))) {
 			if (gaim_conv_chat_get_id(GAIM_CONV_CHAT(chat)) == id) {
 	user = gc->proto_data;
 	if (user == NULL)
 		return;
-	if (set_permit == FALSE) {
+	if (user->privacy_synched == FALSE) {
-		set_permit = TRUE;
+		_sync_privacy_lists(user);
+		user->privacy_synched = TRUE;
 		return;
 	}
 	if (nm_user_is_privacy_locked(user)) {
 		_show_privacy_locked_error(gc, user);
 static GList *
 novell_blist_node_menu(GaimBlistNode *node)
 {
 	GList *list = NULL;
 	GaimBlistNodeAction *act;
 	if(GAIM_BLIST_NODE_IS_BUDDY(node)) {
 		act = gaim_blist_node_action_new(_("Initiate _Chat"),
 				_initiate_conference_cb, NULL);
 		list = g_list_append(list, act);
 	}
 	return list;
+}
+static void
+novell_keepalive(GaimConnection *gc)
+{
+	NMUser *user;
+	NMERR_T rc = NM_OK;
+	if (gc == NULL)
+		return;
+	user = gc->proto_data;
+	if (user == NULL)
+		return;
+	rc = nm_send_keepalive(user, NULL, NULL);
+	_check_for_disconnect(user, rc);
 }
 static GaimPluginProtocolInfo prpl_info = {
 	GAIM_PRPL_API_VERSION,
 	0,
 	novell_rem_permit,
 	novell_rem_deny,
 	novell_set_permit_deny,
 	NULL,						/* warn */
 	NULL,						/* join_chat */
-	NULL,						/* reject_chat ?? */
+	NULL,						/* reject_chat */
 	novell_chat_invite,			/* chat_invite */
 	novell_chat_leave,
 	NULL,						/* chat_whisper */
 	novell_chat_send,
-	NULL,						/* keepalive */
+	novell_keepalive,
 	NULL,						/* register_user */
 	NULL,						/* get_cb_info */
 	NULL,						/* get_cb_away_msg */
 	novell_alias_buddy,
 	novell_group_buddy,

Mercurial > pidgin

comparison src/protocols/novell/novell.c @ 9268:54fb1f466953