cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a segfault on sign on when no ~/.gtkrc file exists. This has been

Browse Source 
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>
This commit is contained in:
Joe Marcus Clarke 2002-10-17 21:30:33 +00:00
parent 4ab3087fc4
commit 97ed3d8e12
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=68227
6 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net-im/gaim/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= gaim
PORTVERSION= 0.59.5
PORTREVISION= 1
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}

17
net-im/gaim/files/patch-src_buddy.c Normal file
View File

@ -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)) {

1
net/gaim-snapshot/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= gaim
PORTVERSION= 0.59.5
PORTREVISION= 1
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}

17
net/gaim-snapshot/files/patch-src_buddy.c Normal file
View File

@ -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)) {

1
net/gaim/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= gaim
PORTVERSION= 0.59.5
PORTREVISION= 1
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}

17
net/gaim/files/patch-src_buddy.c Normal file
View File

@ -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)) {