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

comparison src/protocols/oscar/oscar.c @ 4269:ff0642fab1d5

[gaim-migrate @ 4520] Our cable was out again, so I was left doing dull stuff. I changed the alias_buddy prpl function so that it takes the alias as well as just the buddy name. It seemed silly not to pass the alias to a function that changes the alias. I added a call back for this prpl function in oscar.c. This has the effect of, when you add/change/remove the alias of a buddy, it also changes the alias in the server list. I changed some normalize calls in oscar.c because I think it's better this way. I could be wrong. I added the ability to re-request authorization from contacts that have not authorized you yet. Just right-click on those mofo's. I shuffled some functions around. oscar.c is a little messy. Our cable was out some today. Here's the message they have when you call their customer support: "All high speed data customers in the 919 and 252 area code may experience flashing status lights on their cable modems with inability to access online services at this time." 919 is basically all of Raleigh. I'm going to estimate at least 10,000 people with Time Warner cable. That's a lot of people. Time Warner sucks. This is from a few hours today: "15566 packets transmitted, 598 packets received, +8 duplicates, 96% packet loss" committer: Tailor Script <tailor@pidgin.im>

author	Mark Doliner <mark@kingant.net>
date	Thu, 09 Jan 2003 21:21:00 +0000
parents	f68c4203d001
children	32fcf4cf5f80

comparison

equal deleted inserted replaced

-:69d38d5d06dd
+:ff0642fab1d5
 	g_free(data);
 }
 static struct direct_im *find_direct_im(struct oscar_data *od, const char *who) {
 	GSList *d = od->direct_ims;
-	char *n = g_strdup(normalize(who));
 	struct direct_im *m = NULL;
 	while (d) {
 		m = (struct direct_im *)d->data;
-		if (!strcmp(n, normalize(m->name)))
+		if (aim_sncmp(who, m->name))
-			break;
+			return m;
-		m = NULL;
 		d = d->next;
 	}
-	g_free(n);
+	return NULL;
-	return m;
 }
 static char *extract_name(const char *name) {
 	char *tmp, *x;
 	int i, j;
 	struct oscar_data *od = gc->proto_data;
 	aim_userinfo_t *info;
 	time_t time_idle = 0, signon = 0;
 	int type = 0;
 	int caps = 0;
-	char *tmp;
 	va_list ap;
 	va_start(ap, fr);
 	info = va_arg(ap, aim_userinfo_t *);
 	va_end(ap);
 	}
 	if (info->present & AIM_USERINFO_PRESENT_SESSIONLEN)
 		signon = time(NULL) - info->sessionlen;
-	tmp = g_strdup(normalize(gc->username));
+	if (!aim_sncmp(gc->username, info->sn))
-	if (!strcmp(tmp, normalize(info->sn)))
 		g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", info->sn);
