diff options
author | Richard Laager <rlaager@pidgin.im> | 2008-11-16 10:06:26 +0000 |
---|---|---|
committer | Richard Laager <rlaager@pidgin.im> | 2008-11-16 10:06:26 +0000 |
commit | 10aa46183ccf8053540fb644cc20f1a72e3231b5 (patch) | |
tree | 2d53d0160e7c11ede80a391a5f67a5904d76bcd0 | |
parent | ccb434bdc587cd5319d1720427c4b27d64263142 (diff) | |
download | pidgin-10aa46183ccf8053540fb644cc20f1a72e3231b5.tar.gz |
Avoid trying to build a filename and pixbuf if there's no image filename.
-rw-r--r-- | pidgin/gtkrequest.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c index d18ade3b4d..3e05eab739 100644 --- a/pidgin/gtkrequest.c +++ b/pidgin/gtkrequest.c @@ -997,7 +997,6 @@ create_list_field(PurpleRequestField *field) GtkTreeIter iter; GList *l; GList *icons = NULL; - GdkPixbuf* pixbuf; icons = purple_request_field_list_get_icons(field); @@ -1051,11 +1050,15 @@ create_list_field(PurpleRequestField *field) if (icons) { const char *icon_path = (const char *)icons->data; - char* filename = g_build_filename(DATADIR, icon_path, NULL); + char* filename; + GdkPixbuf* pixbuf = NULL; - pixbuf = gdk_pixbuf_new_from_file(filename, NULL); - - g_free(filename); + if (icon_path) + { + filename = g_build_filename(DATADIR, icon_path, NULL); + pixbuf = gdk_pixbuf_new_from_file(filename, NULL); + g_free(filename); + } gtk_list_store_set(store, &iter, 0, purple_request_field_list_get_data(field, text), |