diff options
| -rw-r--r-- | src/common/server.c | 6 | ||||
| -rw-r--r-- | src/fe-gtk/custom-list.c | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/common/server.c b/src/common/server.c index f42ec20c..3e9e256f 100644 --- a/src/common/server.c +++ b/src/common/server.c @@ -1517,10 +1517,8 @@ server_child (server * serv) if (!serv->dont_use_proxy) /* blocked in serverlist? */ { - if (FALSE) - ; #ifdef USE_LIBPROXY - else if (prefs.hex_net_proxy_type == 5) + if (prefs.hex_net_proxy_type == 5) { char **proxy_list; char *url, *proxy; @@ -1554,7 +1552,7 @@ server_child (server * serv) g_free (url); } #endif - else if (prefs.hex_net_proxy_host[0] && + if (prefs.hex_net_proxy_host[0] && prefs.hex_net_proxy_type > 0 && prefs.hex_net_proxy_use != 2) /* proxy is NOT dcc-only */ { diff --git a/src/fe-gtk/custom-list.c b/src/fe-gtk/custom-list.c index f67c3c07..485a9905 100644 --- a/src/fe-gtk/custom-list.c +++ b/src/fe-gtk/custom-list.c @@ -134,7 +134,6 @@ custom_list_get_type (void) return custom_list_type; /* Some boilerplate type registration stuff */ - if (1) { static const GTypeInfo custom_list_info = { sizeof (CustomListClass), @@ -154,7 +153,6 @@ custom_list_get_type (void) } /* Here we register our GtkTreeModel interface with the type system */ - if (1) { static const GInterfaceInfo tree_model_info = { (GInterfaceInitFunc) custom_list_tree_model_init, @@ -167,7 +165,6 @@ custom_list_get_type (void) } /* Add GtkTreeSortable interface */ - if (1) { static const GInterfaceInfo tree_sortable_info = { (GInterfaceInitFunc) custom_list_sortable_init, |