Mercurial > pidgin.yaz
changeset 16623:dd6e1dde4cb5
merge of '2d00dcb7fc18b083ac949b5febda711ecfd52cdb'
and '672f4498d064f8279f66bb1ca2922dded2435411'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2007 01:17:40 +0000 |
| parents | bb5c527cf143 (diff) 8d8168fada21 (current diff) |
| children | bb039b61f16e 56cc78d3d04f |
| files | libpurple/buddyicon.c |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/buddyicon.c Sun Apr 29 01:08:25 2007 +0000 +++ b/libpurple/buddyicon.c Sun Apr 29 01:17:40 2007 +0000 @@ -723,7 +723,7 @@ if (old_img) purple_imgstore_unref(old_img); - else + else if (old_icon) { /* The old icon may not have been loaded into memory. In that * case, we'll need to uncache the filename. The filenames
--- a/libpurple/win32/targets.mak Sun Apr 29 01:08:25 2007 +0000 +++ b/libpurple/win32/targets.mak Sun Apr 29 01:17:40 2007 +0000 @@ -8,7 +8,7 @@ $(PIDGIN_CONFIG_H): $(PIDGIN_TREE_TOP)/config.h.mingw cp $(PIDGIN_TREE_TOP)/config.h.mingw $(PIDGIN_CONFIG_H) -$(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in +$(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac cp $(PURPLE_VERSION_H).in $(PURPLE_VERSION_H) awk 'BEGIN {FS="[\\(\\)\\[\\]]"} \ /^m4_define..purple_major_version/ {system("sed -i -e s/@PURPLE_MAJOR_VERSION@/"$$5"/ $(PURPLE_VERSION_H)");} \