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

-:4670ebf1c180
+:7b574a641391
 	g_free(data->who);
 	g_free(data);
 }
 /* this is the right click menu cb thingy */
-static void oscar_ask_direct_im(GaimConnection *gc, const char *who) {
+static void oscar_ask_direct_im(GaimBlistNode *node, gpointer ignored) {
+	GaimBuddy *buddy;
+	GaimConnection *gc;
 	gchar *buf;
-	struct ask_do_dir_im *data = g_new0(struct ask_do_dir_im, 1);
+	struct ask_do_dir_im *data;
-	data->who = g_strdup(who);
+	g_return_if_fail(GAIM_BLIST_NODE_IS_BUDDY(node));
+	buddy = (GaimBuddy *) node;
+	gc = gaim_account_get_connection(buddy->account);
+	data = g_new0(struct ask_do_dir_im, 1);
+	data->who = g_strdup(buddy->name);
 	data->gc = gc;
-	buf = g_strdup_printf(_("You have selected to open a Direct IM connection with %s."), who);
+	buf = g_strdup_printf(_("You have selected to open a Direct IM connection with %s."),
+			buddy->name);
 	gaim_request_action(gc, NULL, buf,
-						_("Because this reveals your IP address, it "
+			_("Because this reveals your IP address, it "
-						  "may be considered a privacy risk.  Do you "
+			  "may be considered a privacy risk.  Do you "
-						  "wish to continue?"),
+			  "wish to continue?"),
-						0, data, 2,
+			0, data, 2,
-						_("Connect"), G_CALLBACK(oscar_direct_im),
+			_("Connect"), G_CALLBACK(oscar_direct_im),
-						_("Cancel"), G_CALLBACK(oscar_cancel_direct_im));
+			_("Cancel"), G_CALLBACK(oscar_cancel_direct_im));
 	g_free(buf);
 }
 /*****************************************************************************
 * End scary direct im stuff
 		xfer->fd = 0;
 		gaim_xfer_set_completed(xfer, TRUE);
 	}
 }
-static void oscar_ask_sendfile(GaimConnection *gc, const char *destsn) {
+static void oscar_ask_sendfile(GaimBlistNode *node, gpointer data) {
-	OscarData *od = (OscarData *)gc->proto_data;
+	GaimBuddy *buddy;
+	GaimConnection *gc;
+	OscarData *od;
 	GaimXfer *xfer;
 	struct aim_oft_info *oft_info;
 	const char *ip;
+	g_return_if_fail(GAIM_BLIST_NODE_IS_BUDDY(node));
+	buddy = (GaimBuddy *) node;
+	gc = gaim_account_get_connection(buddy->account);
+	od = (OscarData *)gc->proto_data;
 	/* You want to send a file to someone else, you're so generous */
 	/* Build the file transfer handle */
-	xfer = gaim_xfer_new(gaim_connection_get_account(gc), GAIM_XFER_SEND, destsn);
+	xfer = gaim_xfer_new(buddy->account, GAIM_XFER_SEND, buddy->name);
 	/* Create the oscar-specific data */
 	ip = gaim_network_get_my_ip(od->conn ? od->conn->fd : -1);
-	oft_info = aim_oft_createinfo(od->sess, NULL, destsn, ip, 0, 0, 0, NULL);
+	oft_info = aim_oft_createinfo(od->sess, NULL, buddy->name, ip, 0, 0, 0, NULL);
 	xfer->data = oft_info;
 	 /* Setup our I/O op functions */
 	gaim_xfer_set_init_fnc(xfer, oscar_xfer_init_send);
 	gaim_xfer_set_end_fnc(xfer, oscar_xfer_end);
 	}
 	oscar_free_name_data(data);
 }