-	g_free(tmp);
 	serv_got_update(gc, info->sn, 1, info->warnlevel/10, signon,
 			time_idle, type, caps);
 	return 1;
 		flags |= IM_FLAG_AWAY;
 	if (args->icbmflags & AIM_IMFLAGS_HASICON) {
 		struct icon_req *ir = NULL;
 		GSList *h = od->hasicons;
-		char *who = normalize(userinfo->sn);
 		if (!args->iconlen || !args->iconsum || !args->iconstamp)
 		    return 1;
 		debug_printf("%s has an icon\n", userinfo->sn);
 		while (h) {
 			ir = h->data;
-			if (!strcmp(ir->user, who))
+			if (!aim_sncmp(userinfo->sn, ir->user))
 				break;
 			h = h->next;
 		}
 		if (!h) {
 			ir = g_new0(struct icon_req, 1);
-			ir->user = g_strdup(who);
+			ir->user = g_strdup(normalize(userinfo->sn));
 			od->hasicons = g_slist_append(od->hasicons, ir);
 		}
 		if ((args->iconlen != ir->length) ||
 		    (args->iconsum != ir->checksum) ||
 		    (args->iconstamp != ir->timestamp))
 /*
 * Authorization Functions
 * Most of these are callbacks from dialogs.  They're used by both
 * methods of authorization (SSI and old-school channel 4 ICBM)
 */
+/* When you ask other people for authorization */
 static void gaim_auth_request(struct name_data *data) {
 	struct gaim_connection *gc = data->gc;
 	if (g_slist_find(connections, gc)) {
 		struct oscar_data *od = gc->proto_data;
 		struct buddy *buddy = find_buddy(gc, data->name);
 		struct group *group = find_group_by_buddy(gc, data->name);
 		if (buddy && group) {
 			debug_printf("ssi: adding buddy %s to group %s\n", buddy->name, group->name);
 			aim_ssi_sendauthrequest(od->sess, od->conn, data->name, "Please authorize me so I can add you to my buddy list.");
-			aim_ssi_addbuddy(od->sess, od->conn, buddy->name, group->name, get_buddy_alias_only(buddy), NULL, NULL, 1);
+			if (!aim_ssi_itemlist_finditem(od->sess->ssi.local, group->name, buddy->name, AIM_SSI_TYPE_BUDDY))
+				aim_ssi_addbuddy(od->sess, od->conn, buddy->name, group->name, get_buddy_alias_only(buddy), NULL, NULL, 1);
 		}
 	}
 	gaim_free_name_data(data);
 }
 		/* struct oscar_data *od = gc->proto_data; */
 		/* XXX - Take the buddy out of our buddy list */
 	}
 	gaim_free_name_data(data);
