Remove bundled gsettings header now that we're using Ubuntu Precise.
BUG=162733 R=thestig@chromium.org Review URL: https://codereview.chromium.org/21687002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@215329 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
60e0d49caa
Коммит
1a1a93bb74
|
@ -1,30 +0,0 @@
|
|||
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef BUILD_LINUX_GSETTINGS_H_
|
||||
#define BUILD_LINUX_GSETTINGS_H_
|
||||
|
||||
#include <gio/gio.h>
|
||||
|
||||
// The GSettings API was not part of GIO until GIO version 2.26,
|
||||
// while Ubuntu 10.04 Lucid ships with version 2.24.
|
||||
//
|
||||
// To allow compiling on Lucid those forward declarations are provided.
|
||||
//
|
||||
// If compiling with GIO version 2.26, these won't conflict,
|
||||
// because they're identical to the types defined.
|
||||
//
|
||||
// TODO(phajdan.jr): This will no longer be needed after switch to Precise,
|
||||
// see http://crbug.com/158577 .
|
||||
struct _GSettings;
|
||||
typedef struct _GSettings GSettings;
|
||||
GSettings* g_settings_new(const gchar* schema);
|
||||
GSettings* g_settings_get_child(GSettings* settings, const gchar* name);
|
||||
gboolean g_settings_get_boolean(GSettings* settings, const gchar* key);
|
||||
gchar* g_settings_get_string(GSettings* settings, const gchar* key);
|
||||
gint g_settings_get_int(GSettings* settings, const gchar* key);
|
||||
gchar** g_settings_get_strv(GSettings* settings, const gchar* key);
|
||||
const gchar* const* g_settings_list_schemas();
|
||||
|
||||
#endif // BUILD_LINUX_GSETTINGS_H_
|
|
@ -379,9 +379,6 @@
|
|||
'--output-h', '<(output_h)',
|
||||
'--output-cc', '<(output_cc)',
|
||||
'--header', '<gio/gio.h>',
|
||||
# TODO(phajdan.jr): This will no longer be needed
|
||||
# after switch to Precise, http://crbug.com/158577 .
|
||||
'--bundled-header', '"build/linux/gsettings.h"',
|
||||
'--link-directly=<(linux_link_gsettings)',
|
||||
'g_settings_new',
|
||||
'g_settings_get_child',
|
||||
|
|
Загрузка…
Ссылка в новой задаче