Mercurial > pidgin.yaz

changeset 11820:2cf6d4cf2cb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 14111] Death to // comments. Excluding win32, where it doesn't matter, this should be it except for crazychat and bonjour. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Tue, 25 Oct 2005 20:50:21 +0000
parents 1452a3a9f07a
children 7e24c780a5c2
files src/gtkimhtml.c src/protocols/oscar/ft.c src/protocols/oscar/oscar.c src/protocols/simple/digcalc.c src/protocols/simple/sipmsg.c
diffstat 5 files changed, 32 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkimhtml.c	Tue Oct 25 19:18:44 2005 +0000
+++ b/src/gtkimhtml.c	Tue Oct 25 20:50:21 2005 +0000
@@ -1645,7 +1645,7 @@
 			while((link = links[i]) != NULL){
 				if(gaim_str_has_prefix(link, "http://") ||
 				   gaim_str_has_prefix(link, "https://") ||
-                   gaim_str_has_prefix(link, "ftp://"))
+				   gaim_str_has_prefix(link, "ftp://"))
 				{
 					gchar *label;
 
@@ -2655,22 +2655,16 @@
 							font->fore = color;
 							gtk_imhtml_toggle_forecolor(imhtml, font->fore);
 						}
-						//else if (oldfont && oldfont->fore)
-						//	font->fore = g_strdup(oldfont->fore);
 
 						if (back && !(options & GTK_IMHTML_NO_COLOURS) && (imhtml->format_functions & GTK_IMHTML_BACKCOLOR)) {
 							font->back = back;
 							gtk_imhtml_toggle_backcolor(imhtml, font->back);
 						}
-						//else if (oldfont && oldfont->back)
-						//	font->back = g_strdup(oldfont->back);
 
 						if (face && !(options & GTK_IMHTML_NO_FONTS) && (imhtml->format_functions & GTK_IMHTML_FACE)) {
 							font->face = face;
 							gtk_imhtml_toggle_fontface(imhtml, font->face);
 						}
-						//else if (oldfont && oldfont->face)
-						//		font->face = g_strdup(oldfont->face);
 
 						if (sml)
 							font->sml = sml;
