File pidgin-sipe-1.11.2-gcc46.patch of Package mingw32-pidgin-sipe

Overview Repositories Revisions Requests Users Attributes Meta

File pidgin-sipe-1.11.2-gcc46.patch of Package mingw32-pidgin-sipe (Revision 20acbac4d4811ec39e677e729f397c54)

Currently displaying revision 20acbac4d4811ec39e677e729f397c54 , Show latest

--- pidgin-sipe-1.11.2/src/core/sipe.c	2010-11-03 05:13:51.000000000 +0100
+++ pidgin-sipe-1.11.2/src/core/sipe.c	2011-04-26 18:06:51.828025663 +0200
@@ -1526,16 +1526,12 @@
 	if (diagnostics != NULL) {
 		reason = sipmsg_find_part_of_header(diagnostics, "reason=\"", "\"", NULL);
 	} else { // for LCS2005
-		int error_id = 0;
 		if (event && sipe_strcase_equal(event, "unregistered")) {
-			error_id = 4140; // [MS-SIPREGE]
 			//reason = g_strdup(_("User logged out")); // [MS-OCER]
 			reason = g_strdup(_("you are already signed in at another location"));
 		} else if (event && sipe_strcase_equal(event, "rejected")) {
-			error_id = 4141;
 			reason = g_strdup(_("user disabled")); // [MS-OCER]
 		} else if (event && sipe_strcase_equal(event, "deactivated")) {
-			error_id = 4142;
 			reason = g_strdup(_("user moved")); // [MS-OCER]
 		}
 	}
@@ -4304,7 +4300,6 @@
 	const sipe_xml *xn_state;
 	const sipe_xml *xn_contact;
 	char *note;
-	char *free_activity;
 	int user_avail;
 	const char *user_avail_nil;
 	int res_avail;
@@ -4341,8 +4336,6 @@
 		user_avail_since = 0;
 	}
 
-	free_activity = NULL;
-
 	name = sipe_xml_attribute(xn_presentity, "uri"); /* without 'sip:' prefix */
 	uri = sip_uri_from_name(name);
 	avl = sipe_xml_int_attribute(xn_availability, "aggregate", 0);
@@ -5492,8 +5485,6 @@
 	guint cal_data_instance = sipe_get_pub_instance(sipe_private, SIPE_PUB_CALENDAR_DATA);
 	char *fb_start_str;
 	char *free_busy_base64;
-	const char *st;
-	const char *fb;
 	char *res;
 
 	/* key is <category><instance><container> */
@@ -5532,20 +5523,6 @@
 	fb_start_str = sipe_utils_time_to_str(cal->fb_start);
 	free_busy_base64 = sipe_cal_get_freebusy_base64(cal->free_busy);
 
-	st = publication_cal_300 ? publication_cal_300->fb_start_str : NULL;
-	fb = publication_cal_300 ? publication_cal_300->free_busy_base64 : NULL;
-
-	/* we will rebuplish the same data to refresh publication time,
-	 * so if data from multiple sources, most recent will be choosen
-	 */
-	//if (sipe_strequal(st, fb_start_str) && sipe_strequal(fb, free_busy_base64))
-	//{
-	//	SIPE_DEBUG_INFO_NOFORMAT("sipe_publish_get_category_cal_free_busy: FreeBusy has NOT changed. Exiting.");
-	//	g_free(fb_start_str);
-	//	g_free(free_busy_base64);
-	//	return NULL; /* nothing to update */
-	//}
-
 	res = g_strdup_printf(SIPE_PUB_XML_FREE_BUSY,
 				/* 1 */
 				cal_data_instance,
--- pidgin-sipe-1.11.2/src/core/sipe-digest.c	2010-11-03 05:13:51.000000000 +0100
+++ pidgin-sipe-1.11.2/src/core/sipe-digest.c	2011-04-26 18:07:51.572509953 +0200
@@ -41,13 +41,12 @@
 			guchar *digest, gsize digest_length)
 {
 	PK11Context *context = 0;
-	SECStatus s;
 	unsigned int len;
 	
 	context = PK11_CreateDigestContext(algorithm);
-	s = PK11_DigestBegin(context);
-	s = PK11_DigestOp(context, data, data_length);
-	s = PK11_DigestFinal(context, digest, &len, digest_length);
+	PK11_DigestBegin(context);
+	PK11_DigestOp(context, data, data_length);
+	PK11_DigestFinal(context, digest, &len, digest_length);
 	PK11_DestroyContext(context, PR_TRUE);
 }
 
