From d067b5390a343cc04feaf60fc8b16f375308d228 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Thu, 11 Jun 2020 17:31:39 +0200
Subject: [PATCH] glocalfile: Remove redundant private header

There are glocalfile.h and glocalfileprivate.h header files currently.
None of those header files is public, so it doesn't make sense to have
two private headers for glocalfile.c. Let's remove glocalfileprivate.h.
---
 gio/glocalfile.c        |  1 -
 gio/glocalfile.h        |  2 ++
 gio/glocalfileprivate.h | 30 ------------------------------
 gio/gunixmounts.c       |  2 +-
 4 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 gio/glocalfileprivate.h

diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 9caa35b1c..1effea5fa 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -51,7 +51,6 @@
 
 #include "gfileattribute.h"
 #include "glocalfile.h"
-#include "glocalfileprivate.h"
 #include "glocalfileinfo.h"
 #include "glocalfileenumerator.h"
 #include "glocalfileinputstream.h"
diff --git a/gio/glocalfile.h b/gio/glocalfile.h
index 960cfef1f..f3ec4f294 100644
--- a/gio/glocalfile.h
+++ b/gio/glocalfile.h
@@ -51,6 +51,8 @@ gboolean g_local_file_is_remote (const gchar *filename);
 GFile * g_local_file_new_from_dirname_and_basename (const char *dirname,
                                                     const char *basename);
 
+gchar *_g_local_file_find_topdir_for (const char *file_path);
+
 G_END_DECLS
 
 #endif /* __G_LOCAL_FILE_H__ */
diff --git a/gio/glocalfileprivate.h b/gio/glocalfileprivate.h
deleted file mode 100644
index 6b77305e7..000000000
--- a/gio/glocalfileprivate.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2016 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ondrej Holy <oholy@redhat.com>
- */
-
-#ifndef __G_LOCAL_FILE_PRIVATE_H__
-#define __G_LOCAL_FILE_PRIVATE_H__
-
-G_BEGIN_DECLS
-
-gchar *_g_local_file_find_topdir_for (const char *file_path);
-
-G_END_DECLS
-
-#endif /* __G_LOCAL_FILE_PRIVATE_H__ */
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 86aa22d66..0d3fa68b0 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -64,10 +64,10 @@
 #endif
 
 #include "gunixmounts.h"
-#include "glocalfileprivate.h"
 #include "gfile.h"
 #include "gfilemonitor.h"
 #include "glibintl.h"
+#include "glocalfile.h"
 #include "gthemedicon.h"
 #include "gcontextspecificgroup.h"