From 9701366af8864044864c1f3016945bbeed51876c Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Wed, 27 Mar 2013 17:53:07 +0100 Subject: Remove ephy-request-about It's not used in WebKit2. https://bugzilla.gnome.org/show_bug.cgi?id=696728 --- embed/Makefile.am | 4 +- embed/ephy-embed-shell.c | 1 - embed/ephy-request-about.c | 91 ---------------------------------------------- embed/ephy-request-about.h | 34 ----------------- 4 files changed, 1 insertion(+), 129 deletions(-) delete mode 100644 embed/ephy-request-about.c delete mode 100644 embed/ephy-request-about.h diff --git a/embed/Makefile.am b/embed/Makefile.am index 1de594330..ba0fb444a 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -10,8 +10,7 @@ NOINST_H_FILES = \ ephy-embed-private.h \ ephy-encoding.h \ ephy-encodings.h \ - ephy-file-monitor.h \ - ephy-request-about.h + ephy-file-monitor.h INST_H_FILES = \ ephy-download.h \ @@ -42,7 +41,6 @@ libephyembed_la_SOURCES = \ ephy-encodings.c \ ephy-file-monitor.c \ ephy-overview.c \ - ephy-request-about.c \ ephy-embed-prefs.c \ ephy-web-view.c \ $(INST_H_FILES) \ diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index 9572e5720..85cce56c6 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -32,7 +32,6 @@ #include "ephy-file-helpers.h" #include "ephy-history-service.h" #include "ephy-profile-utils.h" -#include "ephy-request-about.h" #include "ephy-settings.h" #include "ephy-snapshot-service.h" #include "ephy-web-extension.h" diff --git a/embed/ephy-request-about.c b/embed/ephy-request-about.c deleted file mode 100644 index 9a0bcafd5..000000000 --- a/embed/ephy-request-about.c +++ /dev/null @@ -1,91 +0,0 @@ -/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* - * Copyright © 2011 Igalia S.L. - * - * This program 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, or (at your option) - * any later version. - * - * This program 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif -#include "ephy-request-about.h" - -#include "ephy-about-handler.h" - -#include -#include -#include - -G_DEFINE_TYPE (EphyRequestAbout, ephy_request_about, SOUP_TYPE_REQUEST) - -struct _EphyRequestAboutPrivate { - gssize content_length; -}; - -static void -ephy_request_about_init (EphyRequestAbout *about) -{ - about->priv = G_TYPE_INSTANCE_GET_PRIVATE (about, EPHY_TYPE_REQUEST_ABOUT, EphyRequestAboutPrivate); -} - -static gboolean -ephy_request_about_check_uri (SoupRequest *request, - SoupURI *uri, - GError **error) -{ - return uri->host == NULL; -} - -static GInputStream * -ephy_request_about_send (SoupRequest *request, - GCancellable *cancellable, - GError **error) -{ - EphyRequestAbout *about = EPHY_REQUEST_ABOUT (request); - SoupURI *uri = soup_request_get_uri (request); - GString *data_str = ephy_about_handler_handle (uri->path); - - about->priv->content_length = data_str->len; - return g_memory_input_stream_new_from_data (g_string_free (data_str, FALSE), about->priv->content_length, g_free); -} - -static goffset -ephy_request_about_get_content_length (SoupRequest *request) -{ - return EPHY_REQUEST_ABOUT (request)->priv->content_length; -} - -static const char * -ephy_request_about_get_content_type (SoupRequest *request) -{ - return "text/html"; -} - -static const char *about_schemes[] = { EPHY_ABOUT_SCHEME, NULL }; - -static void -ephy_request_about_class_init (EphyRequestAboutClass *request_about_class) -{ - SoupRequestClass *request_class = SOUP_REQUEST_CLASS (request_about_class); - - request_class->schemes = about_schemes; - request_class->check_uri = ephy_request_about_check_uri; - request_class->send = ephy_request_about_send; - request_class->get_content_length = ephy_request_about_get_content_length; - request_class->get_content_type = ephy_request_about_get_content_type; - - g_type_class_add_private (request_about_class, sizeof (EphyRequestAboutPrivate)); -} diff --git a/embed/ephy-request-about.h b/embed/ephy-request-about.h deleted file mode 100644 index f8e3e2343..000000000 --- a/embed/ephy-request-about.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* - * Copyright (C) 2011, Igalia S.L. - */ - -#ifndef EPHY_REQUEST_ABOUT_H -#define EPHY_REQUEST_ABOUT_H 1 - -#define LIBSOUP_USE_UNSTABLE_REQUEST_API -#include - -#define EPHY_TYPE_REQUEST_ABOUT (ephy_request_about_get_type ()) -#define EPHY_REQUEST_ABOUT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), EPHY_TYPE_REQUEST_ABOUT, EphyRequestAbout)) -#define EPHY_REQUEST_ABOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_REQUEST_ABOUT, EphyRequestAboutClass)) -#define EPHY_IS_REQUEST_ABOUT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), EPHY_TYPE_REQUEST_ABOUT)) -#define EPHY_IS_REQUEST_ABOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EPHY_TYPE_REQUEST_ABOUT)) -#define EPHY_REQUEST_ABOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EPHY_TYPE_REQUEST_ABOUT, EphyRequestAboutClass)) - -typedef struct _EphyRequestAboutPrivate EphyRequestAboutPrivate; - -typedef struct { - SoupRequest parent; - - EphyRequestAboutPrivate *priv; -} EphyRequestAbout; - -typedef struct { - SoupRequestClass parent; - -} EphyRequestAboutClass; - -GType ephy_request_about_get_type (void); - -#endif /* EPHY_REQUEST_ABOUT_H */ -- cgit v1.2.3