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

comparison src/protocols/oscar/oscar.c @ 5836:09f7f23dc83a

[gaim-migrate @ 6267] I think I've fixed the negative online time for real, now. Or, at least reduced the frequency of it happening. Also added the ability to see iChat's "available" messages. Sean, I ended up changing more than I thought I would have to, but that's partially because I like to change things a lot. If it conflicts or whatever feel free to back it out and I can re-patch it back in when you're done with your stuff. committer: Tailor Script <tailor@pidgin.im>

author	Mark Doliner <mark@kingant.net>
date	Thu, 12 Jun 2003 03:27:58 +0000
parents	136f26dcfeda
children	a48c338dff6c

comparison

equal deleted inserted replaced

-:9a08899192ee
+:09f7f23dc83a
 /* Various PRPL-specific buddy info that we want to keep track of */
 struct buddyinfo {
 	time_t signon;
 	int caps;
 	gboolean typingnot;
+	gchar *availablemsg;
+	unsigned long ico_me_len;
+	unsigned long ico_me_csum;
+	time_t ico_me_time;
+	gboolean ico_informed;
 	unsigned long ico_len;
 	unsigned long ico_csum;
 	time_t ico_time;
 	gboolean ico_need;
-	unsigned long ico_me_len;
-	unsigned long ico_me_csum;
-	time_t ico_me_time;
-	gboolean ico_informed;
 	fu16_t iconcsumlen;
-	fu8_t iconcsum[30];
+	fu8_t *iconcsum;
 };
 struct name_data {
 	GaimConnection *gc;
 	gchar *name;
 static gboolean gaim_icon_timerfunc(gpointer data);
 /* prpl actions - remove this at some point */
 static void oscar_set_info(GaimConnection *gc, char *text);
-static void gaim_free_name_data(struct name_data *data) {
+static void oscar_free_name_data(struct name_data *data) {
 	g_free(data->name);
 	g_free(data->nick);
 	g_free(data);
+}
+static void oscar_free_buddyinfo(void *data) {
+	struct buddyinfo *bi = data;
+	g_free(bi->availablemsg);
+	g_free(bi->iconcsum);
+	g_free(bi);
 }
 static fu32_t oscar_encoding_check(const char *utf8)
 {
 	int i = 0;
 		od->icq = TRUE;
 	} else {
 		gc->flags |= OPT_CONN_HTML;
 		gc->flags |= OPT_CONN_AUTO_RESP;
 	}
-	od->buddyinfo = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+	od->buddyinfo = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, oscar_free_buddyinfo);
 	sess = g_new0(aim_session_t, 1);
 	aim_session_init(sess, AIM_SESS_FLAGS_NONBLOCKCONNECT, 0);
 	aim_setdebuggingcb(sess, oscar_debug);
 	if (info->present & AIM_USERINFO_PRESENT_IDLE) {
 		time(&time_idle);
 		time_idle -= info->idletime*60;
 	}
-	if (info->present & AIM_USERINFO_PRESENT_SESSIONLEN)
+	if (info->present & AIM_USERINFO_PRESENT_ONLINESINCE)
+		signon = info->onlinesince;
+	else if (info->present & AIM_USERINFO_PRESENT_SESSIONLEN)
 		signon = time(NULL) - info->sessionlen;
 	if (!aim_sncmp(gaim_account_get_username(gaim_connection_get_account(gc)), info->sn))
 		gaim_connection_set_display_name(gc, info->sn);
 	bi->signon = info->onlinesince ? info->onlinesince : (info->sessionlen + time(NULL));
 	if (caps)
 		bi->caps = caps;
 	bi->typingnot = FALSE;
 	bi->ico_informed = FALSE;
+	if (info->availablemsg) {
+		free(bi->availablemsg);
+		bi->availablemsg = g_strdup(info->availablemsg);
+	}
 	/* Server stored icon stuff */
 	if (info->iconcsumlen) {
 		char *b16, *saved_b16;
 		struct buddy *b;
+		free(bi->iconcsum);
+		bi->iconcsum = malloc(info->iconcsumlen);
 		memcpy(bi->iconcsum, info->iconcsum, info->iconcsumlen);
 		bi->iconcsumlen = info->iconcsumlen;
 		b16 = tobase16(bi->iconcsum, bi->iconcsumlen);
 		b = gaim_find_buddy(gc->account, info->sn);
 		saved_b16 = gaim_buddy_get_setting(b, "icon_checksum");
 static void gaim_auth_request_msgprompt(struct name_data *data) {
 	gaim_request_input(data->gc, NULL, _("Authorization Request Message:"),
 					   NULL, _("Please authorize me!"), TRUE,
 					   _("OK"), G_CALLBACK(gaim_auth_request),
-					   _("Cancel"), G_CALLBACK(gaim_free_name_data),
+					   _("Cancel"), G_CALLBACK(oscar_free_name_data),
 					   data);
 }
 static void gaim_auth_dontrequest(struct name_data *data) {
 	GaimConnection *gc = data->gc;
 	if (g_list_find(gaim_connections_get_all(), gc)) {
 		/* struct oscar_data *od = gc->proto_data; */
 		/* XXX - Take the buddy out of our buddy list */
 	}
-	gaim_free_name_data(data);
+	oscar_free_name_data(data);
 }
 static void gaim_auth_sendrequest(GaimConnection *gc, const char *name) {
 	struct name_data *data = g_new(struct name_data, 1);
 	struct buddy *buddy;
 #else
 		aim_ssi_sendauthreply(od->sess, data->name, 0x01, NULL);
 #endif
 	}
-	gaim_free_name_data(data);
+	oscar_free_name_data(data);
 }
 /* When other people ask you for authorization */
 static void gaim_auth_dontgrant(struct name_data *data, char *msg) {
 	GaimConnection *gc = data->gc;
 static void gaim_auth_dontgrant_msgprompt(struct name_data *data) {
 	gaim_request_input(data->gc, NULL, _("Authorization Denied Message:"),
 					   NULL, _("No reason given."), TRUE,
 					   _("OK"), G_CALLBACK(gaim_auth_dontgrant),
-					   _("Cancel"), G_CALLBACK(gaim_free_name_data),
+					   _("Cancel"), G_CALLBACK(oscar_free_name_data),
 					   data);
 }
 /* When someone sends you contacts  */
 static void gaim_icq_contactadd(struct name_data *data) {
 	if (g_list_find(gaim_connections_get_all(), gc)) {
 		show_add_buddy(gc, data->name, NULL, data->nick);
 	}
-	gaim_free_name_data(data);
+	oscar_free_name_data(data);
 }
 static int incomingim_chan4(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch4_args *args, time_t t) {
 	GaimConnection *gc = sess->aux_data;
 	gchar **msg1, **msg2;
 					gaim_request_action(gc, NULL, message,
 										_("Do you want to add this contact "
 										  "to your Buddy List?"),
 										0, data, 2,
 										_("Add"), G_CALLBACK(gaim_icq_contactadd),
-										_("Decline"), G_CALLBACK(gaim_free_name_data));
+										_("Decline"), G_CALLBACK(oscar_free_name_data));
 					g_free(message);
 				}
 				g_strfreev(text);
 			}
 		} break;
 	data->nick = NULL;
 	gaim_request_yes_no(gc, NULL, _("Authorization Given"), dialog_msg,
 						0, data,
 						G_CALLBACK(gaim_icq_contactadd),
-						G_CALLBACK(gaim_free_name_data));
+						G_CALLBACK(oscar_free_name_data));
 	g_free(dialog_msg);
 	g_free(nombre);
 	return 1;
 				char *caps = caps_string(bi->caps);
 				tmp = yay;
 				yay = g_strconcat(tmp, _("<b>Capabilities:</b> "), caps, "\n", NULL);
 				free(tmp);
 			}