--- a/src/protocols/oscar/ft.c	Tue Oct 25 19:18:44 2005 +0000
+++ b/src/protocols/oscar/ft.c	Tue Oct 25 20:50:21 2005 +0000
@@ -940,7 +940,9 @@
  */
 faim_export int aim_rv_proxy_init_recv(struct aim_rv_proxy_info *proxy_info)
 {
-	//aim_tlvlist_t *tlvlist_sendfile;
+#if 0
+	aim_tlvlist_t *tlvlist_sendfile;
+#endif
 	aim_bstream_t bs;
 	fu8_t *bs_raw;
 	fu16_t packet_len;
@@ -979,16 +981,21 @@
 	aimbs_put16(&bs, 16);			/* Length */
 	aimbs_putcaps(&bs, AIM_CAPS_SENDFILE);	/* Value */
 
-	// TODO: Use built-in TLV 
-	//aim_tlvlist_add_caps(&tlvlist_sendfile, 0x0001, AIM_CAPS_SENDFILE);
-	//aim_tlvlist_write(&bs, &tlvlist_sendfile);
+
+#if 0
+	/* TODO: Use built-in TLV */
+	aim_tlvlist_add_caps(&tlvlist_sendfile, 0x0001, AIM_CAPS_SENDFILE);
+	aim_tlvlist_write(&bs, &tlvlist_sendfile);
+#endif
 
 	aim_bstream_rewind(&bs);
 	if (aim_bstream_send(&bs, proxy_info->conn, packet_len) != packet_len)
 		err = errno;
 	proxy_info->conn->lastactivity = time(NULL);
 
-	//aim_tlvlist_free(tlvlist_sendfile);
+#if 0
+	aim_tlvlist_free(tlvlist_sendfile);
+#endif
 	free(bs_raw);
 
 	return err;
@@ -1006,7 +1013,9 @@
  */
 faim_export int aim_rv_proxy_init_send(struct aim_rv_proxy_info *proxy_info)
 {
-	//aim_tlvlist_t *tlvlist_sendfile;
+#if 0
+	aim_tlvlist_t *tlvlist_sendfile;
+#endif
 	aim_bstream_t bs;
 	fu8_t *bs_raw;
 	fu16_t packet_len;
@@ -1043,16 +1052,20 @@
 	aimbs_put16(&bs, 16);			/* Length */
 	aimbs_putcaps(&bs, AIM_CAPS_SENDFILE);	/* Value */
 
-	// TODO: Use built-in TLV
-	//aim_tlvlist_add_caps(&tlvlist_sendfile, 0x0001, AIM_CAPS_SENDFILE);
-	//aim_tlvlist_write(&bs, &tlvlist_sendfile);
+	/* TODO: Use built-in TLV */
+#if 0
+	aim_tlvlist_add_caps(&tlvlist_sendfile, 0x0001, AIM_CAPS_SENDFILE);
+	aim_tlvlist_write(&bs, &tlvlist_sendfile);
+#endif
 
 	aim_bstream_rewind(&bs);
 	if (aim_bstream_send(&bs, proxy_info->conn, packet_len) != packet_len)
 		err = errno;
 	proxy_info->conn->lastactivity = time(NULL);
 
-	//aim_tlvlist_free(tlvlist_sendfile);
+#if 0
+	aim_tlvlist_free(tlvlist_sendfile);
+#endif
 	free(bs_raw);
 
 	return err;
--- a/src/protocols/oscar/oscar.c	Tue Oct 25 19:18:44 2005 +0000
+++ b/src/protocols/oscar/oscar.c	Tue Oct 25 20:50:21 2005 +0000
@@ -3618,7 +3618,9 @@
 	}
 	gaim_prpl_got_user_status(account, info->sn, status_id, NULL);
 	gaim_prpl_got_user_login_time(account, info->sn, signon - od->timeoffset);
-	//	gaim_prpl_got_user_warning_level(account, info->sn, info->warnlevel/10.0 + 0.5);
+#if 0
+	gaim_prpl_got_user_warning_level(account, info->sn, info->warnlevel/10.0 + 0.5);
+#endif
 
 	if (time_idle > 0)
 		gaim_prpl_got_user_idle(account, info->sn, TRUE, time_idle);
--- a/src/protocols/simple/digcalc.c	Tue Oct 25 19:18:44 2005 +0000
+++ b/src/protocols/simple/digcalc.c	Tue Oct 25 20:50:21 2005 +0000
@@ -109,7 +109,7 @@
       HASH RespHash;
        HASHHEX HA2Hex;
 
-      // calculate H(A2)
+      /* calculate H(A2) */
       cipher = gaim_ciphers_find_cipher("md5");
       context = gaim_cipher_context_new(cipher, NULL);
       gaim_cipher_context_append(context, (guchar *)pszMethod, strlen(pszMethod));
@@ -123,7 +123,7 @@
        CvtHex(HA2, HA2Hex);
 
       gaim_cipher_context_destroy(context);
-      // calculate response
+      /* calculate response */
       context = gaim_cipher_context_new(cipher, NULL);
       gaim_cipher_context_append(context, HA1, HASHHEXLEN);
       gaim_cipher_context_append(context, (guchar *)":", 1);
--- a/src/protocols/simple/sipmsg.c	Tue Oct 25 19:18:44 2005 +0000
+++ b/src/protocols/simple/sipmsg.c	Tue Oct 25 20:50:21 2005 +0000
@@ -62,10 +62,10 @@
 		g_free(msg);
 		return NULL;
 	}
-	if(strstr(parts[0],"SIP")) { // numeric response
+	if(strstr(parts[0],"SIP")) { /* numeric response */
 		msg->method = g_strdup(parts[2]);
 		msg->response = strtol(parts[1],NULL,10);
-	} else { // request
+	} else { /* request */
 		msg->method = g_strdup(parts[0]);
 		msg->target = g_strdup(parts[1]);
 		msg->response = 0;
@@ -99,7 +99,7 @@
 	if(msg->response) {
 		tmp = sipmsg_find_header(msg, "CSeq");
 		if(!tmp) {
-			// SHOULD NOT HAPPEN
+			/* SHOULD NOT HAPPEN */
 			msg->method = 0;
 		} else {
 			parts = g_strsplit(tmp, " ", 2);