+}
+static void gaim_auth_sendrequest(struct gaim_connection *gc, char *name) {
+	struct name_data *data = g_new(struct name_data, 1);
+	struct buddy *buddy;
+	gchar *dialog_msg, *nombre;
+	buddy = find_buddy(gc, name);
+	if (buddy && (get_buddy_alias_only(buddy)))
+		nombre = g_strdup_printf("%s (%s)", name, get_buddy_alias_only(buddy));
+	else
+		nombre = g_strdup(name);
+	dialog_msg = g_strdup_printf(_("The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"), nombre);
+	data->gc = gc;
+	data->name = g_strdup(name);
+	data->nick = NULL;
+	do_ask_dialog(_("Request Authorization"), dialog_msg, data, _("Request Authorization"), gaim_auth_request, _("Cancel"), gaim_auth_dontrequest, my_protocol->plug ? my_protocol->plug->handle : NULL, FALSE);
+	g_free(dialog_msg);
+	g_free(nombre);
 }
 /* When other people ask you for authorization */
 static void gaim_auth_grant(struct name_data *data) {
 	struct gaim_connection *gc = data->gc;
 	return 1;
 }
 static int gaim_chat_incoming_msg(aim_session_t *sess, aim_frame_t *fr, ...) {
+	struct gaim_connection *gc = sess->aux_data;
 	va_list ap;
 	aim_userinfo_t *info;
 	char *msg;
-	struct gaim_connection *gc = sess->aux_data;
 	struct chat_connection *ccon = find_oscar_chat_by_conn(gc, fr->conn);
-	char *tmp;
 	va_start(ap, fr);
 	info = va_arg(ap, aim_userinfo_t *);
 	msg = va_arg(ap, char *);
 	va_end(ap);
-	tmp = g_malloc(BUF_LONG);
+	serv_got_chat_in(gc, ccon->id, info->sn, 0, msg, time((time_t)NULL));
-	g_snprintf(tmp, BUF_LONG, "%s", msg);
-	serv_got_chat_in(gc, ccon->id, info->sn, 0, tmp, time((time_t)NULL));
-	g_free(tmp);
 	return 1;
 }
 static int gaim_email_parseupdate(aim_session_t *sess, aim_frame_t *fr, ...) {
 	emailinfo = va_arg(ap, struct aim_emailinfo *);
 	havenewmail = va_arg(ap, int);
 	va_end(ap);
 	if (emailinfo) {
-		debug_printf("Got email info. webmail address for screenname@%s is %s,  new email: %hhu,  number new: %hu,  flag is %hu, havenewmail is %d\n", emailinfo->domain, emailinfo->url, emailinfo->unread, emailinfo->nummsgs, emailinfo->flag, havenewmail);
+		debug_printf("Got email info. domain is %s,  webmail is %s,  new email: %hhu,  number new: %hu,  flag is %hu, havenewmail is %d\n", emailinfo->domain, emailinfo->url, emailinfo->unread, emailinfo->nummsgs, emailinfo->flag, havenewmail);
 		if (emailinfo->unread) {
 			if (havenewmail)
 				connection_has_mail(gc, emailinfo->nummsgs ? emailinfo->nummsgs : -1, NULL, NULL, emailinfo->url);
 		} else
 			connection_has_mail(gc, 0, NULL, NULL, emailinfo->url);
 	struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
 	struct direct_im *dim = find_direct_im(odata, name);
 	if (dim)
 		aim_send_typing(odata->sess, dim->conn, typing);
 	else {
-		char *who = normalize(name);
+		if (g_hash_table_lookup(odata->supports_tn, normalize(name))) {
-		if (g_hash_table_lookup(odata->supports_tn, who)) {
 			if (typing == TYPING)
 				aim_mtn_send(odata->sess, 0x0001, name, 0x0002);
 			else if (typing == TYPED)
 				aim_mtn_send(odata->sess, 0x0001, name, 0x0001);
 			else
 		GSList *h = odata->hasicons;
 		struct icon_req *ir = NULL;
 		char *who = normalize(name);
 		struct stat st;
 		int len;
 		args.flags = AIM_IMFLAGS_ACK | AIM_IMFLAGS_CUSTOMFEATURES;
 		if (odata->icq)
 			args.flags |= AIM_IMFLAGS_OFFLINE;
 		args.features = gaim_features;
 		args.featureslen = sizeof(gaim_features);
 		while (h) {
 			ir = h->data;
 			if (ir->request && !strcmp(who, ir->user))
 				break;
 			h = h->next;
 		if (h) {
 			ir->request = FALSE;
 			args.flags |= AIM_IMFLAGS_BUDDYREQ;
 			debug_printf("sending buddy icon request with message\n");
 		}
 		if (gc->user->iconfile[0] && !stat(gc->user->iconfile, &st)) {
 			FILE *file = fopen(gc->user->iconfile, "r");
 			if (file) {
 				char *buf = g_malloc(st.st_size);
 				fread(buf, 1, st.st_size, file);
 				args.iconlen   = st.st_size;
 				args.iconsum   = aim_iconsum(buf, st.st_size);
 				args.iconstamp = st.st_mtime;
 				args.flags |= AIM_IMFLAGS_HASICON;
 				fclose(file);
 				g_free(buf);
 			}
 		}
 		args.destsn = name;
 		len = strlen(message);
 		args.flags |= check_encoding(message);
 		if (args.flags & AIM_IMFLAGS_UNICODE) {
 			debug_printf("Sending Unicode IM\n");
 			args.msg = g_convert(message, len, "UCS-2BE", "UTF-8", NULL, &len, &err);
 			}
 		} else {
 			args.msg = message;
 		}
 		args.msglen = len;
 		ret = aim_send_im_ext(odata->sess, &args);
 	}
 	if (ret >= 0)
 		return 1;
 	return ret;
 		}
 	}
 #endif
 }
-#ifndef NOSSI
-static void oscar_move_buddy(struct gaim_connection *gc, const char *name, const char *old_group, const char *new_group) {
-	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
-	if (od->sess->ssi.received_data) {
-		debug_printf("ssi: moving buddy %s from group %s to group %s\n", name, old_group, new_group);
-		aim_ssi_movebuddy(od->sess, od->conn, old_group, new_group, name);
-	}
-}
-#endif
 static void oscar_remove_buddy(struct gaim_connection *gc, char *name, char *group) {
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
 #ifdef NOSSI
 	aim_remove_buddy(od->sess, od->conn, name);
 #else
 	}
 #endif
 }
 #ifndef NOSSI
