Changeset 85d7b85 for protocols/oscar/service.c

Timestamp:

2008-04-02T14:22:57Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

f9dbc99

Parents:

875ad42 (diff), dd34575 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge trunk.

File:

• protocols/oscar/service.c (modified) (3 diffs)

protocols/oscar/service.c

@@ -567 +567 @@
                 group = aimbs_get16(bs);
 
-                do_error_dialog(sess->aux_data, "bifurcated migration unsupported", "Gaim");
+                imcb_error(sess->aux_data, "bifurcated migration unsupported");
         }
 
@@ -732 +732 @@
         guint32 data;
         int tlvlen;
+        struct im_connection *ic = sess ? sess->aux_data : NULL;
 
         data = AIM_ICQ_STATE_HIDEIP | status; /* yay for error checking ;^) */
+        
+        if (ic && set_getbool(&ic->acc->set, "web_aware"))
+                data |= AIM_ICQ_STATE_WEBAWARE;
 
         tlvlen = aim_addtlvtochain32(&tl, 0x0006, data);
@@ -890 +894 @@
 */
                 } else
-                        do_error_dialog(sess->aux_data, "WARNING: unknown hash request", "Gaim");
+                        imcb_error(sess->aux_data, "Warning: unknown hash request");
 
         }