mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
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>
This commit is contained in:
parent
4ab3087fc4
commit
97ed3d8e12
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=68227
@ -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
17
net-im/gaim/files/patch-src_buddy.c
Normal 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)) {
|
@ -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
17
net/gaim-snapshot/files/patch-src_buddy.c
Normal 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)) {
|
@ -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
17
net/gaim/files/patch-src_buddy.c
Normal 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)) {
|
Loading…
Reference in New Issue
Block a user