Ignore:
Timestamp:
2015-03-12T09:10:16Z (10 years ago)
Author:
dequis <dx@…>
Children:
fc650a8
Parents:
0e4c3dd (diff), 3bb333c (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 branch 'develop' into feat/hip-cat

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/oscar/oscar.c

    r0e4c3dd r89db90e  
    19141914}
    19151915
    1916 static void oscar_get_away(struct im_connection *g, char *who)
    1917 {
    1918         struct oscar_data *odata = (struct oscar_data *) g->proto_data;
    1919 
    1920         if (odata->icq) {
    1921                 /** FIXME(wilmer): Hmm, lost the ability to get away msgs here, do we care to get that back?
    1922                 struct buddy *budlight = imcb_find_buddy(g, who);
    1923                 if (budlight)
    1924                         if ((budlight->uc & 0xff80) >> 7)
    1925                                 if (budlight->caps & AIM_CAPS_ICQSERVERRELAY)
    1926                                         aim_send_im_ch2_geticqmessage(odata->sess, who, (budlight->uc & 0xff80) >> 7);
    1927                 */
    1928         } else {
    1929                 aim_getinfo(odata->sess, odata->conn, who, AIM_GETINFO_AWAYMESSAGE);
    1930         }
    1931 }
    1932 
    19331916static void oscar_set_away_aim(struct im_connection *ic, struct oscar_data *od, const char *state, const char *message)
    19341917{
     
    27122695        ret->get_info = oscar_get_info;
    27132696        ret->set_away = oscar_set_away;
    2714         ret->get_away = oscar_get_away;
    27152697        ret->add_buddy = oscar_add_buddy;
    27162698        ret->remove_buddy = oscar_remove_buddy;
Note: See TracChangeset for help on using the changeset viewer.