-static void gaim_auth_sendrequest(GaimConnection *gc, const char *name) {
+static void gaim_auth_sendrequest(GaimConnection *gc, char *name) {
 	struct name_data *data = g_new(struct name_data, 1);
 	GaimBuddy *buddy;
 	gchar *dialog_msg, *nombre;
 	buddy = gaim_find_buddy(gc->account, name);
 						G_CALLBACK(gaim_auth_request_msgprompt),
 						_("Cancel"), G_CALLBACK(gaim_auth_dontrequest));
 	g_free(dialog_msg);
 	g_free(nombre);
+}
+static void gaim_auth_sendrequest_menu(GaimBlistNode *node, gpointer ignored) {
+	GaimBuddy *buddy;
+	GaimConnection *gc;
+	g_return_if_fail(GAIM_BLIST_NODE_IS_BUDDY(node));
+	buddy = (GaimBuddy *) node;
+	gc = gaim_account_get_connection(buddy->account);
+	gaim_auth_sendrequest(gc, buddy->name);
 }
 /* When other people ask you for authorization */
 static void gaim_auth_grant(struct name_data *data) {
 	GaimConnection *gc = data->gc;
 			}
 		}
 	}
 	return 0;
 }
-static void oscar_ask_direct_im(GaimConnection *gc, const char *name);
 static int gaim_odc_send_im(aim_session_t *, aim_conn_t *, const char *, GaimConvImFlags);
 static int oscar_send_im(GaimConnection *gc, const char *name, const char *message, GaimConvImFlags imflags) {
 	OscarData *od = (OscarData *)gc->proto_data;
 	struct oscar_direct_im *dim = oscar_direct_im_find(od, name);
 		gaim_check_comment(od, text);
 	oscar_free_name_data(data);
 }
