aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@gnome.org>2009-08-12 13:05:49 +0800
committerXan Lopez <xan@gnome.org>2009-08-12 13:08:44 +0800
commit3f94b8fa88e8034c02bd1c7fa41755d6951d978e (patch)
treec2072bf2a05530641e7dc3ed9c54e035ab649e98
parent409e5e56f91eec5c4dcae54031b5775938570ef1 (diff)
downloadgsoc2013-epiphany-3f94b8fa88e8034c02bd1c7fa41755d6951d978e.tar.gz
gsoc2013-epiphany-3f94b8fa88e8034c02bd1c7fa41755d6951d978e.tar.zst
gsoc2013-epiphany-3f94b8fa88e8034c02bd1c7fa41755d6951d978e.zip
Remove ephy-glib-compat.h, since we depend on a newer glib now
-rw-r--r--embed/ephy-favicon-cache.c1
-rw-r--r--embed/ephy-history.c1
-rw-r--r--lib/Makefile.am1
-rw-r--r--lib/ephy-glib-compat.h38
-rw-r--r--src/bookmarks/ephy-bookmarks.c1
-rw-r--r--src/ephy-dbus.c1
-rw-r--r--src/ephy-extensions-manager.c2
-rw-r--r--src/ephy-session.c1
8 files changed, 0 insertions, 46 deletions
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index f70a7d386..6032827f3 100644
--- a/embed/ephy-favicon-cache.c
+++ b/embed/ephy-favicon-cache.c
@@ -34,7 +34,6 @@
#include "ephy-node-common.h"
#include "ephy-node.h"
#include "ephy-debug.h"
-#include "ephy-glib-compat.h"
#include <glib.h>
#include <glib/gstdio.h>
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index 509afb0af..127420a48 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -28,7 +28,6 @@
#include "ephy-node-common.h"
#include "eel-gconf-extensions.h"
#include "ephy-prefs.h"
-#include "ephy-glib-compat.h"
#include "ephy-string.h"
#include <time.h>
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 30acc5943..3ea7e1c07 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -13,7 +13,6 @@ NOINST_H_FILES = \
ephy-dnd.h \
ephy-file-chooser.h \
ephy-file-helpers.h \
- ephy-glib-compat.h \
ephy-gui.h \
ephy-langs.h \
ephy-module.h \
diff --git a/lib/ephy-glib-compat.h b/lib/ephy-glib-compat.h
deleted file mode 100644
index 9b445f029..000000000
--- a/lib/ephy-glib-compat.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright © 2007 Chris Wilson
- *
- * 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 of the License, 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.
- *
- * $Id: ephy-node-db.h 6588 2006-09-13 11:34:25Z chpe $
- */
-
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
-#ifndef EPHY_GLIB_COMPAT_H
-#define EPHY_GLIB_COMPAT_H
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#if !GLIB_CHECK_VERSION(2,13,0)
-#define g_timeout_add_seconds(I, F, D) g_timeout_add((I)*1000, (F), (D))
-#endif
-
-G_END_DECLS
-
-#endif /* EPHY_GLIB_COMPAT_H */
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 81137c757..3b7147a74 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -37,7 +37,6 @@
#include "ephy-marshal.h"
#include "ephy-signal-accumulator.h"
#include "ephy-stock-icons.h"
-#include "ephy-glib-compat.h"
#include "eel-gconf-extensions.h"
diff --git a/src/ephy-dbus.c b/src/ephy-dbus.c
index 34ccaee6e..a00c81d51 100644
--- a/src/ephy-dbus.c
+++ b/src/ephy-dbus.c
@@ -26,7 +26,6 @@
#include "ephy-debug.h"
#include "ephy-activation.h"
#include "ephy-dbus-server-bindings.h"
-#include "ephy-glib-compat.h"
#include <string.h>
#include <dbus/dbus-glib-bindings.h>
diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c
index fd4d34635..979e6d632 100644
--- a/src/ephy-extensions-manager.c
+++ b/src/ephy-extensions-manager.c
@@ -37,8 +37,6 @@
#include "ephy-object-helpers.h"
#include "ephy-debug.h"
-#include "ephy-glib-compat.h"
-
#include <libxml/tree.h>
#include <libxml/xmlreader.h>
#include <libxml/globals.h>
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 1a71e61b8..a07c9d2ab 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -33,7 +33,6 @@
#include "ephy-extension.h"
#include "ephy-file-helpers.h"
#include "eel-gconf-extensions.h"
-#include "ephy-glib-compat.h"
#include "ephy-gui.h"
#include "ephy-history-window.h"
#include "ephy-notebook.h"