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

comparison src/protocols/zephyr/zephyr.c @ 8354:43dec50d8d51

[gaim-migrate @ 9078] " An update to com_err on debian appears to have broken the ability of the zephyr plugin to compile with krb4. Here's a patch, tested against comerr-dev 2.1-1.34+1.35-WIP-2004.01.31-1 in debian, and an older version of com_err local to MIT, that fixes this. I haven't tested this against non-kerberized zephyr, or against other versions of com_err. A lot of the comerr (error table) related code appears to be unnecessary. This also fixes two other issues: 1) Upon each login, every entry in the "Anyone" group was getting added to the Buddies group. I didn't notice this earlier, since I usually don't restart gaim very often. 2) No more compile warnings. This also replaces occurrences of ZGetSender and ZGetRealm with gaim_zephyr_get_sender and gaim_zephyr_get_realm(), in preparation for getting gaim to alternately use an external program, "tzc" to talk to zephyr." --Arun A Tharuvai, aka, the lone gaim zepher user committer: Tailor Script <tailor@pidgin.im>

author	Luke Schierer <lschiere@pidgin.im>
date	Fri, 27 Feb 2004 19:25:27 +0000
parents	ef881489396e
children	143d0b29ba82

comparison

equal deleted inserted replaced

-:8ae61bbc479f
+:43dec50d8d51
 #define z_call_s(func, err)	if (func != ZERR_NONE) {\
 					gaim_connection_error(zgc, err);\
 					return;\
 				}
+static const char *local_zephyr_normalize(const char *);
 static const char *zephyr_normalize(const GaimAccount *, const char *);
 /* this is so bad, and if Zephyr weren't so fucked up to begin with I
 * wouldn't do this. but it is so i will. */
 static guint32 nottimer = 0;
 	g_free(zt->class);
 	g_free(zt->instance);
 	g_free(zt->recipient);
 	g_free(zt->name);
 	g_free(zt);
