diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/ephy-automation.h | 56 | ||||
| -rw-r--r-- | src/ephy-main.c | 1 |
4 files changed, 10 insertions, 58 deletions
@@ -1,5 +1,14 @@ 2006-01-03 Crispin Flowerday <gnome@flowerday.cx> + * configure.ac: + * src/ephy-main.c: + R src/ephy-automation.h: + + Remove various references to bonobo, ephy is now officially + monkey free! + +2006-01-03 Crispin Flowerday <gnome@flowerday.cx> + * src/Makefile.am: Fix some white space issues to keep make and emacs happy diff --git a/configure.ac b/configure.ac index 8ca154a7c..76beebab4 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,7 @@ MOZILLA_WARN_CXXFLAGS="-Wno-ctor-dtor-privacy -Wno-non-virtual-dtor" if test "x$enable_maintainer_mode" = "xyes"; then AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour]) enable_debug=yes - DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED" + DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED" MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth $MOZILLA_WARN_CXXFLAGS" fi diff --git a/src/ephy-automation.h b/src/ephy-automation.h deleted file mode 100644 index 1a290a3e4..000000000 --- a/src/ephy-automation.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2000-2003 Marco Pesenti Gritti - * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - */ - -#ifndef EPHY_AUTOMATION_H -#define EPHY_AUTOMATION_H - -#include "EphyAutomation.h" - -#include <bonobo/bonobo-generic-factory.h> - -G_BEGIN_DECLS - -#define EPHY_TYPE_AUTOMATION (ephy_automation_get_type ()) -#define EPHY_AUTOMATION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_AUTOMATION, EphyAutomation)) -#define EPHY_AUTOMATION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_AUTOMATION, EphyAutomationClass)) -#define EPHY_IS_AUTOMATION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_AUTOMATION)) -#define EPHY_IS_AUTOMATION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_AUTOMATION)) -#define EPHY_AUTOMATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_AUTOMATION, EphyAutomationClass)) - -#define AUTOMATION_FACTORY_IID "OAFIID:GNOME_Epiphany_Automation_Factory" - -typedef struct -{ - BonoboObject parent; -} EphyAutomation; - -typedef struct -{ - BonoboObjectClass parent_class; - - /*< private >*/ - POA_GNOME_EphyAutomation__epv epv; -} EphyAutomationClass; - -GType ephy_automation_get_type (void); - -G_END_DECLS - -#endif /* _EPHY_AUTOMATION_H_ */ diff --git a/src/ephy-main.c b/src/ephy-main.c index e7181b6d0..9dc13ed25 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -35,7 +35,6 @@ #include <gtk/gtkmessagedialog.h> #include <gdk/gdkx.h> #include <libgnome/gnome-program.h> -#include <bonobo/bonobo-main.h> #include <glib/gi18n.h> #include <libgnomevfs/gnome-vfs-init.h> #include <libgnomevfs/gnome-vfs-utils.h> |