comparison pidgin/gtkprefs.c @ 18226:5cfa2e63d2fd

merge of '5c5738f443887f7024ff8eab573392f8795b9413' and 'd2f50519c5ed668dd980277afdc25d71ccb8a852'

18225:4b5fed5cb038

					   purple_proxy_info_get_password(proxy_info));
		pidgin_set_accessible_label (entry, label);
	}

	gtk_widget_show_all(ret);
	if (proxy_info == NULL ||
	    purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_NONE ||
	    purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_USE_ENVVAR)
		gtk_widget_hide(table);
	return ret;
}

#ifndef _WIN32

18226:5cfa2e63d2fd

					   purple_proxy_info_get_password(proxy_info));
		pidgin_set_accessible_label (entry, label);
	}

	gtk_widget_show_all(ret);
	/* Only hide table if not running gnome otherwise we hide the IP address table! */
	if (!purple_running_gnome() && (proxy_info == NULL ||
	    purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_NONE ||
	    purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_USE_ENVVAR))
		gtk_widget_hide(table);
	return ret;
}

#ifndef _WIN32