ports/65728: Update port: mail/sylpheed-gtk2 to 0.9.9.20040229_2

[Jean-Yves Lefort]

>Number:         65728
>Category:       ports
>Synopsis:       Update port: mail/sylpheed-gtk2 to 0.9.9.20040229_2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 18 08:40:16 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jean-Yves Lefort
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 4.9-STABLE FreeBSD 4.9-STABLE #0: Thu Mar 18 01:32:50 CET 2004 jylefort at jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
>Description:
Adding two patches:

  - fix loading empty preference keys
  - do not load ~/.gtkrc [1]

[1] reported by Davide D'Amico and Giuseppe Serano
>How-To-Repeat:
	
>Fix:
diff -ruN /usr/ports/mail/sylpheed-gtk2/Makefile sylpheed-gtk2/Makefile
--- /usr/ports/mail/sylpheed-gtk2/Makefile	Wed Apr  7 05:50:29 2004
+++ sylpheed-gtk2/Makefile	Sun Apr 18 17:27:09 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=		sylpheed-gtk2
 PORTVERSION=		0.9.9.20040229
-PORTREVISION=	1
+PORTREVISION=		2
 CATEGORIES=		mail ipv6
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -ruN /usr/ports/mail/sylpheed-gtk2/files/patch-src::main.c sylpheed-gtk2/files/patch-src::main.c
--- /usr/ports/mail/sylpheed-gtk2/files/patch-src::main.c	Thu Jan  1 01:00:00 1970
+++ sylpheed-gtk2/files/patch-src::main.c	Sun Apr 18 17:23:49 2004
@@ -0,0 +1,24 @@
+--- src/main.c.orig	Sun Apr 18 17:22:45 2004
++++ src/main.c	Sun Apr 18 17:23:11 2004
+@@ -194,21 +194,6 @@
+ 
+ 	srandom((gint)time(NULL));
+ 
+-	/* parse gtkrc files */
+-	userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc",
+-			     NULL);
+-	gtk_rc_parse(userrc);
+-	g_free(userrc);
+-	userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtk",
+-			     G_DIR_SEPARATOR_S, "gtkrc", NULL);
+-	gtk_rc_parse(userrc);
+-	g_free(userrc);
+-	userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "gtkrc", NULL);
+-	gtk_rc_parse(userrc);
+-	g_free(userrc);
+-
+-	gtk_rc_parse("./gtkrc");
+-
+ 	userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
+ 	gtk_accel_map_load (userrc);
+ 	g_free(userrc);
diff -ruN /usr/ports/mail/sylpheed-gtk2/files/patch-src::prefs.c sylpheed-gtk2/files/patch-src::prefs.c
--- /usr/ports/mail/sylpheed-gtk2/files/patch-src::prefs.c	Thu Jan  1 01:00:00 1970
+++ sylpheed-gtk2/files/patch-src::prefs.c	Sun Apr 18 17:26:31 2004
@@ -0,0 +1,30 @@
+--- src/prefs.c.orig	Fri Jan 23 12:08:46 2004
++++ src/prefs.c	Fri Jan 23 12:16:37 2004
+@@ -109,17 +109,18 @@
+ 		case P_STRING:
+ 		{
+ #warning FIXME_GTK2
+-			gchar *tmp;
++			gchar *tmp = NULL;
+ 
+-			tmp = *value ?
+-				conv_codeset_strdup(value,
+-						    conv_get_current_charset_str(),
+-						    CS_UTF_8)
+-				: g_strdup("");
+-			if (!tmp) {
+-				g_warning("faild to convert character set.");
+-				tmp = g_strdup(value);
++			if (*value) {
++				tmp = conv_codeset_strdup(value,
++							  conv_get_current_charset_str(),
++							  CS_UTF_8);
++				if (!tmp) {
++					g_warning("failed to convert character set.");
++					tmp = g_strdup(value);
++				}
+ 			}
++			
+ 			g_free(*((gchar **)param[i].data));
+ 			*((gchar **)param[i].data) = tmp;
+ 			break;

	
>Release-Note:
>Audit-Trail:
>Unformatted: