comparison: src/gtkutils.c
src/gtkutils.c
- changeset 13114
- 89c855cbfe02
- parent 13110
- 052e717c7281
- child 13203
- bdb98c8e5b56
equal
deleted
inserted
replaced
| 13113:bfc8191807c2 | 13114:89c855cbfe02 |
|---|---|
| 1588 | 1588 |
| 1589 static GdkPixbuf * | 1589 static GdkPixbuf * |
| 1590 overlay_status_onto_icon(GdkPixbuf *pixbuf, GaimStatusPrimitive primitive) | 1590 overlay_status_onto_icon(GdkPixbuf *pixbuf, GaimStatusPrimitive primitive) |
| 1591 { | 1591 { |
| 1592 const char *type_name; | 1592 const char *type_name; |
| 1593 char *basename; | 1593 char basename[256]; |
| 1594 char *filename; | 1594 char *filename; |
| 1595 GdkPixbuf *emblem; | 1595 GdkPixbuf *emblem; |
| 1596 | 1596 |
| 1597 type_name = gaim_primitive_get_id_from_type(primitive); | 1597 type_name = gaim_primitive_get_id_from_type(primitive); |
| 1598 | 1598 |
| 1599 basename = g_strdup_printf("%s.png", type_name); | 1599 g_snprintf(basename, sizeof(basename), "%s.png", type_name); |
| 1600 filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", | 1600 filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", |
| 1601 "default", basename, NULL); | 1601 "default", basename, NULL); |
| 1602 g_free(basename); | |
| 1603 emblem = gdk_pixbuf_new_from_file(filename, NULL); | 1602 emblem = gdk_pixbuf_new_from_file(filename, NULL); |
| 1604 g_free(filename); | 1603 g_free(filename); |
| 1605 | 1604 |
| 1606 if (emblem != NULL) { | 1605 if (emblem != NULL) { |
| 1607 int width, height, emblem_width, emblem_height; | 1606 int width, height, emblem_width, emblem_height; |