-static void oscar_buddycb_edit_comment(GaimConnection *gc, const char *name) {
+static void oscar_buddycb_edit_comment(GaimBlistNode *node, gpointer ignore) {
-	OscarData *od = gc->proto_data;
-	struct name_data *data = g_new(struct name_data, 1);
+	GaimBuddy *buddy;
-	GaimBuddy *b;
+	GaimConnection *gc;
+	OscarData *od;
+	struct name_data *data;
 	GaimGroup *g;
 	char *comment;
 	gchar *comment_utf8;
-	if (!(b = gaim_find_buddy(gaim_connection_get_account(gc), name)))
+	g_return_if_fail(GAIM_BLIST_NODE_IS_BUDDY(node));
+	buddy = (GaimBuddy *) node;
+	gc = gaim_account_get_connection(buddy->account);
+	od = gc->proto_data;
+	data = g_new(struct name_data, 1);
+	if (!(g = gaim_find_buddys_group(buddy)))
 		return;
-	if (!(g = gaim_find_buddys_group(b)))
+	comment = aim_ssi_getcomment(od->sess->ssi.local, g->name, buddy->name);
-		return;
-	comment = aim_ssi_getcomment(od->sess->ssi.local, g->name, name);
 	comment_utf8 = comment ? gaim_utf8_try_convert(comment) : NULL;
 	data->gc = gc;
-	data->name = g_strdup(name);
+	data->name = g_strdup(buddy->name);
 	data->nick = NULL;
 	gaim_request_input(gc, NULL, _("Buddy Comment:"), NULL,
 					   comment_utf8, TRUE, FALSE, NULL,
 					   _("OK"), G_CALLBACK(oscar_ssi_editcomment),
 	free(comment);
 	g_free(comment_utf8);
 }
-static GList *oscar_buddy_menu(GaimConnection *gc, const char *who) {
+static GList *oscar_buddy_menu(GaimBuddy *buddy) {
+	GaimConnection *gc = gaim_account_get_connection(buddy->account);
 	OscarData *od = gc->proto_data;
 	GList *m = NULL;
-	struct proto_buddy_menu *pbm;
+	GaimBlistNodeAction *act;
-	pbm = g_new0(struct proto_buddy_menu, 1);
+	act = gaim_blist_node_action_new(_("Edit Buddy Comment"),
-	pbm->label = _("Edit Buddy Comment");
+			oscar_buddycb_edit_comment, NULL);
-	pbm->callback = oscar_buddycb_edit_comment;
+	m = g_list_append(m, act);
-	pbm->gc = gc;
-	m = g_list_append(m, pbm);
 	if (od->icq) {
 #if 0
-		pbm = g_new0(struct proto_buddy_menu, 1);
+		act = gaim_blist_node_action_new(_("Get Status Msg"),
-		pbm->label = _("Get Status Msg");
+				oscar_get_icqstatusmsg, NULL);
-		pbm->callback = oscar_get_icqstatusmsg;
+		m = g_list_append(m, act);
-		pbm->gc = gc;
-		m = g_list_append(m, pbm);
 #endif
 	} else {
-		GaimBuddy *b = gaim_find_buddy(gc->account, who);
 		aim_userinfo_t *userinfo;
+		userinfo = aim_locate_finduserinfo(od->sess, buddy->name);
-		if (b)
-			userinfo = aim_locate_finduserinfo(od->sess, b->name);
+		if (userinfo && aim_sncmp(gaim_account_get_username(buddy->account), buddy->name) &&
+				GAIM_BUDDY_IS_ONLINE(buddy)) {
-		if (b && userinfo && aim_sncmp(gaim_account_get_username(gaim_connection_get_account(gc)), who) && GAIM_BUDDY_IS_ONLINE(b)) {
 			if (userinfo->capabilities & AIM_CAPS_DIRECTIM) {
-				pbm = g_new0(struct proto_buddy_menu, 1);
+				act = gaim_blist_node_action_new(_("Direct IM"),
-				pbm->label = _("Direct IM");
+						oscar_ask_direct_im, NULL);
-				pbm->callback = oscar_ask_direct_im;
+				m = g_list_append(m, act);
-				pbm->gc = gc;
-				m = g_list_append(m, pbm);
 			}
 			if (userinfo->capabilities & AIM_CAPS_SENDFILE) {
-				pbm = g_new0(struct proto_buddy_menu, 1);
+				act = gaim_blist_node_action_new(_("Send File"),
-				pbm->label = _("Send File");
+						oscar_ask_sendfile, NULL);
-				pbm->callback = oscar_ask_sendfile;
+				m = g_list_append(m, act);
-				pbm->gc = gc;
-				m = g_list_append(m, pbm);
 			}
 #if 0
 			if (userinfo->capabilities & AIM_CAPS_GETFILE) {
-				pbm = g_new0(struct proto_buddy_menu, 1);
+				act = gaim_blist_node_action_new(_("Get File"),
-				pbm->label = _("Get File");
+						oscar_ask_getfile, NULL);
-				pbm->callback = oscar_ask_getfile;
+				m = g_list_append(m, act);
-				pbm->gc = gc;
-				m = g_list_append(m, pbm);
 			}
 #endif
 		}
 	}
 	if (od->sess->ssi.received_data) {
-		char *gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, who);
+		char *gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, buddy->name);
-		if (gname && aim_ssi_waitingforauth(od->sess->ssi.local, gname, who)) {
+		if (gname && aim_ssi_waitingforauth(od->sess->ssi.local, gname, buddy->name)) {
-			pbm = g_new0(struct proto_buddy_menu, 1);
+			act = gaim_blist_node_action_new(_("Re-request Authorization"),
-			pbm->label = _("Re-request Authorization");
+					gaim_auth_sendrequest_menu, NULL);
-			pbm->callback = gaim_auth_sendrequest;
+			m = g_list_append(m, act);
-			pbm->gc = gc;
-			m = g_list_append(m, pbm);
 		}
 	}
 	return m;
 }
+static GList *oscar_blist_node_menu(GaimBlistNode *node) {
+	if(GAIM_BLIST_NODE_IS_BUDDY(node)) {
+		return oscar_buddy_menu((GaimBuddy *) node);
+	} else {
+		return NULL;
+	}
+}
 static void oscar_format_screenname(GaimConnection *gc, const char *nick) {
 	OscarData *od = gc->proto_data;
 	if (!aim_sncmp(gaim_account_get_username(gaim_connection_get_account(gc)), nick)) {
 		if (!aim_getconn_type(od->sess, AIM_CONN_TYPE_AUTH)) {
 	oscar_list_icon,
 	oscar_list_emblems,
 	oscar_status_text,
 	oscar_tooltip_text,
 	oscar_away_states,
-	oscar_buddy_menu,
+	oscar_blist_node_menu,
 	oscar_chat_info,
 	oscar_login,
 	oscar_close,
 	oscar_send_im,
 	oscar_set_info,
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	NULL,
-	NULL,
 	NULL
 };
 static GaimPluginInfo info =
 {

Mercurial > pidgin3 / file comparison

comparison: src/protocols/oscar/oscar.c

src/protocols/oscar/oscar.c