@@ -59,7 +58,6 @@
 	SECItem noParams;
 	PK11SymKey* SymKey;
 	PK11Context* DigestContext;
-	SECStatus s;
 
 	/* For key */
 	slot = PK11_GetBestSlot(hmacMech, NULL);
@@ -77,7 +75,7 @@
 
 	DigestContext = PK11_CreateContextBySymKey(hmacMech, CKA_SIGN, SymKey, &noParams);
 	
-	s = PK11_DigestBegin(DigestContext);
+	PK11_DigestBegin(DigestContext);
 	
 	PK11_FreeSymKey(SymKey);
 	PK11_FreeSlot(slot);
--- pidgin-sipe-1.11.2/src/core/sipe-incoming.c	2010-11-03 05:13:51.000000000 +0100
+++ pidgin-sipe-1.11.2/src/core/sipe-incoming.c	2011-04-26 18:06:51.829025717 +0200
@@ -255,7 +255,6 @@
 	const gchar *oldHeader;
 	gchar *newHeader;
 	gboolean is_multiparty = FALSE;
-	gboolean is_triggered = FALSE;
 	gboolean was_multiparty = TRUE;
 	gboolean just_joined = FALSE;
 	gchar *from;
@@ -311,7 +310,6 @@
 		}
 	}
 	if (trig_invite && !g_strcasecmp(trig_invite, "TRUE")) {
-		is_triggered = TRUE;
 		is_multiparty = TRUE;
 	}
 
--- pidgin-sipe-1.11.2/src/core/sip-sec-ntlm-tests.c	2010-11-03 05:13:51.000000000 +0100
+++ pidgin-sipe-1.11.2/src/core/sip-sec-ntlm-tests.c	2011-04-26 18:06:51.832025876 +0200
@@ -124,7 +124,6 @@
 	struct sipmsg *msg;
 	struct sipmsg_breakdown msgbd;
 	gchar *msg_str;
-	gchar *sig;
 	const char *password2;
 	const char *user2;
 	const char *domain2;
@@ -508,7 +507,6 @@
 		msg_str, 0, exported_session_key2, exported_session_key2, mac);
 	sipmsg_breakdown_free(&msgbd);
 	assert_equal ("0100000000000000BF2E52667DDF6DED", mac, 16, TRUE);
-	sig = buff_to_hex_str(mac, 16);
 	}
 
 
@@ -762,7 +760,6 @@
 	sip_sec_ntlm_sipe_signature_make (flags, msg_str, 0, client_sign_key, client_seal_key, mac);
 	sipmsg_breakdown_free(&msgbd);
 	assert_equal ("0100000029618e9651b65a7764000000", mac, 16, TRUE);
-	sig = buff_to_hex_str(mac, 16);
 
 	printf ("\n\nTesting (NTLMv2 / OC 2007 R2) Message Parsing, Signing, and Verification\nServer response\n(Authentication Protocol version 4)\n");
 	msg = sipmsg_parse_msg(response);
@@ -774,7 +771,6 @@
 	sip_sec_ntlm_sipe_signature_make (flags, msg_str, 0, server_sign_key, server_seal_key, mac);
 	sipmsg_breakdown_free(&msgbd);
 	assert_equal ("01000000E615438A917661BE64000000", mac, 16, TRUE);
-	sig = buff_to_hex_str(mac, 16);
 
 	printf ("\n\nTesting (NTLMv2 / OC 2007 R2) MAC - client signing\n");
 	MAC (flags,   (gchar*)request_sig,strlen(request_sig),   client_sign_key,16,   client_seal_key,16,   0,  100, mac);

Places

File pidgin-sipe-1.11.2-gcc46.patch of Package mingw32-pidgin-sipe (Revision 20acbac4d4811ec39e677e729f397c54)

Places