+}
+static const char* gaim_zephyr_get_sender() {
+/* will be useful once this plugin can use a backend other
+than libzephyr */
+return ZGetSender();
+}
+static const char* gaim_zephyr_get_realm() {
+/* will be useful once this plugin can use a backend other
+than libzephyr */
+return ZGetRealm();
 }
 /* returns true if zt1 is a subset of zt2, i.e. zt2 has the same thing or
 * wildcards in each field of zt1. */
 static gboolean triple_subset(zephyr_triple *zt1, zephyr_triple *zt2)
 static gboolean pending_zloc(char *who)
 {
 	GList *curr;
 	for (curr = pending_zloc_names; curr != NULL; curr = curr->next) {
-		if (!g_ascii_strcasecmp(zephyr_normalize(NULL, who), (char*)curr->data)) {
+		if (!g_ascii_strcasecmp(local_zephyr_normalize(who), (char*)curr->data)) {
 			g_free((char*)curr->data);
 			pending_zloc_names = g_list_remove(pending_zloc_names, curr->data);
 			return TRUE;
 		}
 	}
 		}
 	} else {
 		char *buf, *buf2;
 		char *send_inst;
 		char *realmptr;
-		char *sendertmp;
 GaimConversation *gconv1;
 GaimConvChat *gcc;
 		char *ptr = notice.z_message + strlen(notice.z_message) + 1;
 		int len = notice.z_message_len - ((int)ptr - (int)notice.z_message);
+		char *sendertmp = g_strdup_printf("%s",gaim_zephyr_get_sender());
 		GaimConvImFlags flags = 0;
 		if (len > 0) {
 			buf = g_malloc(len + 1);
 			g_snprintf(buf, len + 1, "%s", ptr);
 			g_strchomp(buf);
 					/* If the person is in the default Realm, then strip the
 					   Realm from the sender field */
 					sendertmp = g_strdup_printf("%s",notice.z_sender);
 					if ((realmptr = strchr(sendertmp,'@')) != NULL) {
 						realmptr++;
-						if (!g_ascii_strcasecmp(realmptr,ZGetRealm())) {
+						if (!g_ascii_strcasecmp(realmptr,gaim_zephyr_get_realm())) {
 							realmptr--;
 							sprintf(realmptr,"%c",'\0');
 							send_inst = g_strdup_printf("%s %s",sendertmp,
 										    notice.z_class_inst);
 						} else {
 					serv_got_chat_in(zgc, zt2->id, send_inst, FALSE,
 buf2, time(NULL));
 gconv1 = gaim_find_conversation_with_account(zt2->name,zgc->account);
 gcc = gaim_conversation_get_chat_data(gconv1);
-gaim_conv_chat_set_topic(gcc,sendertmp,notice.z_class_inst);
+/*                                        gaim_conv_chat_set_topic(gcc,sendertmp,notice.z_class_inst);  */
 for(gltmp = gaim_conv_chat_get_users(gcc);gltmp;gltmp=gltmp->next) {
 if (!g_ascii_strcasecmp(gltmp->data,sendertmp) )
 found = 1;
 }
 if (!found) {
 				GaimBuddy *b = (GaimBuddy *)bnode;
 				if(!GAIM_BLIST_NODE_IS_BUDDY(bnode))
 					continue;
 				if(b->account->gc == zgc) {
 					const char *chk;
-					chk = zephyr_normalize(b->account, b->name);
+					chk = local_zephyr_normalize(b->name);
 					/* doesn't matter if this fails or not; we'll just move on to the next one */
 					ZRequestLocations(chk, &ald, UNACKED, ZAUTH);
 					free(ald.user);
 					free(ald.version);
 				}
 		while (fgets(buff, BUFSIZ, f)) {
 			strip_comments(buff);
 			if (buff[0]) {
 				triple = g_strsplit(buff, ",", 3);
 				if (triple[0] && triple[1] ) {
-					/* char *tmp = g_strdup_printf("%s@%s", g_getenv("USER"), ZGetRealm()); */
+					char *tmp = g_strdup_printf("%s",gaim_zephyr_get_sender());
-					char *tmp = g_strdup_printf("%s",ZGetSender());
 					char *atptr;
 					sub.zsub_class = triple[0];
 					sub.zsub_classinst = triple[1];
 					if(triple[2] == NULL) {
 						recip = g_malloc0(1);
 					} else if (!g_ascii_strcasecmp(triple[2], "%me%")) {
-						recip = g_strdup_printf("%s",ZGetSender());
+						recip = g_strdup_printf("%s",gaim_zephyr_get_sender());
 					} else if (!g_ascii_strcasecmp(triple[2], "*")) {
 						/* wildcard
 						 * form of class,instance,* */
 						recip = g_malloc0(1);
 					} else if (!g_ascii_strcasecmp(triple[2], tmp)) {
 						/* form of class,instance,*@ANDREW.CMU.EDU
 						 * class,instance,@ANDREW.CMU.EDU
 						 * If realm is local realm, blank recipient, else
 						 * @REALM-NAME
 						 */
-						char *realmat = g_strdup_printf("@%s", ZGetRealm());
+						char *realmat = g_strdup_printf("@%s", gaim_zephyr_get_realm());
 						if (!g_ascii_strcasecmp(atptr, realmat))
 							recip = g_malloc0(1);
 						else
 							recip = g_strdup(atptr);
 						g_free(realmat);
 	zgc = gaim_account_get_connection(account);
 	z_call_s(ZInitialize(), "Couldn't initialize zephyr");
 	z_call_s(ZOpenPort(NULL), "Couldn't open port");
-	z_call_s(ZSetLocation(gaim_account_get_string(zgc->account,"exposure_level",EXPOSE_REALMVIS)), "Couldn't set location");
+	z_call_s(ZSetLocation((char *)gaim_account_get_string(zgc->account,"exposure_level",EXPOSE_REALMVIS)), "Couldn't set location");
 	sub.zsub_class = "MESSAGE";
 	sub.zsub_classinst = "PERSONAL";
-	sub.zsub_recipient = ZGetSender();
+	sub.zsub_recipient = (char *)gaim_zephyr_get_sender();
 	/* we don't care if this fails. i'm lying right now. */
 	if (ZSubscribeTo(&sub, 1, 0) != ZERR_NONE) {
 		gaim_debug(GAIM_DEBUG_ERROR, "zephyr",
 				   "Couldn't subscribe to messages!\n");
 		zt = s->data;
 		triple = g_strsplit(zt->name,",",3);
 		if (triple[2] != NULL) {
 			if (!g_ascii_strcasecmp(triple[2], "")) {
 				fprintf(fd, "%s,%s,*\n", triple[0], triple[1]);
-			} else if (!g_ascii_strcasecmp(triple[2], ZGetSender())) {
+			} else if (!g_ascii_strcasecmp(triple[2], gaim_zephyr_get_sender())) {
 				fprintf(fd, "%s,%s,%%me%%\n",triple[0],triple[1]);
 			} else {
 				fprintf(fd, "%s\n", zt->name);
 			}
 		} else {
 					if ((ptr = strchr(b->name, '@')) != NULL) {
 						ptr2 = ptr + 1;
 						/* We should only strip the realm name if the principal
 						   is in the user's realm
 						   */
-						if (!g_ascii_strcasecmp(ptr2,ZGetRealm())) {
+						if (!g_ascii_strcasecmp(ptr2,gaim_zephyr_get_realm())) {
 							*ptr = '\0';
 						}
 					}
 					fprintf(fd, "%s\n", b->name);
 					if (ptr)
 GaimBuddy *b;
 if(! (b=gaim_find_buddy(zgc->account,buddy))) {
 b = gaim_buddy_new(zgc->account, buddy, NULL);
 gaim_blist_add_buddy(b, NULL, group, NULL);
 }
+}
+static void zephyr_add_buddies(GaimConnection *gc, GList* buddies) {
+GaimGroup *group;
+	if (!(group = gaim_find_group(_("Anyone")))) {
+		group = gaim_group_new(_("Anyone"));
+		gaim_blist_add_group(group, NULL);
+	}
+while (buddies) {
+zephyr_add_buddy(gc, buddies->data, group);
+buddies = buddies->next;
+}
 }
 static void zephyr_remove_buddy(GaimConnection *gc, const char *buddy, const char *group) {
 GaimBuddy *b;
 fprintf(stderr,"In zephyr_remove_buddy\n");
 if ((b=gaim_find_buddy(zgc->account,buddy)))
 gaim_blist_remove_buddy(b);
 else
 fprintf(stderr,"attempt to remove non-existent buddy %s\n",buddy);
+}
+static void zephyr_remove_buddies(GaimConnection *gc, GList *buddies, const char *group) {
+GaimBuddy *b;
+while(buddies) {
+if ((b=gaim_find_buddy(zgc->account,buddies->data))) {
+gaim_blist_remove_buddy(b);
+}  else {
+fprintf(stderr,"attempt to remove non-existent buddy %s\n",(char *)buddies->data);
+}
+}
 }
 static int zephyr_chat_send(GaimConnection *gc, int id, const char *im)
 {
 	ZNotice_t notice;
 	buf = g_strdup_printf("%s%c%s", sig, '\0', im);
 gconv1 = gaim_find_conversation_with_account(zt->name,zgc->account);
 gcc = gaim_conversation_get_chat_data(gconv1);
-if(!(inst = gaim_conv_chat_get_topic(gcc)))
+if(!(inst = (char *)gaim_conv_chat_get_topic(gcc)))
-inst = notice.z_class_inst;
+inst = (char *)notice.z_class_inst;
 	bzero((char *)&notice, sizeof(notice));
 	notice.z_kind = ACKED;
 	notice.z_port = 0;
 	notice.z_opcode = "";
 	notice.z_class = zt->class;
 	notice.z_class_inst = inst;
 	if (!g_ascii_strcasecmp(zt->recipient, "*"))
-		notice.z_recipient = zephyr_normalize(gc->account, "");
+		notice.z_recipient = local_zephyr_normalize("");
 	else
-		notice.z_recipient = zephyr_normalize(gc->account, zt->recipient);
+		notice.z_recipient = local_zephyr_normalize(zt->recipient);
 	notice.z_sender = 0;
 	notice.z_default_format =
 		"Class $class, Instance $instance:\n"
 		"To: @bold($recipient) at $time $date\n"
 		"From: @bold($1) <$sender>\n\n$2";
 {
 	static char buf[80];
 	if (!g_ascii_strcasecmp(orig, "")) {
 		buf[0] = '\0';
 		return buf;
-	}
+	} else {
+g_snprintf(buf,80,"%s",orig);
+}
+return buf;
+}
+static const char *local_zephyr_normalize(const char *orig)
+{
+	static  char buf[80];
+	if (!g_ascii_strcasecmp(orig, "")) {
+		buf[0] = '\0';
+		return buf;
+	}
 	if (strchr(orig, '@')) {
 		g_snprintf(buf, 80, "%s", orig);
 	} else {
-		g_snprintf(buf, 80, "%s@%s", orig, ZGetRealm());
+g_snprintf(buf,80,"%s@%s",orig,gaim_zephyr_get_realm());
 	}
 	return buf;
 }
 static void zephyr_zloc(GaimConnection *gc, const char *who)
 {
 	ZAsyncLocateData_t ald;
-	if (ZRequestLocations(zephyr_normalize(gc->account, who), &ald, UNACKED, ZAUTH)
+	if (ZRequestLocations(local_zephyr_normalize(who), &ald, UNACKED, ZAUTH)
 					!= ZERR_NONE) {
 		return;
 	}
 	pending_zloc_names = g_list_append(pending_zloc_names,
-					g_strdup(zephyr_normalize(gc->account, who)));
+					g_strdup(local_zephyr_normalize(who)));
 }
 static GList *zephyr_buddy_menu(GaimConnection *gc, const char *who)
 {
 	GList *m = NULL;
 	if (!classname || !instname || !recip)
 		return;
 	if (!g_ascii_strcasecmp(recip, "%me%"))
-		recip = ZGetSender();
+		recip = gaim_zephyr_get_sender();
 	zt1 = new_triple(classname, instname, recip);
 	zt2 = find_sub_by_triple(zt1);
 	if (zt2) {
 		free_triple(zt1);
 static void zephyr_chat_set_topic(GaimConnection *gc, int id, const char *topic) {
 zephyr_triple *zt;
 GaimConversation *gconv;
 GaimConvChat* gcc;
-char* sender = ZGetSender();
+char* sender = (char *)gaim_zephyr_get_sender();
 zt = find_sub_by_id(id);
 gconv = gaim_find_conversation_with_account(zt->name,zgc->account);
 gcc = gaim_conversation_get_chat_data(gconv);
 gaim_conv_chat_set_topic(gcc,sender,topic);
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	zephyr_add_buddy,
-	NULL,
+	zephyr_add_buddies,
 	zephyr_remove_buddy,
-	NULL,
+	zephyr_remove_buddies,
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	NULL,

Mercurial > pidgin

comparison src/protocols/zephyr/zephyr.c @ 8354:43dec50d8d51