diff options
| author | marcus <marcus@FreeBSD.org> | 2002-10-17 21:30:33 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2002-10-17 21:30:33 +0000 |
| commit | 190077e596fb33990eb35ede30424e222698cc2a (patch) | |
| tree | 1a593f0e979dcfc8f0ce357f8d39c33c222138db /net-im | |
| parent | ea99f77afcc10b7ef60af60662ea260fef7ca5c7 (diff) | |
| download | FreeBSD-ports-190077e596fb33990eb35ede30424e222698cc2a.zip FreeBSD-ports-190077e596fb33990eb35ede30424e222698cc2a.tar.gz | |
Fix a segfault on sign on when no ~/.gtkrc file exists. This has been
filed as gaim bug #624899.
Reported by: Kenneth W Cochran <kwc@TheWorld.com>
David Thiel <lx@redundancy.redundancy.org>
Tested by: David Thiel <lx@redundancy.redundancy.org>
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/gaim/Makefile | 1 | ||||
| -rw-r--r-- | net-im/gaim/files/patch-src_buddy.c | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile index 050e635..9baabaa 100644 --- a/net-im/gaim/Makefile +++ b/net-im/gaim/Makefile @@ -7,6 +7,7 @@ PORTNAME= gaim PORTVERSION= 0.59.5 +PORTREVISION= 1 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/net-im/gaim/files/patch-src_buddy.c b/net-im/gaim/files/patch-src_buddy.c new file mode 100644 index 0000000..e2d13a2 --- /dev/null +++ b/net-im/gaim/files/patch-src_buddy.c @@ -0,0 +1,17 @@ +--- src/buddy.c.orig Thu Oct 17 12:11:51 2002 ++++ src/buddy.c Thu Oct 17 16:58:49 2002 +@@ -2231,7 +2231,13 @@ + if (blist_options & OPT_BLIST_SHOW_IDLETIME) + gtk_widget_show(bs->idle); + +- style = gtk_style_copy( gtk_rc_get_style(bs->label) ); ++ if (gtk_rc_get_style(bs->label) != NULL) { ++ style = gtk_style_copy( gtk_rc_get_style(bs->label) ); ++ } else { ++ style = gtk_style_new(); ++ gdk_font_unref(gtk_style_get_font(style)); ++ gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(bs->label->style))); ++ } + for (i = 0; i < 5; i++) + style->fg[i] = bs->idle->style->fg[i]; + if ((blist_options & OPT_BLIST_GREY_IDLERS) && (b->idle)) { |