+			if (bi->availablemsg) {
+				tmp = yay;
+				yay = g_strconcat(tmp, _("<b>Available:</b> "), bi->availablemsg, "\n", NULL);
+				free(tmp);
+			}
 		}
 	} else {
 		char *gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, b->name);
 		if (aim_ssi_waitingforauth(od->sess->ssi.local, gname, b->name)) {
 			tmp = yay;
 	if ((b->uc & UC_UNAVAILABLE) || (((b->uc & 0xffff0000) >> 16) & AIM_ICQ_STATE_CHAT)) {
 		if (isdigit(b->name[0]))
 			ret = gaim_icq_status((b->uc & 0xffff0000) >> 16);
 		else
 			ret = g_strdup(_("Away"));
-	} else if (!GAIM_BUDDY_IS_ONLINE(b)) {
+	} else if (GAIM_BUDDY_IS_ONLINE(b)) {
+		struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, normalize(b->name));
+		if (bi->availablemsg)
+			ret = g_strdup(bi->availablemsg);
+	} else {
 		char *gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, b->name);
 		if (aim_ssi_waitingforauth(od->sess->ssi.local, gname, b->name))
 			ret = g_strdup(_("Not Authorized"));
 		else
 			ret = g_strdup(_("Offline"));

Mercurial > pidgin

comparison src/protocols/oscar/oscar.c @ 5836:09f7f23dc83a