Changeset 8e9e2b7 for protocols/nogaim.h

Timestamp:

2010-10-03T02:45:26Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

04f0c10

Parents:

88de0c9 (diff), 2af3e23 (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:

Merging mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

File:

• protocols/nogaim.h (modified) (1 diff)

protocols/nogaim.h

@@ -200 +200 @@
            this info via imcb_log(). Implementing these are optional. */
         void (* get_info)       (struct im_connection *, char *who);
+        /* set_my_name is *DEPRECATED*, not used by the UI anymore. Use the
+           display_name setting instead. */
         void (* set_my_name)    (struct im_connection *, char *name);
         void (* set_name)       (struct im_connection *, char *who, char *name);