AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Rename gtkiconcachevalidator.h

Browse Source 
Follow the same convention for private headers as newer parts of GTK.
This commit is contained in:
Emmanuele Bassi 2018-02-01 16:01:38 +01:00
parent e090c1f1a9
commit fe142b10bf
5 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkiconcache.c
View File

@ -19,7 +19,7 @@
#include "gtkdebug.h"
#include "gtkiconcacheprivate.h"
#include "gtkiconcachevalidator.h"
#include "gtkiconcachevalidatorprivate.h"
#include <glib/gstdio.h>
#include <gdk-pixbuf/gdk-pixdata.h>

6
gtk/gtkiconcachevalidator.c
View File

@ -15,7 +15,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "gtkiconcachevalidator.h"
#include "gtkiconcachevalidatorprivate.h"
#include <glib.h>
#include <gdk-pixbuf/gdk-pixdata.h>
@ -369,7 +369,7 @@ check_hash (CacheInfo *info,
}
/**
* _gtk_icon_cache_validate:
* gtk_icon_cache_validate:
* @info: a CacheInfo structure
*
* Validates the icon cache passed in the @cache and
@ -383,7 +383,7 @@ check_hash (CacheInfo *info,
* Returns: %TRUE if the cache is valid
*/
gboolean
_gtk_icon_cache_validate (CacheInfo *info)
gtk_icon_cache_validate (CacheInfo *info)
{
guint32 hash_offset;
guint32 directory_list_offset;

9
gtk/gtkiconcachevalidator.h → gtk/gtkiconcachevalidatorprivate.h
View File

@ -14,9 +14,8 @@
* You should have received a copy of the GNU Library General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GTK_ICON_CACHE_VALIDATOR_H__
#define __GTK_ICON_CACHE_VALIDATOR_H__
#ifndef __GTK_ICON_CACHE_VALIDATOR_PRIVATE_H__
#define __GTK_ICON_CACHE_VALIDATOR_PRIVATE_H__
#include <glib.h>
@ -35,8 +34,8 @@ typedef struct {
gint flags;
} CacheInfo;
gboolean _gtk_icon_cache_validate (CacheInfo *info);
gboolean gtk_icon_cache_validate (CacheInfo *info);
G_END_DECLS
#endif /* __GTK_ICON_CACHE_VALIDATOR_H__ */
#endif /* __GTK_ICON_CACHE_VALIDATOR_PRIVATE_H__ */

2
gtk/meson.build
View File

@ -1038,7 +1038,7 @@ libgtk_dep = declare_dependency(sources: gtk_dep_sources,
gtk_tools = [
['gtk4-query-settings', ['gtk-query-settings.c']],
['gtk4-builder-tool', ['gtk-builder-tool.c']],
['gtk4-update-icon-cache', ['updateiconcache.c']],
['gtk4-update-icon-cache', ['updateiconcache.c', 'gtkiconcachevalidator.c']],
['gtk4-encode-symbolic-svg', ['encodesymbolic.c', 'gdkpixbufutils.c']],
['gtk4-query-immodules', ['queryimmodules.c', 'gtkutils.c']],
]

9
gtk/updateiconcache.c
View File

@ -39,7 +39,7 @@
#include <glib/gstdio.h>
#include <gdk-pixbuf/gdk-pixdata.h>
#include <glib/gi18n.h>
#include "gtkiconcachevalidator.h"
#include "gtkiconcachevalidatorprivate.h"
static gboolean force_update = FALSE;
static gboolean ignore_theme_index = FALSE;
@ -48,11 +48,6 @@ static gboolean index_only = TRUE;
static gboolean validate = FALSE;
static gchar *var_name = (gchar *) "-";
/* Quite ugly - if we just add the c file to the
* list of sources in Makefile.am, libtool complains.
*/
#include "gtkiconcachevalidator.c"
#define CACHE_NAME "icon-theme.cache"
#define HAS_SUFFIX_XPM (1 << 0)
@ -1427,7 +1422,7 @@ validate_file (const gchar *file)
info.n_directories = 0;
info.flags = CHECK_OFFSETS|CHECK_STRINGS|CHECK_PIXBUFS;
if (!_gtk_icon_cache_validate (&info))
if (!gtk_icon_cache_validate (&info))
{
g_mapped_file_unref (map);
return FALSE;