Mercurial > pidgin.yaz
comparison src/dialogs.c @ 7956:1b8261f374ea
[gaim-migrate @ 8631]
This is the death of protocol numbers. There are probably now a few
functions that should now go away, but i'll let our crack team of crazy
patch writers figure out which ones they are.
out-of-tree and unofficial prpl-writers, rejoice!
committer: Tailor Script <tailor@pidgin.im>
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Mon, 29 Dec 2003 09:03:47 +0000 |
parents | b356e2a9d7fc |
children | d9e831876c28 |
comparison
equal
deleted
inserted
replaced
7955:119a22025818 | 7956:1b8261f374ea |
---|---|
1337 | 1337 |
1338 void insert_smiley_text(GtkWidget *widget, GaimConversation *c) | 1338 void insert_smiley_text(GtkWidget *widget, GaimConversation *c) |
1339 { | 1339 { |
1340 GaimGtkConversation *gtkconv; | 1340 GaimGtkConversation *gtkconv; |
1341 char *smiley_text = g_object_get_data(G_OBJECT(widget), "smiley_text"); | 1341 char *smiley_text = g_object_get_data(G_OBJECT(widget), "smiley_text"); |
1342 GaimProtocol protocol = gaim_account_get_protocol(gaim_conversation_get_account(c)); | 1342 GaimPlugin *proto = gaim_find_prpl(gaim_account_get_protocol_id(gaim_conversation_get_account(c))); |
1343 GaimPlugin *proto = gaim_find_prpl(protocol); | 1343 |
1344 | |
1345 gtkconv = GAIM_GTK_CONVERSATION(c); | 1344 gtkconv = GAIM_GTK_CONVERSATION(c); |
1346 | 1345 |
1347 gtk_imhtml_insert_smiley(GTK_IMHTML(gtkconv->entry), proto->info->name, smiley_text); | 1346 gtk_imhtml_insert_smiley(GTK_IMHTML(gtkconv->entry), proto->info->name, smiley_text); |
1348 | 1347 |
1349 close_smiley_dialog(NULL, c); | 1348 close_smiley_dialog(NULL, c); |
1350 } | 1349 } |
1351 | 1350 |
1352 static void add_smiley(GaimConversation *c, GtkWidget *table, int row, int col, char *filename, char *face) | 1351 static void add_smiley(GaimConversation *c, GtkWidget *table, int row, int col, char *filename, char *face) |
1353 { | 1352 { |
1395 if (gtkconv->dialogs.smiley) | 1394 if (gtkconv->dialogs.smiley) |
1396 return; | 1395 return; |
1397 | 1396 |
1398 if(c->account) | 1397 if(c->account) |
1399 smileys = get_proto_smileys( | 1398 smileys = get_proto_smileys( |
1400 gaim_account_get_protocol(gaim_conversation_get_account(c))); | 1399 gaim_account_get_protocol_id(gaim_conversation_get_account(c))); |
1401 else | 1400 else |
1402 smileys = get_proto_smileys(GAIM_PROTO_DEFAULT); | 1401 smileys = get_proto_smileys(GAIM_PROTO_DEFAULT); |
1403 | 1402 |
1404 while(smileys) { | 1403 while(smileys) { |
1405 GtkIMHtmlSmiley *smiley = smileys->data; | 1404 GtkIMHtmlSmiley *smiley = smileys->data; |