comparison: pidgin/gtkutils.c
pidgin/gtkutils.c
- branch
- soc.2013.gobjectification.plugins
- changeset 37145
- 8826f95514fd
- parent 37144
- 8b63b9948107
- parent 36035
- 75cbabcd0a4d
- child 37146
- b5b9c75a4b54
equal
deleted
inserted
replaced
| 37144:8b63b9948107 | 37145:8826f95514fd |
|---|---|
| 3068 GdkPixbuf *pidgin_pixbuf_new_from_file(const gchar *filename) | 3068 GdkPixbuf *pidgin_pixbuf_new_from_file(const gchar *filename) |
| 3069 { | 3069 { |
| 3070 GdkPixbuf *pixbuf; | 3070 GdkPixbuf *pixbuf; |
| 3071 GError *error = NULL; | 3071 GError *error = NULL; |
| 3072 | 3072 |
| 3073 g_return_val_if_fail(filename != NULL, NULL); | |
| 3074 g_return_val_if_fail(filename[0] != '\0', NULL); | |
| 3075 | |
| 3073 pixbuf = gdk_pixbuf_new_from_file(filename, &error); | 3076 pixbuf = gdk_pixbuf_new_from_file(filename, &error); |
| 3074 if (!pixbuf || error) { | 3077 if (!pixbuf || error) { |
| 3075 purple_debug_warning("gtkutils", "gdk_pixbuf_new_from_file() " | 3078 purple_debug_warning("gtkutils", "gdk_pixbuf_new_from_file() " |
| 3076 "returned %s for file %s: %s\n", | 3079 "returned %s for file %s: %s\n", |
| 3077 pixbuf ? "something" : "nothing", | 3080 pixbuf ? "something" : "nothing", |
| 3089 | 3092 |
| 3090 GdkPixbuf *pidgin_pixbuf_new_from_file_at_size(const char *filename, int width, int height) | 3093 GdkPixbuf *pidgin_pixbuf_new_from_file_at_size(const char *filename, int width, int height) |
| 3091 { | 3094 { |
| 3092 GdkPixbuf *pixbuf; | 3095 GdkPixbuf *pixbuf; |
| 3093 GError *error = NULL; | 3096 GError *error = NULL; |
| 3097 | |
| 3098 g_return_val_if_fail(filename != NULL, NULL); | |
| 3099 g_return_val_if_fail(filename[0] != '\0', NULL); | |
| 3094 | 3100 |
| 3095 pixbuf = gdk_pixbuf_new_from_file_at_size(filename, | 3101 pixbuf = gdk_pixbuf_new_from_file_at_size(filename, |
| 3096 width, height, &error); | 3102 width, height, &error); |
| 3097 if (!pixbuf || error) { | 3103 if (!pixbuf || error) { |
| 3098 purple_debug_warning("gtkutils", "gdk_pixbuf_new_from_file_at_size() " | 3104 purple_debug_warning("gtkutils", "gdk_pixbuf_new_from_file_at_size() " |
| 3112 | 3118 |
| 3113 GdkPixbuf *pidgin_pixbuf_new_from_file_at_scale(const char *filename, int width, int height, gboolean preserve_aspect_ratio) | 3119 GdkPixbuf *pidgin_pixbuf_new_from_file_at_scale(const char *filename, int width, int height, gboolean preserve_aspect_ratio) |
| 3114 { | 3120 { |
| 3115 GdkPixbuf *pixbuf; | 3121 GdkPixbuf *pixbuf; |
| 3116 GError *error = NULL; | 3122 GError *error = NULL; |
| 3123 | |
| 3124 g_return_val_if_fail(filename != NULL, NULL); | |
| 3125 g_return_val_if_fail(filename[0] != '\0', NULL); | |
| 3117 | 3126 |
| 3118 pixbuf = gdk_pixbuf_new_from_file_at_scale(filename, | 3127 pixbuf = gdk_pixbuf_new_from_file_at_scale(filename, |
| 3119 width, height, preserve_aspect_ratio, &error); | 3128 width, height, preserve_aspect_ratio, &error); |
| 3120 if (!pixbuf || error) { | 3129 if (!pixbuf || error) { |
| 3121 purple_debug_warning("gtkutils", "gdk_pixbuf_new_from_file_at_scale() " | 3130 purple_debug_warning("gtkutils", "gdk_pixbuf_new_from_file_at_scale() " |
