Mercurial > pidgin
changeset 4044:133cf6424c53
[gaim-migrate @ 4252]
Stripped the old proto-specific smiley support out. The new proto-specific
smileys won't be set by the prpl, but by a smiley theme settable from
preferences.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Wed, 04 Dec 2002 05:12:06 +0000 |
| parents | e25edee01c33 |
| children | ee8cbe596e9a |
| files | src/conversation.c src/dialogs.c src/protocols/msn/msn.c src/protocols/yahoo/yahoo.c src/prpl.c src/prpl.h |
| diffstat | 6 files changed, 31 insertions(+), 430 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Wed Dec 04 01:36:43 2002 +0000 +++ b/src/conversation.c Wed Dec 04 05:12:06 2002 +0000 @@ -79,7 +79,6 @@ static void update_checkbox(struct conversation *); static void remove_checkbox(struct conversation *); -static void update_smilies(struct conversation *c); /*------------------------------------------------------------------------*/ @@ -254,7 +253,6 @@ show_conv(c); update_icon(c); update_checkbox(c); - update_smilies(c); plugin_event(event_new_conversation, name); /*gtk_imhtml_to_bottom(c->text);*/ return c; @@ -2382,7 +2380,6 @@ update_icon(cnv); update_checkbox(cnv); - update_smilies(cnv); gaim_setup_imhtml_smileys(cnv->text); } @@ -2543,7 +2540,6 @@ update_icon(c); update_checkbox(c); - update_smilies(c); gaim_setup_imhtml_smileys(c->text); } @@ -3618,32 +3614,6 @@ g_object_unref(G_OBJECT(c->iter)); } -void update_smilies(struct conversation *c) -{ - GSList *smilies; - - if (!c) - return; - - if (!c->gc) - return; - - if (c->gc->prpl->smiley_list) { - gtk_imhtml_remove_smileys(GTK_IMHTML(c->text)); - smilies = c->gc->prpl->smiley_list(); - - while (smilies) { - struct _prpl_smiley *smile = - (struct _prpl_smiley *)smilies->data; - - //gtk_imhtml_associate_smiley(GTK_IMHTML(c->text), smile->key, smile->xpm); - smilies = g_slist_next(smilies); - } - } else { - gtk_imhtml_reset_smileys(GTK_IMHTML(c->text)); - } -} - void update_icon(struct conversation *c) { char filename[256];
--- a/src/dialogs.c Wed Dec 04 01:36:43 2002 +0000 +++ b/src/dialogs.c Wed Dec 04 05:12:06 2002 +0000 @@ -3594,28 +3594,6 @@ close_smiley_dialog(NULL, c); } -static void toolbar_add_smiley_xpm(struct conversation *c, GtkWidget *bar, char **xpm, GtkWidget *win, - char *face) -{ - GtkWidget *tpm; - GdkBitmap *mask; - GdkPixmap *dpm; - GtkWidget *button; - - dpm = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, xpm); - tpm = gtk_pixmap_new(dpm, mask); - gtk_widget_show(tpm); - gdk_pixmap_unref(dpm); - gdk_bitmap_unref(mask); - button = - gtk_toolbar_append_element(GTK_TOOLBAR(bar), GTK_TOOLBAR_CHILD_BUTTON, NULL, NULL, NULL, - NULL, tpm, GTK_SIGNAL_FUNC(set_smiley), (char *)face); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(insert_smiley_text), c); - - /* these look really weird with borders */ - gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); -} - static void toolbar_add_smiley(struct conversation *c, GtkWidget *bar, char *filename, char *face) { GtkWidget *tpm; @@ -3660,111 +3638,38 @@ /* setup buttons */ /* pack buttons */ - if (c->gc->prpl->smiley_list == NULL) { - char *filename; - smiley_box = gtk_toolbar_new(); - gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0); - - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "angel.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, "O:-)"); - g_free(filename); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "bigsmile.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, ":-D"); - g_free(filename); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "burp.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, ":-!"); - g_free(filename); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "crossedlips.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, ":-X"); - g_free(filename); - - smiley_box = gtk_toolbar_new(); - gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0); - - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "cry.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, ":'("); - g_free(filename); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "embarrassed.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, ":-["); - g_free(filename); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "kiss.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, ":-*"); - g_free(filename); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "moneymouth.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, ":-$"); - g_free(filename); - - smiley_box = gtk_toolbar_new(); - gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0); - - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "sad.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, ":-("); - g_free(filename); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "scream.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, "=-O"); - g_free(filename); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "smile.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, ":-)"); - g_free(filename); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "cool.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, "8-)"); - g_free(filename); - - smiley_box = gtk_toolbar_new(); - gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0); - - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "think.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, ":-/"); - g_free(filename); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "tongue.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, ":-P"); - g_free(filename); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "wink.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, ";-)"); - g_free(filename); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "yell.png", NULL); - toolbar_add_smiley(c, smiley_box, filename, ">:o"); - g_free(filename); - } else { - - smilies = c->gc->prpl->smiley_list(); - - while (smilies) { - struct _prpl_smiley *smile = - (struct _prpl_smiley *)smilies->data; - - if (smile->show) { - total_count++; - } - - smilies = g_slist_next(smilies); - } - - smilies = c->gc->prpl->smiley_list(); - - smiley_box = gtk_toolbar_new(); - gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0); - - while (smilies) { - struct _prpl_smiley *smile = - (struct _prpl_smiley *)smilies->data; - - if (smile->show) { - - if ((!(smiley_count % ((int)(sqrt(total_count))))) && (smiley_count > 0)) { - smiley_box = gtk_toolbar_new(); - gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0); - } - - toolbar_add_smiley_xpm(c, smiley_box, smile->xpm, win, smile->key); - smiley_count++; - } - - smilies = g_slist_next(smilies); - - } - } + smiley_box = gtk_toolbar_new(); + gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0); +#define GDS G_DIR_SEPARATOR_S + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "angel.png", "O:-)"); + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "bigsmile.png", ":-D"); + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "burp.png", ":-!"); + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "crossedlips.png", ":-X"); + + smiley_box = gtk_toolbar_new(); + gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0); + + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "cry.png", ":'("); + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "embarrassed.png", ":-["); + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "kiss.png", ":-*"); + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "moneymouth.png", ":-$"); + + smiley_box = gtk_toolbar_new(); + gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0); + + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "sad.png", ":-("); + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "scream.png", "=-O"); + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "smile.png", ":-)"); + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "cool.png", "8-)"); + + smiley_box = gtk_toolbar_new(); + gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0); + + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "think.png", ":-/"); + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "tongue.png", ":-P"); + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "wink.png", ";-)"); + toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "yell.png", ">:o"); gtk_container_add(GTK_CONTAINER(dialog), vbox); gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
--- a/src/protocols/msn/msn.c Wed Dec 04 01:36:43 2002 +0000 +++ b/src/protocols/msn/msn.c Wed Dec 04 05:12:06 2002 +0000 @@ -26,55 +26,6 @@ #include "pixmaps/protocols/msn/msn_away.xpm" #include "pixmaps/protocols/msn/msn_occ.xpm" -/* MSN Smiley Faces */ -#include "pixmaps/protocols/msn/msn_angry.xpm" -#include "pixmaps/protocols/msn/msn_bat.xpm" -#include "pixmaps/protocols/msn/msn_beer.xpm" -#include "pixmaps/protocols/msn/msn_boy.xpm" -#include "pixmaps/protocols/msn/msn_brheart.xpm" -#include "pixmaps/protocols/msn/msn_cake.xpm" -#include "pixmaps/protocols/msn/msn_cat.xpm" -#include "pixmaps/protocols/msn/msn_coffee.xpm" -#include "pixmaps/protocols/msn/msn_cry.xpm" -#include "pixmaps/protocols/msn/msn_deadflower.xpm" -#include "pixmaps/protocols/msn/msn_drink.xpm" -#include "pixmaps/protocols/msn/msn_email.xpm" -#include "pixmaps/protocols/msn/msn_flower.xpm" -#include "pixmaps/protocols/msn/msn_gift.xpm" -#include "pixmaps/protocols/msn/msn_girl.xpm" -#include "pixmaps/protocols/msn/msn_handcuffs.xpm" -#include "pixmaps/protocols/msn/msn_heart.xpm" -#include "pixmaps/protocols/msn/msn_hot.xpm" -#include "pixmaps/protocols/msn/msn_icon.xpm" -#include "pixmaps/protocols/msn/msn_idea.xpm" -#include "pixmaps/protocols/msn/msn_kiss.xpm" -#include "pixmaps/protocols/msn/msn_laugh.xpm" -#include "pixmaps/protocols/msn/msn_neutral.xpm" -#include "pixmaps/protocols/msn/msn_note.xpm" -#include "pixmaps/protocols/msn/msn_ooooh.xpm" -#include "pixmaps/protocols/msn/msn_phone.xpm" -#include "pixmaps/protocols/msn/msn_photo.xpm" -#include "pixmaps/protocols/msn/msn_question.xpm" -#include "pixmaps/protocols/msn/msn_run.xpm" -#include "pixmaps/protocols/msn/msn_runback.xpm" -#include "pixmaps/protocols/msn/msn_sad.xpm" -#include "pixmaps/protocols/msn/msn_sleep.xpm" -#include "pixmaps/protocols/msn/msn_smiley.xpm" -#include "pixmaps/protocols/msn/msn_star.xpm" -#include "pixmaps/protocols/msn/msn_tongue.xpm" -#include "pixmaps/protocols/msn/msn_thumbdown.xpm" -#include "pixmaps/protocols/msn/msn_thumbup.xpm" -#include "pixmaps/protocols/msn/msn_weird.xpm" -#include "pixmaps/protocols/msn/msn_embarrassed.xpm" -#include "pixmaps/protocols/msn/msn_angel.xpm" -#include "pixmaps/protocols/msn/msn_film.xpm" -#include "pixmaps/protocols/msn/msn_dog.xpm" -#include "pixmaps/protocols/msn/msn_clock.xpm" -#include "pixmaps/protocols/msn/msn_sun.xpm" -#include "pixmaps/protocols/msn/msn_rainbow.xpm" -#include "pixmaps/protocols/msn/msn_devil.xpm" -#include "pixmaps/protocols/msn/msn_wink.xpm" - /* for win32 compatability */ G_MODULE_IMPORT GSList *connections; @@ -2385,108 +2336,6 @@ g_free(b->proto_data); } -GSList *msn_smiley_list() -{ - GSList *smilies = NULL; - - smilies = add_smiley(smilies, "(a)", msn_angel, 1); - smilies = add_smiley(smilies, "(A)", msn_angel, 0); - smilies = add_smiley(smilies, ":-@", msn_angry, 1); - smilies = add_smiley(smilies, ":@", msn_angry, 0); - smilies = add_smiley(smilies, ":-[", msn_bat, 1); - smilies = add_smiley(smilies, ":[", msn_bat, 0); - smilies = add_smiley(smilies, "(B)", msn_beer, 1); - smilies = add_smiley(smilies, "(b)", msn_beer, 0); - smilies = add_smiley(smilies, "(Z)", msn_boy, 1); - smilies = add_smiley(smilies, "(z)", msn_boy, 0); - smilies = add_smiley(smilies, "(U)", msn_brheart, 1); - smilies = add_smiley(smilies, "(u)", msn_brheart, 0); - smilies = add_smiley(smilies, "(@)", msn_cat, 1); - smilies = add_smiley(smilies, "(^)", msn_cake, 1); - smilies = add_smiley(smilies, "(o)", msn_clock, 1); - smilies = add_smiley(smilies, "(O)", msn_clock, 0); - smilies = add_smiley(smilies, "(C)", msn_coffee, 1); - smilies = add_smiley(smilies, "(c)", msn_coffee, 0); - smilies = add_smiley(smilies, ":'(", msn_cry, 1); - smilies = add_smiley(smilies, ":`(", msn_cry, 0); - smilies = add_smiley(smilies, "(W)", msn_deadflower, 1); - smilies = add_smiley(smilies, "(w)", msn_deadflower, 0); - smilies = add_smiley(smilies, "(6)", msn_devil, 1); - smilies = add_smiley(smilies, "(&)", msn_dog, 1); - smilies = add_smiley(smilies, "(D)", msn_drink, 1); - smilies = add_smiley(smilies, "(d)", msn_drink, 0); - smilies = add_smiley(smilies, "(E)", msn_email, 1); - smilies = add_smiley(smilies, "(e)", msn_email, 0); - smilies = add_smiley(smilies, "(~)", msn_film, 1); - smilies = add_smiley(smilies, "(F)", msn_flower, 1); - smilies = add_smiley(smilies, "(f)", msn_flower, 0); - smilies = add_smiley(smilies, "(G)", msn_gift, 1); - smilies = add_smiley(smilies, "(g)", msn_gift, 0); - smilies = add_smiley(smilies, "(X)", msn_girl, 1); - smilies = add_smiley(smilies, "(x)", msn_girl, 0); - smilies = add_smiley(smilies, "(%)", msn_handcuffs, 1); - smilies = add_smiley(smilies, "(L)", msn_heart, 1); - smilies = add_smiley(smilies, "(l)", msn_heart, 0); - smilies = add_smiley(smilies, "(H)", msn_hot, 1); - smilies = add_smiley(smilies, "(h)", msn_hot, 0); - smilies = add_smiley(smilies, "(M)", msn_icon, 1); - smilies = add_smiley(smilies, "(m)", msn_icon, 0); - smilies = add_smiley(smilies, "(I)", msn_idea, 1); - smilies = add_smiley(smilies, "(i)", msn_idea, 0); - smilies = add_smiley(smilies, "(K)", msn_kiss, 1); - smilies = add_smiley(smilies, "(k)", msn_kiss, 0); - smilies = add_smiley(smilies, ":-D", msn_laugh, 1); - smilies = add_smiley(smilies, ":D", msn_laugh, 0); - smilies = add_smiley(smilies, ":-d", msn_laugh, 0); - smilies = add_smiley(smilies, ":d", msn_laugh, 0); - smilies = add_smiley(smilies, ":->", msn_laugh, 0); - smilies = add_smiley(smilies, ":>", msn_laugh, 0); - smilies = add_smiley(smilies, ":-|", msn_neutral, 1); - smilies = add_smiley(smilies, ":|", msn_neutral, 0); - smilies = add_smiley(smilies, "(8)", msn_note, 1); - smilies = add_smiley(smilies, ":-O", msn_ooooh, 1); - smilies = add_smiley(smilies, ":O", msn_ooooh, 0); - smilies = add_smiley(smilies, ":-o", msn_ooooh, 0); - smilies = add_smiley(smilies, ":o", msn_ooooh, 0); - smilies = add_smiley(smilies, "(T)", msn_phone, 1); - smilies = add_smiley(smilies, "(t)", msn_phone, 0); - smilies = add_smiley(smilies, "(P)", msn_photo, 1); - smilies = add_smiley(smilies, "(p)", msn_photo, 0); - smilies = add_smiley(smilies, "(?)", msn_question, 1); - smilies = add_smiley(smilies, "(r)", msn_rainbow, 1); - smilies = add_smiley(smilies, "(R)", msn_rainbow, 0); - smilies = add_smiley(smilies, "({)", msn_run, 1); - smilies = add_smiley(smilies, "(})", msn_runback, 1); - smilies = add_smiley(smilies, ":-(", msn_sad, 1); - smilies = add_smiley(smilies, ":(", msn_sad, 0); - smilies = add_smiley(smilies, ":-<", msn_sad, 0); - smilies = add_smiley(smilies, "(S)", msn_sleep, 1); - smilies = add_smiley(smilies, "(s)", msn_sleep, 0); - smilies = add_smiley(smilies, ":-)", msn_smiley, 1); - smilies = add_smiley(smilies, ":)", msn_smiley, 0); - smilies = add_smiley(smilies, "(*)", msn_star, 1); - smilies = add_smiley(smilies, "(#)", msn_sun, 1); - smilies = add_smiley(smilies, "(N)", msn_thumbdown, 1); - smilies = add_smiley(smilies, "(n)", msn_thumbdown, 0); - smilies = add_smiley(smilies, "(Y)", msn_thumbup, 1); - smilies = add_smiley(smilies, "(y)", msn_thumbup, 0); - smilies = add_smiley(smilies, ":-P", msn_tongue, 1); - smilies = add_smiley(smilies, ":P", msn_tongue, 0); - smilies = add_smiley(smilies, ":-p", msn_tongue, 0); - smilies = add_smiley(smilies, ":p", msn_tongue, 0); - smilies = add_smiley(smilies, ":-S", msn_weird, 1); - smilies = add_smiley(smilies, ":S", msn_weird, 0); - smilies = add_smiley(smilies, ":-s", msn_weird, 0); - smilies = add_smiley(smilies, ":s", msn_weird, 0); - smilies = add_smiley(smilies, ";-)", msn_wink, 1); - smilies = add_smiley(smilies, ";)", msn_wink, 0); - smilies = add_smiley(smilies, ":S-", msn_wink, 0); - smilies = add_smiley(smilies, ":-$", msn_embarrassed, 1); - smilies = add_smiley(smilies, ":$", msn_embarrassed, 0); - - return smilies; -} - static struct prpl *my_protocol = NULL; G_MODULE_EXPORT void msn_init(struct prpl *ret) @@ -2520,7 +2369,6 @@ ret->add_deny = msn_add_deny; ret->rem_deny = msn_rem_deny; ret->buddy_free = msn_buddy_free; - ret->smiley_list = msn_smiley_list; puo = g_new0(struct proto_user_opt, 1); puo->label = g_strdup("Server:");
--- a/src/protocols/yahoo/yahoo.c Wed Dec 04 01:36:43 2002 +0000 +++ b/src/protocols/yahoo/yahoo.c Wed Dec 04 05:12:06 2002 +0000 @@ -61,34 +61,6 @@ #include "pixmaps/status-idle.xpm" #include "pixmaps/status-game.xpm" -/* Yahoo Smilies go here */ -#include "pixmaps/protocols/yahoo/yahoo_alien.xpm" -#include "pixmaps/protocols/yahoo/yahoo_angel.xpm" -#include "pixmaps/protocols/yahoo/yahoo_angry.xpm" -#include "pixmaps/protocols/yahoo/yahoo_bigsmile.xpm" -#include "pixmaps/protocols/yahoo/yahoo_blush.xpm" -#include "pixmaps/protocols/yahoo/yahoo_bye.xpm" -#include "pixmaps/protocols/yahoo/yahoo_clown.xpm" -#include "pixmaps/protocols/yahoo/yahoo_cow.xpm" -#include "pixmaps/protocols/yahoo/yahoo_cowboy.xpm" -#include "pixmaps/protocols/yahoo/yahoo_cry.xpm" -#include "pixmaps/protocols/yahoo/yahoo_devil.xpm" -#include "pixmaps/protocols/yahoo/yahoo_flower.xpm" -#include "pixmaps/protocols/yahoo/yahoo_ghost.xpm" -#include "pixmaps/protocols/yahoo/yahoo_glasses.xpm" -#include "pixmaps/protocols/yahoo/yahoo_laughloud.xpm" -#include "pixmaps/protocols/yahoo/yahoo_love.xpm" -#include "pixmaps/protocols/yahoo/yahoo_mean.xpm" -#include "pixmaps/protocols/yahoo/yahoo_neutral.xpm" -#include "pixmaps/protocols/yahoo/yahoo_ooooh.xpm" -#include "pixmaps/protocols/yahoo/yahoo_question.xpm" -#include "pixmaps/protocols/yahoo/yahoo_sad.xpm" -#include "pixmaps/protocols/yahoo/yahoo_sleep.xpm" -#include "pixmaps/protocols/yahoo/yahoo_smiley.xpm" -#include "pixmaps/protocols/yahoo/yahoo_sunglas.xpm" -#include "pixmaps/protocols/yahoo/yahoo_tongue.xpm" -#include "pixmaps/protocols/yahoo/yahoo_wink.xpm" - #define YAHOO_DEBUG #define USEROPT_MAIL 0 @@ -1358,76 +1330,6 @@ yahoo_packet_free(pkt); } - -GSList *yahoo_smiley_list() -{ - GSList *smilies = NULL; - - smilies = add_smiley(smilies, "=:)", yahoo_alien, 1); - smilies = add_smiley(smilies, "=:-)", yahoo_alien, 0); - smilies = add_smiley(smilies, "o:)", yahoo_angel, 0); - smilies = add_smiley(smilies, "o:-)", yahoo_angel, 0); - smilies = add_smiley(smilies, "0:)", yahoo_angel, 0); - smilies = add_smiley(smilies, "0:-)", yahoo_angel, 0); - smilies = add_smiley(smilies, "X-(", yahoo_angry, 1); - smilies = add_smiley(smilies, "X(", yahoo_angry, 0); - smilies = add_smiley(smilies, "x-(", yahoo_angry, 0); - smilies = add_smiley(smilies, "x(", yahoo_angry, 0); - smilies = add_smiley(smilies, ":D", yahoo_bigsmile, 1); - smilies = add_smiley(smilies, ":-D", yahoo_bigsmile, 0); - smilies = add_smiley(smilies, ":\">", yahoo_blush, 1); - smilies = add_smiley(smilies, "=;", yahoo_bye, 1); - smilies = add_smiley(smilies, ":o)", yahoo_clown, 1); - smilies = add_smiley(smilies, ":0)", yahoo_clown, 0); - smilies = add_smiley(smilies, ":O)", yahoo_clown, 0); - smilies = add_smiley(smilies, "<@:)", yahoo_clown, 0); - smilies = add_smiley(smilies, "3:-0", yahoo_cow, 1); - smilies = add_smiley(smilies, "3:-o", yahoo_cow, 0); - smilies = add_smiley(smilies, "3:-O", yahoo_cow, 0); - smilies = add_smiley(smilies, "3:O", yahoo_cow, 0); - smilies = add_smiley(smilies, "<):)", yahoo_cowboy, 1); - smilies = add_smiley(smilies, ":((", yahoo_cry, 1); - smilies = add_smiley(smilies, ":-((", yahoo_cry, 0); - smilies = add_smiley(smilies, ">:)", yahoo_devil, 1); - smilies = add_smiley(smilies, "@};-", yahoo_flower, 1); - smilies = add_smiley(smilies, "8-X", yahoo_ghost, 1); - smilies = add_smiley(smilies, ":B", yahoo_glasses, 1); - smilies = add_smiley(smilies, ":-B", yahoo_glasses, 0); - smilies = add_smiley(smilies, ":))", yahoo_laughloud, 1); - smilies = add_smiley(smilies, ":-))", yahoo_laughloud, 0); - smilies = add_smiley(smilies, ":x", yahoo_love, 1); - smilies = add_smiley(smilies, ":-x", yahoo_love, 0); - smilies = add_smiley(smilies, ":X", yahoo_love, 0); - smilies = add_smiley(smilies, ":-X", yahoo_love, 0); - smilies = add_smiley(smilies, ":>", yahoo_mean, 1); - smilies = add_smiley(smilies, ":->", yahoo_mean, 0); - smilies = add_smiley(smilies, ":|", yahoo_neutral, 1); - smilies = add_smiley(smilies, ":-|", yahoo_neutral, 0); - smilies = add_smiley(smilies, ":O", yahoo_ooooh, 1); - smilies = add_smiley(smilies, ":-O", yahoo_ooooh, 0); - smilies = add_smiley(smilies, ":-\\", yahoo_question, 1); - smilies = add_smiley(smilies, ":-/", yahoo_question, 0); - smilies = add_smiley(smilies, ":(", yahoo_sad, 1); - smilies = add_smiley(smilies, ":-(", yahoo_sad, 0); - smilies = add_smiley(smilies, "I-)", yahoo_sleep, 1); - smilies = add_smiley(smilies, "|-)", yahoo_sleep, 0); - smilies = add_smiley(smilies, "I-|", yahoo_sleep, 0); - smilies = add_smiley(smilies, ":)", yahoo_smiley, 1); - smilies = add_smiley(smilies, ":-)", yahoo_smiley, 0); - smilies = add_smiley(smilies, "(:", yahoo_smiley, 0); - smilies = add_smiley(smilies, "(-:", yahoo_smiley, 0); - smilies = add_smiley(smilies, "B-)", yahoo_sunglas, 1); - smilies = add_smiley(smilies, ":-p", yahoo_tongue, 1); - smilies = add_smiley(smilies, ":p", yahoo_tongue, 0); - smilies = add_smiley(smilies, ":P", yahoo_tongue, 0); - smilies = add_smiley(smilies, ":-P", yahoo_tongue, 0); - smilies = add_smiley(smilies, ";)", yahoo_wink, 1); - smilies = add_smiley(smilies, ";-)", yahoo_wink, 0); - - - return smilies; -} - static struct prpl *my_protocol = NULL; G_MODULE_EXPORT void yahoo_init(struct prpl *ret) { @@ -1449,7 +1351,6 @@ ret->add_buddy = yahoo_add_buddy; ret->remove_buddy = yahoo_remove_buddy; ret->send_typing = yahoo_send_typing; - ret->smiley_list = yahoo_smiley_list; puo = g_new0(struct proto_user_opt, 1); puo->label = g_strdup("Pager Host:");
--- a/src/prpl.c Wed Dec 04 01:36:43 2002 +0000 +++ b/src/prpl.c Wed Dec 04 05:12:06 2002 +0000 @@ -752,19 +752,6 @@ gtk_widget_show(regdlg); } -GSList *add_smiley(GSList *list, char *key, char **xpm, int show) -{ - struct _prpl_smiley *smiley; - - smiley = (struct _prpl_smiley *)g_new0(struct _prpl_smiley, 1); - smiley->key = g_strdup(key); - smiley->xpm = xpm; - smiley->show = show; - list = g_slist_append(list, smiley); - - return list; -} - static gboolean delayed_unload(void *handle) { g_module_close(handle); return FALSE;
--- a/src/prpl.h Wed Dec 04 01:36:43 2002 +0000 +++ b/src/prpl.h Wed Dec 04 05:12:06 2002 +0000 @@ -84,12 +84,6 @@ struct file_transfer; -struct _prpl_smiley { - char *key; - char **xpm; - int show; -}; - struct prpl { int protocol; int options; @@ -110,8 +104,6 @@ GList *(* edit_buddy_menu)(struct gaim_connection *, char *); GList *(* chat_info)(struct gaim_connection *); - GSList *(* smiley_list)(); - /* all the server-related functions */ /* a lot of these (like get_dir) are protocol-dependent and should be removed. ones like @@ -221,8 +213,6 @@ extern void set_icon_data(struct gaim_connection *, char *, void *, int); extern void *get_icon_data(struct gaim_connection *, char *, int *); -extern GSList *add_smiley(GSList *, char *, char **, int) ; - /* file transfer stuff */ extern struct file_transfer *transfer_in_add(struct gaim_connection *gc, const char *who, const char *filename, int totsize,