comparison: pidgin/gtkwebview.c
pidgin/gtkwebview.c
- changeset 35831
- 86b7a6d3d267
- parent 35830
- fb32647ef2f3
- child 35841
- 56e1ef289cbb
equal
deleted
inserted
replaced
| 35830:fb32647ef2f3 | 35831:86b7a6d3d267 |
|---|---|
| 146 const gchar *uri; | 146 const gchar *uri; |
| 147 PurpleImage *img = NULL; | 147 PurpleImage *img = NULL; |
| 148 const gchar *path; | 148 const gchar *path; |
| 149 | 149 |
| 150 uri = webkit_network_request_get_uri(request); | 150 uri = webkit_network_request_get_uri(request); |
| 151 if (purple_str_has_prefix(uri, PURPLE_IMAGE_STORE_PROTOCOL)) { | 151 if ((img = purple_image_store_get_from_uri(uri)) != NULL) { |
| 152 guint id; | 152 /* noop */ |
| 153 | |
| 154 uri += sizeof(PURPLE_IMAGE_STORE_PROTOCOL) - 1; | |
| 155 id = strtoul(uri, NULL, 10); | |
| 156 | |
| 157 img = purple_image_store_get(id); | |
| 158 if (!img) | |
| 159 return; | |
| 160 } else if (purple_str_has_prefix(uri, PURPLE_IMAGE_STORE_STOCK_PROTOCOL)) { | 153 } else if (purple_str_has_prefix(uri, PURPLE_IMAGE_STORE_STOCK_PROTOCOL)) { |
| 161 gchar *p_uri, *found; | 154 gchar *p_uri, *found; |
| 162 const gchar *domain, *stock_name; | 155 const gchar *domain, *stock_name; |
| 163 | 156 |
| 164 uri += sizeof(PURPLE_IMAGE_STORE_STOCK_PROTOCOL) - 1; | 157 uri += sizeof(PURPLE_IMAGE_STORE_STOCK_PROTOCOL) - 1; |
