diff options
Diffstat (limited to 'net/gtk-gnutella/patches/patch-ae')
-rw-r--r-- | net/gtk-gnutella/patches/patch-ae | 125 |
1 files changed, 58 insertions, 67 deletions
diff --git a/net/gtk-gnutella/patches/patch-ae b/net/gtk-gnutella/patches/patch-ae index 84e78e33314..39e95ee435a 100644 --- a/net/gtk-gnutella/patches/patch-ae +++ b/net/gtk-gnutella/patches/patch-ae @@ -1,116 +1,107 @@ -$NetBSD: patch-ae,v 1.4 2007/06/15 14:26:23 darcy Exp $ +$NetBSD: patch-ae,v 1.5 2007/10/14 08:32:19 adam Exp $ ---- src/if/gnet_property.c.orig 2007-06-14 12:07:07.000000000 -0400 +--- src/if/gnet_property.c.orig 2007-07-07 06:21:34.000000000 +0200 +++ src/if/gnet_property.c -@@ -730,7 +730,7 @@ gnet_prop_init(void) { +@@ -743,7 +743,7 @@ gnet_prop_init(void) { gnet_property->props[3].vector_size = 1; /* Type specific data: */ - gnet_property->props[3].type = PROP_TYPE_STRING; + gnet_property->props[3].type = gg_PROP_TYPE_STRING; - gnet_property->props[3].data.string.def = &new_version_str_def; - gnet_property->props[3].data.string.value = &new_version_str; + gnet_property->props[3].data.string.def = (void *) &gnet_property_variable_new_version_str_default; + gnet_property->props[3].data.string.value = (void *) &gnet_property_variable_new_version_str; if (gnet_property->props[3].data.string.def) { -@@ -2843,7 +2843,7 @@ gnet_prop_init(void) { +@@ -2836,7 +2836,7 @@ gnet_prop_init(void) { + gnet_property->props[112].vector_size = 1; + + /* Type specific data: */ +- gnet_property->props[112].type = PROP_TYPE_STRING; ++ gnet_property->props[112].type = gg_PROP_TYPE_STRING; + gnet_property->props[112].data.string.def = (void *) &gnet_property_variable_socks_user_default; + gnet_property->props[112].data.string.value = (void *) &gnet_property_variable_socks_user; + if (gnet_property->props[112].data.string.def) { +@@ -2857,7 +2857,7 @@ gnet_prop_init(void) { gnet_property->props[113].vector_size = 1; /* Type specific data: */ - gnet_property->props[113].type = PROP_TYPE_STRING; + gnet_property->props[113].type = gg_PROP_TYPE_STRING; - gnet_property->props[113].data.string.def = &socks_user_def; - gnet_property->props[113].data.string.value = &socks_user; + gnet_property->props[113].data.string.def = (void *) &gnet_property_variable_socks_pass_default; + gnet_property->props[113].data.string.value = (void *) &gnet_property_variable_socks_pass; if (gnet_property->props[113].data.string.def) { -@@ -2864,7 +2864,7 @@ gnet_prop_init(void) { - gnet_property->props[114].vector_size = 1; +@@ -2894,7 +2894,7 @@ gnet_prop_init(void) { + gnet_property->props[115].vector_size = 1; /* Type specific data: */ -- gnet_property->props[114].type = PROP_TYPE_STRING; -+ gnet_property->props[114].type = gg_PROP_TYPE_STRING; - gnet_property->props[114].data.string.def = &socks_pass_def; - gnet_property->props[114].data.string.value = &socks_pass; - if (gnet_property->props[114].data.string.def) { -@@ -2901,7 +2901,7 @@ gnet_prop_init(void) { - gnet_property->props[116].vector_size = 1; +- gnet_property->props[115].type = PROP_TYPE_STRING; ++ gnet_property->props[115].type = gg_PROP_TYPE_STRING; + gnet_property->props[115].data.string.def = (void *) &gnet_property_variable_proxy_hostname_default; + gnet_property->props[115].data.string.value = (void *) &gnet_property_variable_proxy_hostname; + if (gnet_property->props[115].data.string.def) { +@@ -3485,7 +3485,7 @@ gnet_prop_init(void) { + gnet_property->props[145].vector_size = 1; /* Type specific data: */ -- gnet_property->props[116].type = PROP_TYPE_STRING; -+ gnet_property->props[116].type = gg_PROP_TYPE_STRING; - gnet_property->props[116].data.string.def = &proxy_hostname_def; - gnet_property->props[116].data.string.value = &proxy_hostname; - if (gnet_property->props[116].data.string.def) { -@@ -3492,7 +3492,7 @@ gnet_prop_init(void) { - gnet_property->props[146].vector_size = 1; +- gnet_property->props[145].type = PROP_TYPE_STRING; ++ gnet_property->props[145].type = gg_PROP_TYPE_STRING; + gnet_property->props[145].data.string.def = (void *) &gnet_property_variable_scan_extensions_default; + gnet_property->props[145].data.string.value = (void *) &gnet_property_variable_scan_extensions; + if (gnet_property->props[145].data.string.def) { +@@ -3540,7 +3540,7 @@ gnet_prop_init(void) { + gnet_property->props[148].vector_size = 1; /* Type specific data: */ -- gnet_property->props[146].type = PROP_TYPE_STRING; -+ gnet_property->props[146].type = gg_PROP_TYPE_STRING; - gnet_property->props[146].data.string.def = &scan_extensions_def; - gnet_property->props[146].data.string.value = &scan_extensions; - if (gnet_property->props[146].data.string.def) { -@@ -3547,7 +3547,7 @@ gnet_prop_init(void) { +- gnet_property->props[148].type = PROP_TYPE_STRING; ++ gnet_property->props[148].type = gg_PROP_TYPE_STRING; + gnet_property->props[148].data.string.def = (void *) &gnet_property_variable_save_file_path_default; + gnet_property->props[148].data.string.value = (void *) &gnet_property_variable_save_file_path; + if (gnet_property->props[148].data.string.def) { +@@ -3561,7 +3561,7 @@ gnet_prop_init(void) { gnet_property->props[149].vector_size = 1; /* Type specific data: */ - gnet_property->props[149].type = PROP_TYPE_STRING; + gnet_property->props[149].type = gg_PROP_TYPE_STRING; - gnet_property->props[149].data.string.def = &save_file_path_def; - gnet_property->props[149].data.string.value = &save_file_path; + gnet_property->props[149].data.string.def = (void *) &gnet_property_variable_move_file_path_default; + gnet_property->props[149].data.string.value = (void *) &gnet_property_variable_move_file_path; if (gnet_property->props[149].data.string.def) { -@@ -3568,7 +3568,7 @@ gnet_prop_init(void) { +@@ -3582,7 +3582,7 @@ gnet_prop_init(void) { gnet_property->props[150].vector_size = 1; /* Type specific data: */ - gnet_property->props[150].type = PROP_TYPE_STRING; + gnet_property->props[150].type = gg_PROP_TYPE_STRING; - gnet_property->props[150].data.string.def = &move_file_path_def; - gnet_property->props[150].data.string.value = &move_file_path; + gnet_property->props[150].data.string.def = (void *) &gnet_property_variable_bad_file_path_default; + gnet_property->props[150].data.string.value = (void *) &gnet_property_variable_bad_file_path; if (gnet_property->props[150].data.string.def) { -@@ -3589,7 +3589,7 @@ gnet_prop_init(void) { +@@ -3603,7 +3603,7 @@ gnet_prop_init(void) { gnet_property->props[151].vector_size = 1; /* Type specific data: */ - gnet_property->props[151].type = PROP_TYPE_STRING; + gnet_property->props[151].type = gg_PROP_TYPE_STRING; - gnet_property->props[151].data.string.def = &bad_file_path_def; - gnet_property->props[151].data.string.value = &bad_file_path; + gnet_property->props[151].data.string.def = (void *) &gnet_property_variable_shared_dirs_paths_default; + gnet_property->props[151].data.string.value = (void *) &gnet_property_variable_shared_dirs_paths; if (gnet_property->props[151].data.string.def) { -@@ -3610,7 +3610,7 @@ gnet_prop_init(void) { +@@ -3624,7 +3624,7 @@ gnet_prop_init(void) { gnet_property->props[152].vector_size = 1; /* Type specific data: */ - gnet_property->props[152].type = PROP_TYPE_STRING; + gnet_property->props[152].type = gg_PROP_TYPE_STRING; - gnet_property->props[152].data.string.def = &shared_dirs_paths_def; - gnet_property->props[152].data.string.value = &shared_dirs_paths; + gnet_property->props[152].data.string.def = (void *) &gnet_property_variable_local_netmasks_string_default; + gnet_property->props[152].data.string.value = (void *) &gnet_property_variable_local_netmasks_string; if (gnet_property->props[152].data.string.def) { -@@ -3631,7 +3631,7 @@ gnet_prop_init(void) { - gnet_property->props[153].vector_size = 1; - - /* Type specific data: */ -- gnet_property->props[153].type = PROP_TYPE_STRING; -+ gnet_property->props[153].type = gg_PROP_TYPE_STRING; - gnet_property->props[153].data.string.def = &local_netmasks_string_def; - gnet_property->props[153].data.string.value = &local_netmasks_string; - if (gnet_property->props[153].data.string.def) { -@@ -4765,7 +4765,7 @@ gnet_prop_init(void) { - gnet_property->props[214].vector_size = 1; - - /* Type specific data: */ -- gnet_property->props[214].type = PROP_TYPE_STRING; -+ gnet_property->props[214].type = gg_PROP_TYPE_STRING; - gnet_property->props[214].data.string.def = &server_hostname_def; - gnet_property->props[214].data.string.value = &server_hostname; - if (gnet_property->props[214].data.string.def) { -@@ -5630,7 +5630,7 @@ gnet_prop_init(void) { - gnet_property->props[259].vector_size = 1; +@@ -4702,7 +4702,7 @@ gnet_prop_init(void) { + gnet_property->props[210].vector_size = 1; /* Type specific data: */ -- gnet_property->props[259].type = PROP_TYPE_STRING; -+ gnet_property->props[259].type = gg_PROP_TYPE_STRING; - gnet_property->props[259].data.string.def = &ancient_version_force_def; - gnet_property->props[259].data.string.value = &ancient_version_force; - if (gnet_property->props[259].data.string.def) { -@@ -6223,7 +6223,7 @@ gnet_prop_shutdown(void) { +- gnet_property->props[210].type = PROP_TYPE_STRING; ++ gnet_property->props[210].type = gg_PROP_TYPE_STRING; + gnet_property->props[210].data.string.def = (void *) &gnet_property_variable_server_hostname_default; + gnet_property->props[210].data.string.value = (void *) &gnet_property_variable_server_hostname; + if (gnet_property->props[210].data.string.def) { +@@ -6327,7 +6327,7 @@ gnet_prop_shutdown(void) { } for (n = 0; n < GNET_PROPERTY_NUM; n ++) { |