Mercurial > pidgin.yaz
changeset 17042:777cdaa3b904
This is what I actually intended to commit in 105009e066f1bcaefb0af3bd1e17b7860bf12a57. The rest of the mess being pushed is me trying to clean up my mess.
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 11 May 2007 15:46:32 +0000 |
| parents | da9c663305ad |
| children | 8ad7750b0391 |
| files | pidgin/gtkblist.c pidgin/plugins/ticker/Makefile.mingw |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Fri May 11 15:42:16 2007 +0000 +++ b/pidgin/gtkblist.c Fri May 11 15:46:32 2007 +0000 @@ -2091,28 +2091,28 @@ if (width < 6 || height < 6) return; - + /* Top left */ pixels[3] = 0; pixels[7] = 0x80; pixels[11] = 0xC0; pixels[rowstride + 3] = 0x80; pixels[rowstride * 2 + 3] = 0xC0; - + /* Top right */ pixels[width * 4 - 1] = 0; pixels[width * 4 - 5] = 0x80; pixels[width * 4 - 9] = 0xC0; pixels[rowstride + (width * 4) - 1] = 0x80; pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0; - + /* Bottom left */ pixels[(height - 1) * rowstride + 3] = 0; pixels[(height - 1) * rowstride + 7] = 0x80; pixels[(height - 1) * rowstride + 11] = 0xC0; pixels[(height - 2) * rowstride + 3] = 0x80; pixels[(height - 3) * rowstride + 3] = 0xC0; - + /* Bottom right */ pixels[height * rowstride - 1] = 0; pixels[(height - 1) * rowstride - 1] = 0x80; @@ -3152,7 +3152,8 @@ if(PURPLE_BLIST_NODE_IS_CONTACT(node)) { if(!gtknode->contact_expanded) { buddy = purple_contact_get_priority_buddy((PurpleContact*)node); - gtkbuddynode = ((PurpleBlistNode*)buddy)->ui_data; + if (buddy != NULL) + gtkbuddynode = ((PurpleBlistNode*)buddy)->ui_data; } } else if(PURPLE_BLIST_NODE_IS_BUDDY(node)) { buddy = (PurpleBuddy*)node;
--- a/pidgin/plugins/ticker/Makefile.mingw Fri May 11 15:42:16 2007 +0000 +++ b/pidgin/plugins/ticker/Makefile.mingw Fri May 11 15:46:32 2007 +0000 @@ -59,7 +59,7 @@ all: $(TARGET).dll -install: $(PIDGIN_INSTALL_PLUGINS_DIR) +install: $(PIDGIN_INSTALL_PLUGINS_DIR) all cp $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR) $(OBJECTS): $(PIDGIN_CONFIG_H)