comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- branch
- soc.2013.gobjectification.plugins
- changeset 36626
- 18fc361b3704
- parent 36623
- caaadef03507
- child 36633
- 2dcb81a189bd
equal
deleted
inserted
replaced
| 36625:e6febbd8cbec | 36626:18fc361b3704 |
|---|---|
| 2455 | 2455 |
| 2456 static GList *get_protocol_icon_list(PurpleAccount *account) | 2456 static GList *get_protocol_icon_list(PurpleAccount *account) |
| 2457 { | 2457 { |
| 2458 GList *l = NULL; | 2458 GList *l = NULL; |
| 2459 PurpleProtocol *protocol = | 2459 PurpleProtocol *protocol = |
| 2460 purple_find_protocol_info(purple_account_get_protocol_id(account)); | 2460 purple_protocols_find(purple_account_get_protocol_id(account)); |
| 2461 const char *prplname = purple_protocol_iface_list_icon(protocol, account, NULL); | 2461 const char *prplname = purple_protocol_iface_list_icon(protocol, account, NULL); |
| 2462 l = g_hash_table_lookup(protocol_lists, prplname); | 2462 l = g_hash_table_lookup(protocol_lists, prplname); |
| 2463 if (l) | 2463 if (l) |
| 2464 return l; | 2464 return l; |
| 2465 | 2465 |
| 3271 | 3271 |
| 3272 if ((chat == NULL) && (gtkconv->webview != NULL)) { | 3272 if ((chat == NULL) && (gtkconv->webview != NULL)) { |
| 3273 GHashTable *components; | 3273 GHashTable *components; |
| 3274 PurpleAccount *account = purple_conversation_get_account(conv); | 3274 PurpleAccount *account = purple_conversation_get_account(conv); |
| 3275 PurpleProtocol *protocol = | 3275 PurpleProtocol *protocol = |
| 3276 purple_find_protocol_info(purple_account_get_protocol_id(account)); | 3276 purple_protocols_find(purple_account_get_protocol_id(account)); |
| 3277 if (purple_account_get_connection(account) != NULL && | 3277 if (purple_account_get_connection(account) != NULL && |
| 3278 PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(protocol, chat_info_defaults)) { | 3278 PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(protocol, chat_info_defaults)) { |
| 3279 components = purple_protocol_iface_chat_info_defaults(protocol, purple_account_get_connection(account), | 3279 components = purple_protocol_iface_chat_info_defaults(protocol, purple_account_get_connection(account), |
| 3280 purple_conversation_get_name(conv)); | 3280 purple_conversation_get_name(conv)); |
| 3281 } else { | 3281 } else { |
| 6525 if ((flags & PURPLE_MESSAGE_RECV) && | 6525 if ((flags & PURPLE_MESSAGE_RECV) && |
| 6526 !purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting")) | 6526 !purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting")) |
| 6527 gtk_font_options |= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES | GTK_IMHTML_NO_FORMATTING; | 6527 gtk_font_options |= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES | GTK_IMHTML_NO_FORMATTING; |
| 6528 | 6528 |
| 6529 /* this is gonna crash one day, I can feel it. */ | 6529 /* this is gonna crash one day, I can feel it. */ |
| 6530 if (purple_find_protocol_info(purple_account_get_protocol_id(purple_conversation_get_account(conv)))->options & | 6530 if (purple_protocols_find(purple_account_get_protocol_id(purple_conversation_get_account(conv)))->options & |
| 6531 OPT_PROTO_USE_POINTSIZE) { | 6531 OPT_PROTO_USE_POINTSIZE) { |
| 6532 gtk_font_options |= GTK_IMHTML_USE_POINTSIZE; | 6532 gtk_font_options |= GTK_IMHTML_USE_POINTSIZE; |
| 6533 } | 6533 } |
| 6534 | 6534 |
| 6535 if (!(flags & PURPLE_MESSAGE_RECV) && (purple_conversation_get_features(conv) & PURPLE_CONNECTION_FLAG_ALLOW_CUSTOM_SMILEY)) | 6535 if (!(flags & PURPLE_MESSAGE_RECV) && (purple_conversation_get_features(conv) & PURPLE_CONNECTION_FLAG_ALLOW_CUSTOM_SMILEY)) |