+static void oscar_move_buddy(struct gaim_connection *gc, const char *name, const char *old_group, const char *new_group) {
+	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
+	if (od->sess->ssi.received_data) {
+		debug_printf("ssi: moving buddy %s from group %s to group %s\n", name, old_group, new_group);
+		aim_ssi_movebuddy(od->sess, od->conn, old_group, new_group, name);
+	}
+}
+static void oscar_alias_buddy(struct gaim_connection *gc, const char *name, const char *alias) {
+	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
+	if (od->sess->ssi.received_data) {
+		char *gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, name);
+		if (gname) {
+			debug_printf("ssi: changing the alias for buddy %s to %s\n", name, alias);
+			aim_ssi_aliasbuddy(od->sess, od->conn, gname, name, alias);
+		}
+	}
+}
 static void oscar_rename_group(struct gaim_connection *g, const char *old_group, const char *new_group, GList *members) {
 	struct oscar_data *od = (struct oscar_data *)g->proto_data;
 	if (od->sess->ssi.received_data) {
 		if (aim_ssi_itemlist_finditem(od->sess->ssi.local, new_group, NULL, AIM_SSI_TYPE_GROUP)) {
 						debug_printf("ssi: adding buddy %s to group %s to local list\n", curitem->name, gname);
 						add_buddy(gc, (gname ? gname : "orphans"), curitem->name, alias);
 						free(alias);
 						tmp++;
 					}
-					if (curitem->name && gname && aim_ssi_waitingforauth(sess->ssi.local, gname, curitem->name)) {
+					if (curitem->name && gname && aim_ssi_waitingforauth(sess->ssi.local, gname, curitem->name))
-						struct name_data *data = g_new(struct name_data, 1);
+						gaim_auth_sendrequest(gc, curitem->name);
-						gchar *dialog_msg, *nombre;
-						struct buddy *buddy;
-						buddy = find_buddy(gc, curitem->name);
-						if (buddy && (get_buddy_alias_only(buddy)))
-							nombre = g_strdup_printf("%s (%s)", curitem->name, get_buddy_alias_only(buddy));
-						else
-							nombre = g_strdup(curitem->name);
-						dialog_msg = g_strdup_printf(_("The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"), nombre);
-						data->gc = gc;
-						data->name = g_strdup(curitem->name);
-						data->nick = NULL;
-						do_ask_dialog(_("Request Authorization"), dialog_msg, data, _("Request Authorization"), gaim_auth_request, _("Cancel"), gaim_auth_dontrequest, my_protocol->plug ? my_protocol->plug->handle : NULL, FALSE);
-						g_free(dialog_msg);
-						g_free(nombre);
-					}
 				}
 			} break;
 			case 0x0001: { /* Group */
 	} /* end if (gc) */
 	return 1;
 }
