Mercurial > pidgin.yaz
comparison src/gtkaccount.c @ 10413:960b6a41d02f
[gaim-migrate @ 11662]
Graham Cole pointed out that these should not have equalses.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Fri, 24 Dec 2004 16:45:33 +0000 |
| parents | 8ee13eecfee0 |
| children | bed2c96bc1fb |
comparison
equal
deleted
inserted
replaced
| 10412:ecf4f88430cc | 10413:960b6a41d02f |
|---|---|
| 545 char *random = g_strdup_printf("%x", g_random_int()); | 545 char *random = g_strdup_printf("%x", g_random_int()); |
| 546 const char *dirname = gaim_buddy_icons_get_cache_dir(); | 546 const char *dirname = gaim_buddy_icons_get_cache_dir(); |
| 547 char *filename = g_build_filename(dirname, random, NULL); | 547 char *filename = g_build_filename(dirname, random, NULL); |
| 548 pixbuf = gdk_pixbuf_new_from_file(path, &error); | 548 pixbuf = gdk_pixbuf_new_from_file(path, &error); |
| 549 if (!error && (prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_SEND) && | 549 if (!error && (prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_SEND) && |
| 550 (width <= prpl_info->icon_spec.min_width || | 550 (width < prpl_info->icon_spec.min_width || |
| 551 width >= prpl_info->icon_spec.max_width || | 551 width > prpl_info->icon_spec.max_width || |
| 552 height <= prpl_info->icon_spec.min_height || | 552 height < prpl_info->icon_spec.min_height || |
| 553 height >= prpl_info->icon_spec.max_height)) | 553 height > prpl_info->icon_spec.max_height)) |
| 554 { | 554 { |
| 555 int new_width = gdk_pixbuf_get_width(pixbuf); | 555 int new_width = gdk_pixbuf_get_width(pixbuf); |
| 556 int new_height = gdk_pixbuf_get_height(pixbuf); | 556 int new_height = gdk_pixbuf_get_height(pixbuf); |
| 557 | 557 |
| 558 if(new_width > prpl_info->icon_spec.max_width) | 558 if(new_width > prpl_info->icon_spec.max_width) |