comparison: pidgin/gtksmiley.c
pidgin/gtksmiley.c
- changeset 35322
- 9f6d0e63e80a
- parent 35321
- 3fc5097c876d
- child 35454
- cf2a24d01503
equal
deleted
inserted
replaced
| 35321:3fc5097c876d | 35322:9f6d0e63e80a |
|---|---|
| 88 } | 88 } |
| 89 | 89 |
| 90 /****************************************************************************** | 90 /****************************************************************************** |
| 91 * GtkWebViewSmileys stuff | 91 * GtkWebViewSmileys stuff |
| 92 *****************************************************************************/ | 92 *****************************************************************************/ |
| 93 /* Perhaps these should be in gtkimhtml.c instead. -- sadrul */ | 93 /* Perhaps these should be in gtkwebview.c instead. -- sadrul */ |
| 94 static void add_gtkimhtml_to_list(GtkWebViewSmiley *gtksmiley) | 94 static void add_gtkwebview_to_list(GtkWebViewSmiley *gtksmiley) |
| 95 { | 95 { |
| 96 gtk_smileys = g_slist_prepend(gtk_smileys, gtksmiley); | 96 gtk_smileys = g_slist_prepend(gtk_smileys, gtksmiley); |
| 97 | 97 |
| 98 purple_debug_info("gtksmiley", "adding %s to gtk_smileys", | 98 purple_debug_info("gtksmiley", "adding %s to gtk_smileys", |
| 99 gtk_webview_smiley_get_smile(gtksmiley)); | 99 gtk_webview_smiley_get_smile(gtksmiley)); |
| 126 #else | 126 #else |
| 127 purple_debug_fatal("gtksmiley", "image_changed_cb not implemented"); | 127 purple_debug_fatal("gtksmiley", "image_changed_cb not implemented"); |
| 128 #endif | 128 #endif |
| 129 } | 129 } |
| 130 | 130 |
| 131 static GtkWebViewSmiley *smiley_purple_to_gtkimhtml(PurpleSmiley *smiley) | 131 static GtkWebViewSmiley *smiley_purple_to_gtkwebview(PurpleSmiley *smiley) |
| 132 { | 132 { |
| 133 GtkWebViewSmiley *gtksmiley; | 133 GtkWebViewSmiley *gtksmiley; |
| 134 gchar *filename; | 134 gchar *filename; |
| 135 const gchar *file; | 135 const gchar *file; |
| 136 | 136 |
| 186 | 186 |
| 187 void pidgin_smiley_add_to_list(PurpleSmiley *smiley) | 187 void pidgin_smiley_add_to_list(PurpleSmiley *smiley) |
| 188 { | 188 { |
| 189 GtkWebViewSmiley *gtksmiley; | 189 GtkWebViewSmiley *gtksmiley; |
| 190 | 190 |
| 191 gtksmiley = smiley_purple_to_gtkimhtml(smiley); | 191 gtksmiley = smiley_purple_to_gtkwebview(smiley); |
| 192 add_gtkimhtml_to_list(gtksmiley); | 192 add_gtkwebview_to_list(gtksmiley); |
| 193 g_signal_connect(G_OBJECT(smiley), "destroy", G_CALLBACK(pidgin_smiley_del_from_list), NULL); | 193 g_signal_connect(G_OBJECT(smiley), "destroy", G_CALLBACK(pidgin_smiley_del_from_list), NULL); |
| 194 } | 194 } |
| 195 | 195 |
| 196 void pidgin_smileys_init(void) | 196 void pidgin_smileys_init(void) |
| 197 { | 197 { |
