diff options
| author | Mark Doliner <markdoliner@pidgin.im> | 2011-06-22 07:09:42 +0000 |
|---|---|---|
| committer | Mark Doliner <markdoliner@pidgin.im> | 2011-06-22 07:09:42 +0000 |
| commit | 21c4e17f9a3e032e52c8ccec552fb73fd9bbe0ce (patch) | |
| tree | 81a3482cdc7962a1a74102b80863b36f19d5436a /pidgin/gtkdialogs.c | |
| parent | de25d0e68933a3742195cbbf9fe6b2e73718f5c5 (diff) | |
| download | pidgin-21c4e17f9a3e032e52c8ccec552fb73fd9bbe0ce.tar.gz | |
applied changes from 8300e1e9a38c8d28e0710569d22be71f6c1abca9
through 96183796df0c52bb91e9828948c24cfa36845c1d
Original commit message:
Start looking at the GError parameter every time we call these functions:
- gdk_pixbuf_loader_write
- gdk_pixbuf_loader_close
- gdk_pixbuf_new_from_file
- gdk_pixbuf_new_from_file_at_size
- gdk_pixbuf_new_from_file_at_scale
There are times when gdkpixbuf returns a semi-invalid GdkPixbuf object and
also sets the GError. If this happens we want to discard and ignore the
GdkPixbuf object because it can cause problems. For example, calling
gdk_pixbuf_scale_simple() causes gdkpixbuf to rapidly consume memory in
an infinite loop. And that's bad.
This commit adds some helper functions to gtkutils.[c|h] that make it a
little easier to check the GError value. We should use them everywhere
we call any of the above functions.
Diffstat (limited to 'pidgin/gtkdialogs.c')
| -rw-r--r-- | pidgin/gtkdialogs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c index da6da82b2d..01d964b74b 100644 --- a/pidgin/gtkdialogs.c +++ b/pidgin/gtkdialogs.c @@ -433,7 +433,7 @@ pidgin_build_help_dialog(const char *title, const char *role, GString *string) /* Generate a logo with a version number */ filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "logo.png", NULL); - pixbuf = gdk_pixbuf_new_from_file(filename, NULL); + pixbuf = pidgin_pixbuf_new_from_file(filename); g_free(filename); #if 0 /* Don't versionize the logo when the logo has the version in it */ |