Menu
▾
▴
[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.106,1.107
|
From: Sean E. <sea...@us...> - 2002-03-05 17:17:02
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv19964/src/protocols/oscar
Modified Files:
oscar.c
Log Message:
(12:08:49) Direct IM with seanegn2 established
(12:08:59) Direct IM with seanegn2 closed
This won't make Direct IMs work any better, but it will make your life easier when they fail. No more "Unable to send message" or "Direct IM already pending" errors.
Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- oscar.c 4 Mar 2002 04:18:02 -0000 1.106
+++ oscar.c 5 Mar 2002 17:16:51 -0000 1.107
@@ -137,6 +137,7 @@
char name[80];
int watcher;
aim_conn_t *conn;
+ gboolean connected;
};
struct ask_direct {
@@ -317,7 +318,11 @@
od->direct_ims = g_slist_remove(od->direct_ims, dim);
gaim_input_remove(dim->watcher);
- g_snprintf(buf, sizeof buf, _("Direct IM with %s closed"), sn);
+ if (dim->connected)
+ g_snprintf(buf, sizeof buf, _("Direct IM with %s closed"), sn);
+ else
+ g_snprintf(buf, sizeof buf, _("Direct IM with %s failed"), sn);
+
if ((cnv = find_conversation(sn)))
write_to_conv(cnv, buf, WFLAG_SYSTEM, NULL, time(NULL), -1);
update_progress(cnv, 100);
@@ -1207,7 +1212,9 @@
struct oscar_data *od = gc->proto_data;
struct conversation *cnv;
char buf[256];
-
+ struct sockaddr name;
+ socklen_t name_len = 1;
+
if (!g_slist_find(connections, gc)) {
g_free(dim);
return;
@@ -1220,17 +1227,20 @@
if (dim->conn->fd != source)
dim->conn->fd = source;
-
aim_conn_completeconnect(od->sess, dim->conn);
if (!(cnv = find_conversation(dim->name)))
cnv = new_conversation(dim->name);
- g_snprintf(buf, sizeof buf, _("Direct IM with %s established"), dim->name);
- write_to_conv(cnv, buf, WFLAG_SYSTEM, NULL, time(NULL), -1);
+ /* This is the best way to see if we're connected or not */
+ if (getpeername(source, &name, &name_len) == 0) {
+ g_snprintf(buf, sizeof buf, _("Direct IM with %s established"), dim->name);
+ dim->connected = TRUE;
+ write_to_conv(cnv, buf, WFLAG_SYSTEM, NULL, time(NULL), -1);
+ }
od->direct_ims = g_slist_append(od->direct_ims, dim);
-
+
dim->watcher = gaim_input_add(dim->conn->fd, GAIM_INPUT_READ,
- oscar_callback, dim->conn);
+ oscar_callback, dim->conn);
}
static int accept_direct_im(gpointer w, struct ask_direct *d) {
@@ -2418,60 +2428,62 @@
struct direct_im *dim = find_direct_im(odata, name);
int ret = 0;
if (dim) {
- ret = aim_send_im_direct(odata->sess, dim->conn, message);
+ if (dim->connected) /* If we're not connected yet, send through server */
+ return aim_send_im_direct(odata->sess, dim->conn, message);
+ debug_printf("Direct IM pending, but not connected; sending through server\n");
+ }
+ if (imflags & IM_FLAG_AWAY) {
+ ret = aim_send_im(odata->sess, name, AIM_IMFLAGS_AWAY, message);
} else {
- if (imflags & IM_FLAG_AWAY) {
- ret = aim_send_im(odata->sess, name, AIM_IMFLAGS_AWAY, message);
- } else {
- struct aim_sendimext_args args;
- GSList *h = odata->hasicons;
- struct icon_req *ir = NULL;
- char *who = normalize(name);
- struct stat st;
-
- 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");
+ struct aim_sendimext_args args;
+ GSList *h = odata->hasicons;
+ struct icon_req *ir = NULL;
+ char *who = normalize(name);
+ struct stat st;
+
+ 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;
- 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;
- debug_printf("Claiming to have an icon.\n");
+ args.flags |= AIM_IMFLAGS_HASICON;
+ debug_printf("Claiming to have an icon.\n");
- fclose(file);
- g_free(buf);
- }
+ fclose(file);
+ g_free(buf);
}
-
- args.destsn = name;
- args.msg = message;
- args.msglen = strlen(message);
-
- ret = aim_send_im_ext(odata->sess, &args);
}
+
+ args.destsn = name;
+ args.msg = message;
+ args.msglen = strlen(message);
+
+ ret = aim_send_im_ext(odata->sess, &args);
+
}
if (ret >= 0)
return 1;
@@ -3118,6 +3130,7 @@
dim->conn = newconn;
dim->watcher = gaim_input_add(dim->conn->fd, GAIM_INPUT_READ,
oscar_callback, dim->conn);
+ dim->connected = TRUE;
g_snprintf(buf, sizeof buf, _("Direct IM with %s established"), sn);
g_free(sn);
write_to_conv(cnv, buf, WFLAG_SYSTEM, NULL, time(NULL), -1);
@@ -3126,7 +3139,7 @@
gaim_directim_incoming, 0);
aim_conn_addhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMTYPING,
gaim_directim_typing, 0);
- aim_conn_addhandler(od->sess, dim->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_DOWNLOADIMAGE,
+ aim_conn_addhandler(sess, newconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_DOWNLOADIMAGE,
gaim_update_ui, 0);
return 1;
}
@@ -3211,8 +3224,15 @@
dim = find_direct_im(od, data->who);
if (dim) {
- do_error_dialog("Direct IM request already pending.", "Unable");
- return;
+ if (!(dim->connected)) { /* We'll free the old, unconnected dim, and start over */
+ od->direct_ims = g_slist_remove(od->direct_ims, dim);
+ gaim_input_remove(dim->watcher);
+ g_free(dim);
+ debug_printf("Gave up on old direct IM, trying again\n");
+ } else {
+ do_error_dialog("DirectIM already open.", "Gaim");
+ return;
+ }
}
dim = g_new0(struct direct_im, 1);
dim->gc = gc;
|
