comparison: pidgin/plugins/disco/gtkdisco.c
pidgin/plugins/disco/gtkdisco.c
- changeset 35850
- 1abeda205d6c
- parent 35526
- ed1be305c985
- child 36135
- b46d29bc9b35
- child 37136
- cfa7c57f9ca5
equal
deleted
inserted
replaced
| 35849:77efee65c5f4 | 35850:1abeda205d6c |
|---|---|
| 118 g_return_val_if_fail(service != NULL, NULL); | 118 g_return_val_if_fail(service != NULL, NULL); |
| 119 g_return_val_if_fail(size != NULL, NULL); | 119 g_return_val_if_fail(size != NULL, NULL); |
| 120 | 120 |
| 121 if (service->type == XMPP_DISCO_SERVICE_TYPE_GATEWAY && service->gateway_type) { | 121 if (service->type == XMPP_DISCO_SERVICE_TYPE_GATEWAY && service->gateway_type) { |
| 122 char *tmp = g_strconcat(service->gateway_type, ".png", NULL); | 122 char *tmp = g_strconcat(service->gateway_type, ".png", NULL); |
| 123 filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", size, tmp, NULL); | 123 filename = g_build_filename(PURPLE_DATADIR, |
| 124 "pixmaps", "pidgin", "protocols", size, tmp, NULL); | |
| 124 g_free(tmp); | 125 g_free(tmp); |
| 125 #if 0 | 126 #if 0 |
| 126 } else if (service->type == XMPP_DISCO_SERVICE_TYPE_USER) { | 127 } else if (service->type == XMPP_DISCO_SERVICE_TYPE_USER) { |
| 127 filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", size, "person.png", NULL); | 128 filename = g_build_filename(PURPLE_DATADIR, |
| 129 "pixmaps", "pidgin", "status", size, "person.png", NULL); | |
| 128 #endif | 130 #endif |
| 129 } else if (service->type == XMPP_DISCO_SERVICE_TYPE_CHAT) | 131 } else if (service->type == XMPP_DISCO_SERVICE_TYPE_CHAT) { |
| 130 filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", size, "chat.png", NULL); | 132 filename = g_build_filename(PURPLE_DATADIR, |
| 133 "pixmaps", "pidgin", "status", size, "chat.png", NULL); | |
| 134 } | |
| 131 | 135 |
| 132 if (filename) { | 136 if (filename) { |
| 133 pixbuf = gdk_pixbuf_new_from_file(filename, NULL); | 137 pixbuf = gdk_pixbuf_new_from_file(filename, NULL); |
| 134 g_free(filename); | 138 g_free(filename); |
| 135 } | 139 } |
