Mercurial > pidgin

changeset 20408:14b8fb8d27b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of 790a91b1bb6c10ada984951cbd2485e95e5159fd and 05f7badcad9471084218e698a5c011908d17af90
author Ka-Hing Cheung <khc@hxbc.us>
date Wed, 02 May 2007 06:06:56 +0000
parents 6b4e778ee4b4 (diff) 1122d47583a1 (current diff)
children 7c0a2ef88018
files libpurple/protocols/msn/msn-utils.c libpurple/protocols/msn/msn-utils.h libpurple/protocols/msn/nexus.c
diffstat 6 files changed, 28 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/nat-pmp.c	Wed May 02 05:25:27 2007 +0000
+++ b/libpurple/nat-pmp.c	Wed May 02 06:06:56 2007 +0000
@@ -64,7 +64,7 @@
 
 typedef struct {
 	uint8_t		version;
-	uint8_t		opcode; // 128 + n
+	uint8_t		opcode; /* 128 + n */
 	uint16_t	resultcode;
 	uint32_t	epoch;
 	uint32_t	address;
@@ -417,7 +417,7 @@
 	bzero(&req, sizeof(PurplePmpMapRequest));
 	req.version = 0;
 	req.opcode	= ((type == PURPLE_PMP_TYPE_UDP) ? PMP_MAP_OPCODE_UDP : PMP_MAP_OPCODE_TCP);	
-	req.privateport = htons(privateport); //	What a difference byte ordering makes...d'oh!
+	req.privateport = htons(privateport); /* What a difference byte ordering makes...d'oh! */
 	req.publicport = htons(publicport);
 	req.lifetime = htonl(lifetime);
 
--- a/libpurple/protocols/msn/nexus.c	Wed May 02 05:25:27 2007 +0000
+++ b/libpurple/protocols/msn/nexus.c	Wed May 02 06:06:56 2007 +0000
@@ -25,7 +25,6 @@
 #include "soap.h"
 #include "nexus.h"
 #include "notification.h"
-
 #undef NEXUS_LOGIN_TWN
 
 /*Local Function Prototype*/
@@ -355,14 +354,16 @@
 {
 	MsnNexus *nexus = data;
 	int len;
+
 	char *da_login;
 	char *base, *c;
 
 	if (nexus->input_handler == 0)
-		//TODO: Use purple_ssl_input_add()?
+		/* TODO: Use purple_ssl_input_add()? */
 		nexus->input_handler = purple_input_add(nexus->gsc->fd,
 			PURPLE_INPUT_READ, nexus_connect_written_cb, nexus);
 
+
 	/* Get the PassportURLs line. */
 	len = msn_ssl_read(nexus);
 
@@ -470,4 +471,3 @@
 	msn_soap_init(nexus->soapconn,MSN_TWN_SERVER,1,nexus_login_connect_cb,nexus_login_error_cb);
 	msn_soap_connect(nexus->soapconn);
 }
-
--- a/libpurple/protocols/qq/qq.c	Wed May 02 05:25:27 2007 +0000
+++ b/libpurple/protocols/qq/qq.c	Wed May 02 06:06:56 2007 +0000
@@ -399,7 +399,6 @@
 	gc_and_uid *g;
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
-//	const gchar *who = param_who;	gfhuang
 	const gchar *who;
 
 	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
@@ -503,7 +502,8 @@
 }
 */
 
-/* TODO: re-enable this
+#if 0
+/* TODO: re-enable this */
 static void _qq_menu_send_file(PurpleBlistNode * node, gpointer ignored)
 {
 	PurpleBuddy *buddy;
@@ -513,13 +513,13 @@
 	g_return_if_fail (PURPLE_BLIST_NODE_IS_BUDDY (node));
 	buddy = (PurpleBuddy *) node;
 	q_bud = (qq_buddy *) buddy->proto_data;
-//	if (is_online (q_bud->status)) {
+/*	if (is_online (q_bud->status)) { */
 	gc = purple_account_get_connection (buddy->account);
 	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
 	qq_send_file(gc, buddy->name, NULL);
-//	}
+/*	} */
 }
-*/
+#endif
 
 /* protocol related menus */
 static GList *_qq_actions(PurplePlugin *plugin, gpointer context)
@@ -575,23 +575,21 @@
 		return _qq_chat_menu(node);
 
 	m = NULL;
+
+/* TODO : not working, temp commented out by gfhuang */
+#if 0
+
+	act = purple_menu_action_new(_("Block this buddy"), PURPLE_CALLBACK(_qq_menu_block_buddy), NULL, NULL); /* add NULL by gfhuang */
+	m = g_list_append(m, act);
+/*	if (q_bud && is_online(q_bud->status)) { */
+		act = purple_menu_action_new(_("Send File"), PURPLE_CALLBACK(_qq_menu_send_file), NULL, NULL); /* add NULL by gfhuang */
+		m = g_list_append(m, act);
+/*	} */
+#endif
+
 	return m;
 }
 
-/* TODO : not working, temp commented out by gfhuang
-
-	act = purple_menu_action_new(_("Block this buddy"), PURPLE_CALLBACK(_qq_menu_block_buddy), NULL, NULL); //add NULL by gfhuang
-	m = g_list_append(m, act);
-//	if (q_bud && is_online(q_bud->status)) {
-		act = purple_menu_action_new(_("Send File"), PURPLE_CALLBACK(_qq_menu_send_file), NULL, NULL); //add NULL by gfhuang
-		m = g_list_append(m, act);
-//	}
-*/
-/*
-	return m;
-}
-*/
-
 
 static void _qq_keep_alive(PurpleConnection *gc)
 {
--- a/libpurple/protocols/qq/send_file.c	Wed May 02 05:25:27 2007 +0000
+++ b/libpurple/protocols/qq/send_file.c	Wed May 02 06:06:56 2007 +0000
@@ -362,7 +362,7 @@
 	if (ioctl(fd, SIOCGIFCONF, (char *) &ifc) < 0) return 0;
 	intrface = ifc.ifc_len / sizeof(struct ifreq);
 	for (i = 0; i < intrface; i++) {
-		//buf[intrface].ifr_name
+		/* buf[intrface].ifr_name */
 		if (ioctl(fd, SIOCGIFADDR, (char *) &buf[i]) >= 0)
 		{
 			ret = (((struct sockaddr_in *)(&buf[i].ifr_addr))->sin_addr).s_addr;
--- a/libpurple/win32/giowin32.c	Wed May 02 05:25:27 2007 +0000
+++ b/libpurple/win32/giowin32.c	Wed May 02 06:06:56 2007 +0000
@@ -32,7 +32,7 @@
 /* Define this to get (very) verbose logging of all channels */
 /* #define G_IO_WIN32_DEBUG */
 
-//#include "config.h"
+/* #include "config.h" */
 
 #include <glib.h>
 
--- a/pidgin/gtkstatusbox.c	Wed May 02 05:25:27 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Wed May 02 06:06:56 2007 +0000
@@ -1273,8 +1273,10 @@
 	if (event->button != 1)
 		return FALSE;
 	gtk_combo_box_popup(GTK_COMBO_BOX(box));
-	// Disabled until button_released_cb works
-	// gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(box->toggle_button), TRUE);
+	/* Disabled until button_released_cb works */
+#if 0
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(box->toggle_button), TRUE);
+#endif
 	return TRUE;
 }
 #endif