* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <string.h>
#include "gtkmodules.h"
-#include "gtkmodulesprivate.h"
#include "gtksettings.h"
#include "gtkdebug.h"
#include "gtkprivate.h"
{
const gchar *module_path_env;
const gchar *exe_prefix;
- const gchar *home_dir;
- gchar *home_gtk_dir = NULL;
gchar *module_path;
gchar *default_dir;
static gchar **result = NULL;
if (result)
return result;
- home_dir = g_get_home_dir();
- if (home_dir)
- home_gtk_dir = g_build_filename (home_dir, ".gtk-3.0", NULL);
-
module_path_env = g_getenv ("GTK_PATH");
exe_prefix = g_getenv ("GTK_EXE_PREFIX");
else
default_dir = g_build_filename (_gtk_get_libdir (), "gtk-3.0", NULL);
- if (module_path_env && home_gtk_dir)
- module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
- module_path_env, home_gtk_dir, default_dir, NULL);
- else if (module_path_env)
+ if (module_path_env)
module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
module_path_env, default_dir, NULL);
- else if (home_gtk_dir)
- module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
- home_gtk_dir, default_dir, NULL);
else
module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
default_dir, NULL);
- g_free (home_gtk_dir);
g_free (default_dir);
result = pango_split_file_list (module_path);
module_is_blacklisted (const gchar *name,
gboolean verbose)
{
- if (g_str_equal (name, "gail"))
+ if (g_str_equal (name, "gail") ||
+ g_str_equal (name, "atk-bridge"))
{
if (verbose)
- g_message ("Not loading module \"gail\": The functionality is provided by GTK natively. Please try to not load it.");
+ g_message ("Not loading module \"%s\": The functionality is provided by GTK natively. Please try to not load it.", name);
return TRUE;
}