Mercurial > pidgin.yaz
diff src/gtkutils.c @ 10504:1a97d5e88d12
[gaim-migrate @ 11796]
Lots of things here:
- Several memory leak fixes
- A few invalid memory access fixes
- Fix a yahoo crash going idle when away
- Fix Add user in chats to actually fill in the screenname
- Add gaim_account_{get,set}_enabled to perl
- Fix command priorities (fixes /me in IRC)
- Fix MSN notification server transfer to be quiet about it
- Fix MSN blist sync if user has insane friendly name
- Make the docklet less crash-happy if it fails to embed in 3 seconds
- Only probe for native plugins with the correct file extension
- 1 typo fix :)
... and quite possibly something else I forgot.
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Tue, 11 Jan 2005 17:25:06 +0000 |
| parents | 748aa3c6de36 |
| children | 62fc579810f4 |
line wrap: on
line diff
--- a/src/gtkutils.c Tue Jan 11 02:00:44 2005 +0000 +++ b/src/gtkutils.c Tue Jan 11 17:25:06 2005 +0000 @@ -300,18 +300,20 @@ gaim_pixbuf_button_from_stock(const char *text, const char *icon, GaimButtonOrientation style) { - GtkWidget *button, *image, *label, *bbox, *ibox, *lbox; + GtkWidget *button, *image, *label, *bbox, *ibox, *lbox = NULL; button = gtk_button_new(); if (style == GAIM_BUTTON_HORIZONTAL) { bbox = gtk_hbox_new(FALSE, 0); ibox = gtk_hbox_new(FALSE, 0); - lbox = gtk_hbox_new(FALSE, 0); + if (text) + lbox = gtk_hbox_new(FALSE, 0); } else { bbox = gtk_vbox_new(FALSE, 0); ibox = gtk_vbox_new(FALSE, 0); - lbox = gtk_vbox_new(FALSE, 0); + if (text) + lbox = gtk_vbox_new(FALSE, 0); } gtk_container_add(GTK_CONTAINER(button), bbox);