From 038c54c61776a94bcd0436eef07b9b0396702981 Mon Sep 17 00:00:00 2001
From: Pablo Barciela <scow@riseup.net>
Date: Mon, 16 Dec 2019 16:30:12 +0100
Subject: avoid redundant redeclarations
---
src/Makefile.am | 1 -
src/obexpush.c | 2 +-
src/user_share.c | 1 -
src/user_share.h | 25 -------------------------
4 files changed, 1 insertion(+), 28 deletions(-)
delete mode 100644 src/user_share.h
(limited to 'src')
diff --git a/src/Makefile.am b/src/Makefile.am
index 9de97f0..5a1bb63 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,7 +37,6 @@ AM_CPPFLAGS= \
mate_user_share_SOURCES = \
user_share.c \
- user_share.h \
user_share-private.h \
user_share-private.c \
http.c \
diff --git a/src/obexpush.c b/src/obexpush.c
index 73e4fd5..e4546b2 100644
--- a/src/obexpush.c
+++ b/src/obexpush.c
@@ -37,7 +37,7 @@
#include "marshal.h"
#include "obexpush.h"
-#include "user_share.h"
+#include "user_share-common.h"
#include "user_share-private.h"
#define DBUS_TYPE_G_STRING_VARIANT_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING))
diff --git a/src/user_share.c b/src/user_share.c
index 45033e4..64423e5 100644
--- a/src/user_share.c
+++ b/src/user_share.c
@@ -30,7 +30,6 @@
#include <gio/gio.h>
#include <X11/Xlib.h>
-#include "user_share.h"
#include "user_share-private.h"
#include "user_share-common.h"
#include "http.h"
diff --git a/src/user_share.h b/src/user_share.h
deleted file mode 100644
index c4631bd..0000000
--- a/src/user_share.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
-
-/*
- * Copyright (C) 2004-2008 Red Hat, Inc.
- *
- * Caja is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * Caja 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Authors: Alexander Larsson <alexl@redhat.com>
- *
- */
-
-char *lookup_public_dir (void);
-char *lookup_download_dir (void);
--
cgit v1.2.1