pidgin3: comparison src/protocols/zephyr/zephyr.c

-:40eab743e22b
+:b39f9b646d6c
 #define z_call_s(func, err)	if (func != ZERR_NONE) {\
 					gaim_connection_error(gc, err);\
 					return;\
 				}
+#ifdef WIN32
+extern const char *username;
+#endif
 Code_t zephyr_subscribe_to(zephyr_account* zephyr, char* class, char *instance, char *recipient, char* galaxy) {
 	if (use_tzc(zephyr)) {
 		/* ((tzcfodder . subscribe) ("class" "instance" "recipient")) */
 * wouldn't do this. but it is so i will. */
 /* just for debugging */
 static void handle_unknown(ZNotice_t notice)
 {
-	gaim_debug(GAIM_DEBUG_MISC, "zephyr","z_packet: %s\n", notice.z_packet);
+	gaim_debug_error("zephyr","z_packet: %s\n", notice.z_packet);
-	gaim_debug(GAIM_DEBUG_MISC, "zephyr","z_version: %s\n", notice.z_version);
+	gaim_debug_error("zephyr","z_version: %s\n", notice.z_version);
-	gaim_debug(GAIM_DEBUG_MISC, "zephyr","z_kind: %d\n", (int)(notice.z_kind));
+	gaim_debug_error("zephyr","z_kind: %d\n", (int)(notice.z_kind));
-	gaim_debug(GAIM_DEBUG_MISC, "zephyr","z_class: %s\n", notice.z_class);
+	gaim_debug_error("zephyr","z_class: %s\n", notice.z_class);
-	gaim_debug(GAIM_DEBUG_MISC, "zephyr","z_class_inst: %s\n", notice.z_class_inst);
+	gaim_debug_error("zephyr","z_class_inst: %s\n", notice.z_class_inst);
-	gaim_debug(GAIM_DEBUG_MISC, "zephyr","z_opcode: %s\n", notice.z_opcode);
+	gaim_debug_error("zephyr","z_opcode: %s\n", notice.z_opcode);
-	gaim_debug(GAIM_DEBUG_MISC, "zephyr","z_sender: %s\n", notice.z_sender);
+	gaim_debug_error("zephyr","z_sender: %s\n", notice.z_sender);
-	gaim_debug(GAIM_DEBUG_MISC, "zephyr","z_recipient: %s\n", notice.z_recipient);
+	gaim_debug_error("zephyr","z_recipient: %s\n", notice.z_recipient);
-	gaim_debug(GAIM_DEBUG_MISC, "zephyr","z_message: %s\n", notice.z_message);
+	gaim_debug_error("zephyr","z_message: %s\n", notice.z_message);
-	gaim_debug(GAIM_DEBUG_MISC, "zephyr","z_message_len: %d\n", notice.z_message_len);
+	gaim_debug_error("zephyr","z_message_len: %d\n", notice.z_message_len);
 }
 static zephyr_triple *new_triple(zephyr_account *zephyr,const char *c, const char *i, const char *r)
 {
 	if (g_utf8_validate(string, len, NULL)) {
 		return g_strdup(string);
 	} else {
 		utf8 = g_convert(string, len, "UTF-8", zephyr->encoding, NULL, NULL, &err);
 		if (err) {
-			gaim_debug(GAIM_DEBUG_ERROR, "zephyr", "recv conversion error: %s\n", err->message);
+			gaim_debug_error("zephyr", "recv conversion error: %s\n", err->message);
 			utf8 = g_strdup(_("(There was an error converting this message.	 Check the 'Encoding' option in the Account Editor)"));
 			g_error_free(err);
 		}
 		return utf8;
 			   Realm from the sender field */
 			sendertmp = zephyr_strip_local_realm(zephyr,notice.z_sender);
 			send_inst = g_strdup_printf("%s %s",sendertmp,notice.z_class_inst);
 			send_inst_utf8 = zephyr_recv_convert(gc,send_inst, strlen(send_inst));
 			if (!send_inst_utf8) {
-				gaim_debug(GAIM_DEBUG_ERROR, "zephyr","send_inst %s became null\n", send_inst);
+				gaim_debug_error("zephyr","send_inst %s became null\n", send_inst);
 				send_inst_utf8 = "malformed instance";
 			}
 			serv_got_chat_in(gc, zt2->id, send_inst_utf8, 0, buf3, time(NULL));
 			g_free(send_inst);
 	}
 	return TRUE;
 }
+#ifdef WIN32
+static gint check_loc(gpointer_data)
+{
+GaimBlistNode *gnode, *cnode, *bnode;
+ZLocations_t locations;
+int numlocs;
+int one = 1;
+	for (gnode = gaim_get_blist()->root; gnode; gnode = gnode->next) {
+		if (!GAIM_BLIST_NODE_IS_GROUP(gnode))
+			continue;
+		for (cnode = gnode->child; cnode; cnode = cnode->next) {
+			if (!GAIM_BLIST_NODE_IS_CONTACT(cnode))
+				continue;
+			for (bnode = cnode->child; bnode; bnode = bnode->next) {
+				GaimBuddy *b = (GaimBuddy *) bnode;
+				if (!GAIM_BLIST_NODE_IS_BUDDY(bnode))
+					continue;
+				if (b->account->gc == zgc) {
+					char *chk;
+chk = local_zephyr_normalize(b->name);
+ZLocateUser(chk,&numlocs, ZAUTH);
+if (numlocs) {
+int i;
+for(i=0;i<numlocs;i++) {
+ZGetLocations(&locations,&one);
+serv_got_update(zgc,b->name,1,0,0,0,0);
+}
+}
+}
+}
+}
+}
+return TRUE;
+}
+#else
 static gint check_loc(gpointer data)
 {
 	GaimBlistNode *gnode, *cnode, *bnode;
 	ZAsyncLocateData_t ald;
 	GaimConnection *gc = (GaimConnection *)data;
 	}
 	return TRUE;
 }
+#endif /* WIN32 */
 static char *get_exposure_level()
 {
 	/* XXX add real error reporting */
 	char *exposure = ZGetVariable("exposure");
 {
 	/* XXX This code may not be Win32 clean */
 	struct hostent *hent;
 	if (gethostname(zephyr->ourhost, sizeof(zephyr->ourhost)) == -1) {
-		gaim_debug(GAIM_DEBUG_ERROR, "zephyr", "unable to retrieve hostname, %%host%% and %%canon%% will be wrong in subscriptions and have been set to unknown\n");
+		gaim_debug_error("zephyr", "unable to retrieve hostname, %%host%% and %%canon%% will be wrong in subscriptions and have been set to unknown\n");
 		g_strlcpy(zephyr->ourhost, "unknown", sizeof(zephyr->ourhost));
 		g_strlcpy(zephyr->ourhostcanon, "unknown", sizeof(zephyr->ourhostcanon));
 		return;
 	}
 	if (!(hent = gethostbyname(zephyr->ourhost))) {
-		gaim_debug(GAIM_DEBUG_ERROR,"zephyr", "unable to resolve hostname, %%canon%% will be wrong in subscriptions.and has been set to the value of %%host%%, %s\n",zephyr->ourhost);
+		gaim_debug_error("zephyr", "unable to resolve hostname, %%canon%% will be wrong in subscriptions.and has been set to the value of %%host%%, %s\n",zephyr->ourhost);
 		g_strlcpy(zephyr->ourhostcanon, zephyr->ourhost, sizeof(zephyr->ourhostcanon));
 		return;
 	}
 	g_strlcpy(zephyr->ourhostcanon, hent->h_name, sizeof(zephyr->ourhostcanon));
 					/* There should be some sort of error report listing classes that couldn't be subbed to.
 					   Not important right now though */
 					if (zephyr_subscribe_to(zephyr,z_class, z_instance, recip,z_galaxy) != ZERR_NONE) {
-						gaim_debug(GAIM_DEBUG_ERROR, "zephyr", "Couldn't subscribe to %s, %s, %s\n", z_class,z_instance,recip);
+						gaim_debug_error("zephyr", "Couldn't subscribe to %s, %s, %s\n", z_class,z_instance,recip);
 					}
 					zephyr->subscrips = g_slist_append(zephyr->subscrips, new_triple(zephyr,z_class,z_instance,recip));
 					/*					  g_hash_table_destroy(sub_hash_table); */
 					g_free(z_instance);
 	gc = gaim_account_get_connection(account);
 	read_anyone = gaim_account_get_bool(gc->account,"read_anyone",TRUE);
 	read_zsubs = gaim_account_get_bool(gc->account,"read_zsubs",TRUE);
 	exposure = (gchar *)gaim_account_get_string(gc->account, "exposure_level", EXPOSE_REALMVIS);
+#ifdef WIN32
+	username = gaim_account_get_username(account);
+#endif
 	gc->flags |= GAIM_CONNECTION_HTML | GAIM_CONNECTION_NO_BGCOLOR | GAIM_CONNECTION_NO_URLDESC;
 	gc->proto_data = zephyr=g_new0(zephyr_account,1);
 	zephyr->account = account;
 }
 static const char *zephyr_normalize(const GaimAccount * account, const char *orig)
 {
 	/* returns the string you gave it. Maybe this function shouldn't be here */
-	char * buf = g_malloc0(80);
+	static char buf[80];
 	/*	gaim_debug_error("zephyr","entering zephyr_normalize\n"); */
 	if (!g_ascii_strcasecmp(orig, "")) {
 		buf[0] = '\0';
 		return buf;
 		GString* subout = g_string_new("Subscription list<br>");
 		title = g_strdup_printf("Server subscriptions for %s", zephyr->username);
 		if (zephyr->port == 0) {
-			gaim_debug(GAIM_DEBUG_ERROR,"zephyr", "error while retrieving port");
+			gaim_debug_error("zephyr", "error while retrieving port");
 			return;
 		}
 		if ((retval = ZRetrieveSubscriptions(zephyr->port,&nsubs)) != ZERR_NONE) {
 			/* XXX better error handling */
-			gaim_debug(GAIM_DEBUG_ERROR,"zephyr", "error while retrieving subscriptions from server");
+			gaim_debug_error("zephyr", "error while retrieving subscriptions from server");
 			return;
 		}
 		for(i=0;i<nsubs;i++) {
 			one = 1;
 			if ((retval = ZGetSubscriptions(&subs,&one)) != ZERR_NONE) {
 				/* XXX better error handling */
-				gaim_debug(GAIM_DEBUG_ERROR,"zephyr", "error while retrieving individual subscription");
+				gaim_debug_error("zephyr", "error while retrieving individual subscription");
 				return;
 			}
 			g_string_append_printf(subout, "Class %s Instance %s Recipient %s<br>",
 					       subs.zsub_class, subs.zsub_classinst,
 					       subs.zsub_recipient);

Mercurial > pidgin3 / file comparison

comparison: src/protocols/zephyr/zephyr.c

src/protocols/zephyr/zephyr.c