aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorKirill Ponomarev <krion@FreeBSD.org>2004-04-18 17:14:10 +0000
committerKirill Ponomarev <krion@FreeBSD.org>2004-04-18 17:14:10 +0000
commited6e532c278588a98270d0b64fdbc1b234b4ef67 (patch)
tree2a4ddaf0edb8d6e4f0e7203f7a8352d20821870d /mail
parent668835a9f5c89cd0c3ac9115e352f8ffb757f3c0 (diff)
downloadports-ed6e532c278588a98270d0b64fdbc1b234b4ef67.tar.gz
ports-ed6e532c278588a98270d0b64fdbc1b234b4ef67.zip
Notes
Diffstat (limited to 'mail')
-rw-r--r--mail/sylpheed-gtk2/Makefile2
-rw-r--r--mail/sylpheed-gtk2/files/patch-src::main.c24
-rw-r--r--mail/sylpheed-gtk2/files/patch-src::prefs.c30
3 files changed, 55 insertions, 1 deletions
diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile
index 0c4be1027d75..27fb31ce39cd 100644
--- a/mail/sylpheed-gtk2/Makefile
+++ b/mail/sylpheed-gtk2/Makefile
@@ -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 --git a/mail/sylpheed-gtk2/files/patch-src::main.c b/mail/sylpheed-gtk2/files/patch-src::main.c
new file mode 100644
index 000000000000..77ad5c747f58
--- /dev/null
+++ b/mail/sylpheed-gtk2/files/patch-src::main.c
@@ -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 --git a/mail/sylpheed-gtk2/files/patch-src::prefs.c b/mail/sylpheed-gtk2/files/patch-src::prefs.c
new file mode 100644
index 000000000000..e0ae6ee8a78f
--- /dev/null
+++ b/mail/sylpheed-gtk2/files/patch-src::prefs.c
@@ -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;