Mercurial > pidgin
comparison src/protocols/oscar/oscar.c @ 8076:504d98d14c25
[gaim-migrate @ 8775]
CTRL+(1 through 8) and SHIFT+CTRL+(1 through 8) no longer insert smileys
twice
CTRL+(1 through 8) and SHIFT+CTRL+(1 through 8) inserts WYSIWYG smileys
instead of text
Removed some functions in from gtkconv.c that I don't think we need that I
think Chip said were left over from a simpler way of life
This may break some key commands or something in the text entry window of
convos. Lemme know if it does
Love me tender
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 11 Jan 2004 21:36:17 +0000 |
parents | d9e831876c28 |
children | abee07bc573f |
comparison
equal
deleted
inserted
replaced
8075:41e973dbca03 | 8076:504d98d14c25 |
---|---|
276 static int oscar_sendfile_done (aim_session_t *, aim_frame_t *, ...); | 276 static int oscar_sendfile_done (aim_session_t *, aim_frame_t *, ...); |
277 | 277 |
278 /* for icons */ | 278 /* for icons */ |
279 static gboolean gaim_icon_timerfunc(gpointer data); | 279 static gboolean gaim_icon_timerfunc(gpointer data); |
280 | 280 |
281 /* prpl actions - remove this at some point */ | 281 /* remove these at some point? */ |
282 /* Because I don't like forward declarations? I think that was why... */ | 282 /* Because I don't like forward declarations? I think that was why... */ |
283 static void oscar_set_info(GaimConnection *gc, const char *text); | 283 static void oscar_set_info(GaimConnection *gc, const char *text); |
284 static void oscar_set_away(GaimConnection *gc, const char *state, const char *message); | |
284 | 285 |
285 static void oscar_free_name_data(struct name_data *data) { | 286 static void oscar_free_name_data(struct name_data *data) { |
286 g_free(data->name); | 287 g_free(data->name); |
287 g_free(data->nick); | 288 g_free(data->nick); |
288 g_free(data); | 289 g_free(data); |
3809 aim_locate_setcaps(od->sess, caps_icq); | 3810 aim_locate_setcaps(od->sess, caps_icq); |
3810 else | 3811 else |
3811 aim_locate_setcaps(od->sess, caps_aim); | 3812 aim_locate_setcaps(od->sess, caps_aim); |
3812 oscar_set_info(gc, gc->account->user_info); | 3813 oscar_set_info(gc, gc->account->user_info); |
3813 | 3814 |
3815 if (gc->away_state != NULL) | |
3816 oscar_set_away(gc, gc->away_state, gc->away); | |
3817 | |
3814 return 1; | 3818 return 1; |
3815 } | 3819 } |
3816 | 3820 |
3817 static int gaim_parse_buddyrights(aim_session_t *sess, aim_frame_t *fr, ...) { | 3821 static int gaim_parse_buddyrights(aim_session_t *sess, aim_frame_t *fr, ...) { |
3818 va_list ap; | 3822 va_list ap; |