-#endif
 static int gaim_ssi_parseack(aim_session_t *sess, aim_frame_t *fr, ...) {
 	struct gaim_connection *gc = sess->aux_data;
 	va_list ap;
 	struct aim_ssi_tmp *retval;
 		switch (retval->ack) {
 			case 0x0000: { /* added successfully */
 			} break;
 			case 0x000e: { /* contact requires authorization */
-				if (retval->action == AIM_CB_SSI_ADD) {
+				if (retval->action == AIM_CB_SSI_ADD)
-					struct name_data *data = g_new(struct name_data, 1);
+					gaim_auth_sendrequest(gc, retval->name);
-					struct buddy *buddy;
-					gchar *dialog_msg, *nombre;
-					buddy = find_buddy(gc, retval->name);
-					if (buddy && (get_buddy_alias_only(buddy)))
-						nombre = g_strdup_printf("%s (%s)", retval->name, get_buddy_alias_only(buddy));
-					else
-						nombre = g_strdup(retval->name);
-					dialog_msg = g_strdup_printf(_("The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"), nombre);
-					data->gc = gc;
-					data->name = g_strdup(retval->name);
-					data->nick = NULL;
-					do_ask_dialog(_("Request Authorization"), dialog_msg, data, _("Request Authorization"), gaim_auth_request, _("Cancel"), gaim_auth_dontrequest, my_protocol->plug ? my_protocol->plug->handle : NULL, FALSE);
-					g_free(dialog_msg);
-					g_free(nombre);
-				}
 			} break;
 			default: { /* La la la */
 				debug_printf("ssi: Action 0x%04hx was unsuccessful with error 0x%04hx\n", retval->action, retval->ack);
 				/* Should remove buddy from local list and give an error message? */
 	debug_printf("ssi: %s added you to their buddy list\n", sn);
 	show_got_added(gc, NULL, sn, (buddy ? get_buddy_alias_only(buddy) : NULL), NULL);
 	return 1;
 }
+#endif
 static GList *oscar_chat_info(struct gaim_connection *gc) {
 	GList *m = NULL;
 	struct proto_chat_entry *pce;
 	} else
 		oscar_get_info(gc, who);
 }
 static GList *oscar_buddy_menu(struct gaim_connection *gc, char *who) {
+	struct oscar_data *od = gc->proto_data;
 	GList *m = NULL;
 	struct proto_buddy_menu *pbm;
-	char *n = g_strdup(normalize(gc->username));
-	struct oscar_data *odata = gc->proto_data;
 	pbm = g_new0(struct proto_buddy_menu, 1);
 	pbm->label = _("Get Info");
 	pbm->callback = oscar_get_info;
 	pbm->gc = gc;
 	m = g_list_append(m, pbm);
-	if (odata->icq) {
+	if (od->icq) {
 		pbm = g_new0(struct proto_buddy_menu, 1);
 		pbm->label = _("Get Status Msg");
 		pbm->callback = oscar_get_away_msg;
 		pbm->gc = gc;
 		m = g_list_append(m, pbm);
 		pbm->label = _("Get Away Msg");
 		pbm->callback = oscar_get_away_msg;
 		pbm->gc = gc;
 		m = g_list_append(m, pbm);
-		if (strcmp(n, normalize(who))) {
+		if (aim_sncmp(gc->username, who)) {
 			pbm = g_new0(struct proto_buddy_menu, 1);
 			pbm->label = _("Direct IM");
 			pbm->callback = oscar_ask_direct_im;
 			pbm->gc = gc;
 			m = g_list_append(m, pbm);
 	pbm->label = _("Get Capabilities");
 	pbm->callback = oscar_get_caps;
 	pbm->gc = gc;
 	m = g_list_append(m, pbm);
-	g_free(n);
 	return m;
 }
 static GList *oscar_edit_buddy_menu(struct gaim_connection *gc, char *who)
 {
+	struct oscar_data *od = gc->proto_data;
 	GList *m = NULL;
 	struct proto_buddy_menu *pbm;
-	struct oscar_data *odata = gc->proto_data;
+	if (od->icq) {
-	if (odata->icq) {
 		pbm = g_new0(struct proto_buddy_menu, 1);
 		pbm->label = _("Get Info");
 		pbm->callback = oscar_get_info;
 		pbm->gc = gc;
 		m = g_list_append(m, pbm);
+		if (od->sess->ssi.received_data) {
+			char *gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, who);
+			if (gname && aim_ssi_waitingforauth(od->sess->ssi.local, gname, who)) {
+				pbm = g_new0(struct proto_buddy_menu, 1);
+				pbm->label = _("Re-Request Authorization");
+				pbm->callback = gaim_auth_sendrequest;
+				pbm->gc = gc;
+				m = g_list_append(m, pbm);
+			}
+		}
 	}
 	return m;
 }
 		aim_ssi_setpermdeny(od->sess, od->conn, gc->permdeny, 0xffffffff);
 #endif
 }
 static void oscar_add_permit(struct gaim_connection *gc, char *who) {
+#ifdef NOSSI
+	if (gc->permdeny == 3)
+		oscar_set_permit_deny(gc);
+#else
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
-#ifdef NOSSI
-	if (gc->permdeny != 3) return;
-	oscar_set_permit_deny(gc);
-#else
 	debug_printf("ssi: About to add a permit\n");
 	if (od->sess->ssi.received_data)
 		aim_ssi_addpermit(od->sess, od->conn, who);
 #endif
 }
 static void oscar_add_deny(struct gaim_connection *gc, char *who) {
+#ifdef NOSSI
+	if (gc->permdeny == 4)
+		oscar_set_permit_deny(gc);
+#else
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
-#ifdef NOSSI
-	if (gc->permdeny != 4) return;
-	oscar_set_permit_deny(gc);
-#else
 	debug_printf("ssi: About to add a deny\n");
 	if (od->sess->ssi.received_data)
 		aim_ssi_adddeny(od->sess, od->conn, who);
 #endif
 }
 static void oscar_rem_permit(struct gaim_connection *gc, char *who) {
+#ifdef NOSSI
+	if (gc->permdeny == 3)
+		oscar_set_permit_deny(gc);
+#else
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
-#ifdef NOSSI
-	if (gc->permdeny != 3) return;
-	oscar_set_permit_deny(gc);
-#else
 	debug_printf("ssi: About to delete a permit\n");
 	if (od->sess->ssi.received_data)
 		aim_ssi_delpermit(od->sess, od->conn, who);
 #endif
 }
 static void oscar_rem_deny(struct gaim_connection *gc, char *who) {
+#ifdef NOSSI
+	if (gc->permdeny == 4)
+		oscar_set_permit_deny(gc);
+#else
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
-#ifdef NOSSI
-	if (gc->permdeny != 4) return;
-	oscar_set_permit_deny(gc);
-#else
 	debug_printf("ssi: About to delete a deny\n");
 	if (od->sess->ssi.received_data)
 		aim_ssi_deldeny(od->sess, od->conn, who);
 #endif
 }
 	}
 }
 static void oscar_format_screenname(struct gaim_connection *gc, char *nick) {
 	struct oscar_data *od = gc->proto_data;
-	if (!strcmp(normalize(nick), normalize(gc->username))) {
+	if (!aim_sncmp(gc->username, nick)) {
 		if (!aim_getconn_type(od->sess, AIM_CONN_TYPE_AUTH)) {
 			od->setnick = TRUE;
 			od->newsn = g_strdup(nick);
 			aim_reqservice(od->sess, od->conn, AIM_CONN_TYPE_AUTH);
 		} else {
 	ret->dir_search = oscar_dir_search;
 	ret->set_idle = oscar_set_idle;
 	ret->change_passwd = oscar_change_passwd;
 	ret->add_buddy = oscar_add_buddy;
 	ret->add_buddies = oscar_add_buddies;
+	ret->remove_buddy = oscar_remove_buddy;
+	ret->remove_buddies = oscar_remove_buddies;
 #ifndef NOSSI
 	ret->group_buddy = oscar_move_buddy;
+	ret->alias_buddy = oscar_alias_buddy;
 	ret->rename_group = oscar_rename_group;
 #endif
+	ret->add_permit = oscar_add_permit;
+	ret->add_deny = oscar_add_deny;
+	ret->rem_permit = oscar_rem_permit;
+	ret->rem_deny = oscar_rem_deny;
+	ret->set_permit_deny = oscar_set_permit_deny;
 	ret->file_transfer_cancel = oscar_file_transfer_cancel;
 	ret->file_transfer_in = oscar_file_transfer_in;
 	ret->file_transfer_out = oscar_file_transfer_out;
 	ret->file_transfer_data_chunk = oscar_file_transfer_data_chunk;
 	ret->file_transfer_nextfile = oscar_file_transfer_nextfile;
 	ret->file_transfer_done = oscar_file_transfer_done;
-	ret->remove_buddy = oscar_remove_buddy;
-	ret->remove_buddies = oscar_remove_buddies;
-	ret->add_permit = oscar_add_permit;
-	ret->add_deny = oscar_add_deny;
-	ret->rem_permit = oscar_rem_permit;
-	ret->rem_deny = oscar_rem_deny;
-	ret->set_permit_deny = oscar_set_permit_deny;
 	ret->warn = oscar_warn;
 	ret->chat_info = oscar_chat_info;
 	ret->join_chat = oscar_join_chat;
 	ret->chat_invite = oscar_chat_invite;
 	ret->chat_leave = oscar_chat_leave;

Mercurial > pidgin

comparison src/protocols/oscar/oscar.c @ 4269:ff0642fab1d5