eel: remove unused eel-gtk-macros.h file

26 files changed, 0 insertions, 216 deletions

diff --git a/eel/Makefile.am b/eel/Makefile.am
index 0ff0b6af8..a110d4b89 100644
--- a/eel/Makefile.am
+++ b/eel/Makefile.am
@@ -36,7 +36,6 @@ eel_headers =					\
 	eel-gnome-extensions.h			\
 	eel-graphic-effects.h			\
 	eel-gtk-extensions.h			\
-	eel-gtk-macros.h			\
 	eel-self-checks.h			\
 	eel-stock-dialogs.h			\
 	eel-string.h				\
diff --git a/eel/eel-gtk-macros.h b/eel/eel-gtk-macros.h
deleted file mode 100644
index b3a9d671e..000000000
--- a/eel/eel-gtk-macros.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   eel-gtk-macros.h: Macros to reduce boilerplate when using GTK.
- 
-   Copyright (C) 1999, 2000, 2001 Eazel, Inc.
-  
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library 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
-   Library General Public License for more details.
-  
-   You should have received a copy of the GNU Library 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.
-  
-   Authors: Darin Adler <darin@bentspoon.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef EEL_GTK_MACROS_H
-#define EEL_GTK_MACROS_H
-
-#ifndef EEL_DISABLE_DEPRECATED
-
-/* Define a parent_class global and a get_type function for a GTK class.
-   Since this is boilerplate, it's better not to repeat it over and over again.
-   Called like this:
-
-       EEL_CLASS_BOILERPLATE (EelBookmark, eel_bookmark, GTK_TYPE_OBJECT)
-
-   The parent_class_type parameter is guaranteed to be evaluated only once
-   so it can be an expression, even an expression that contains a function call.
-*/
-
-#define EEL_CLASS_BOILERPLATE(class_name, prefix, parent_class_type)          \
-	EEL_BOILERPLATE (class_name, class_name, prefix, parent_class_type,   \
-                         EEL_REGISTER_TYPE)
-#define EEL_REGISTER_TYPE(class_name, corba_name)                             \
-	g_type_register_static (parent_type, #class_name, &info, 0)
-
-#define EEL_BOILERPLATE(class_name, corba_name, prefix, parent_class_type,    \
-                        register_type)                                        \
-                                                                              \
-static gpointer parent_class;                                                 \
-                                                                              \
-GType                                                                         \
-prefix##_get_type (void)                                                      \
-{                                                                             \
-	GType parent_type;                                                    \
-	static GType type;                                                    \
-                                                                              \
-	if (type == 0) {                                                      \
-		static GTypeInfo info = {                                     \
-			sizeof (class_name##Class),                           \
-                        NULL, NULL,                                           \
-			(GClassInitFunc) prefix##_class_init,                 \
-                        NULL, NULL,                                           \
-			sizeof (class_name), 0,                               \
-			(GInstanceInitFunc) prefix##_init,                    \
-			NULL                                                  \
-		};                                                            \
-                                                                              \
-		parent_type = (parent_class_type);                            \
-		type = register_type (class_name, corba_name);                \
-		parent_class = g_type_class_ref (parent_type);                \
-	}                                                                     \
-                                                                              \
-	return type;                                                          \
-}
-
-/* Call a parent class version of a virtual function (or default
- * signal handler since that's the same thing). Nice because it
- * documents what it's doing and there is less chance for a
- * typo. Depends on the parent class pointer having the conventional
- * name "parent_class" as the boilerplate macro above does it.
- */
-#define EEL_CALL_PARENT(parent_class_cast_macro, signal, parameters)          \
-                                                                              \
-G_STMT_START {                                                                \
-	if (parent_class_cast_macro (parent_class)->signal != NULL) {         \
-		(* parent_class_cast_macro (parent_class)->signal) parameters;\
-        }                                                                     \
-} G_STMT_END
-
-/* Same thing, for functions with a return value. */
-#define EEL_CALL_PARENT_WITH_RETURN_VALUE(parent_class_cast_macro, signal,    \
-                                          parameters)                         \
-                                                                              \
-(parent_class_cast_macro (parent_class)->signal == NULL)                      \
-	? 0                                                                   \
-	: ((* parent_class_cast_macro (parent_class)->signal) parameters)
-
-#endif /* EEL_DISABLE_DEPRECATED */
-
-/* Call a virtual function. Useful when the virtual function is not a
- * signal, otherwise you want to gtk_signal emit. Nice because it
- * documents what it's doing and there is less chance for a typo.
- */
-#define EEL_CALL_METHOD(class_cast_macro, object, signal, parameters)         \
-                                                                              \
-G_STMT_START {                                                                \
-	if (class_cast_macro (G_OBJECT_GET_CLASS (object))->signal != NULL) { \
-		(* class_cast_macro (G_OBJECT_GET_CLASS (object))->signal)    \
-                parameters;                                                   \
-	}                                                                     \
-} G_STMT_END
-
-/* Same thing, for functions with a return value. */
-#define EEL_CALL_METHOD_WITH_RETURN_VALUE(class_cast_macro, object, signal,   \
-                                          parameters)                         \
-                                                                              \
-(class_cast_macro (G_OBJECT_GET_CLASS (object))->signal == NULL)              \
-	? 0                                                                   \
-	: ((* class_cast_macro (G_OBJECT_GET_CLASS (object))->signal)         \
-           parameters)                                                        \
-
-#ifndef G_DISABLE_ASSERT
-
-/* Define a signal that is not implemented by this class but must be 
- * implemented by subclasses. This macro should be used inside the
- * class initialization function. The companion macro EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL
- * must be used earlier in the file. Called like this:
- * 
- * EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass,
- *					 fm_directory_view,
- *					 clear); 
- */
-#define EEL_ASSIGN_MUST_OVERRIDE_SIGNAL(class_pointer, prefix, signal)        \
-                                                                              \
-* (void (**)(void)) & (class_pointer)->signal = prefix##_unimplemented_##signal
-
-/* Provide a debug-only implementation of a signal that must be implemented
- * by subclasses. The debug-only implementation fires a warning if it is called.
- * This macro should be placed as if it were a function, earlier in the file
- * than the class initialization function. Called like this:
- * 
- * EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, clear);
- */
-#define EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL(prefix, signal)                    \
-                                                                              \
-static void                                                                   \
-prefix##_unimplemented_##signal (void)                                        \
-{                                                                             \
-	g_warning ("failed to override signal " #prefix "->" #signal);        \
-}
-
-#else /* G_DISABLE_ASSERT */
-
-#define EEL_DEFINE_MUST_OVERRIDE_SIGNAL(class_cast_macro, class_pointer, prefix, signal)
-#define EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL(prefix, signal)
-#define EEL_ASSIGN_MUST_OVERRIDE_SIGNAL(class_pointer, prefix, signal)
-
-#endif /* G_DISABLE_ASSERT */
-
-/* Access a method. */
-#define EEL_ACCESS_METHOD(class_cast_macro, object, method)                   \
-(class_cast_macro (G_OBJECT_GET_CLASS (object))->method)
-
-/* Invoke a method for a given object. */
-#define EEL_INVOKE_METHOD(class_cast_macro, object, method, parameters)       \
-((* EEL_ACCESS_METHOD (class_cast_macro, object, method)) parameters)
-
-/* Assert the non-nullness of a method for a given object. */
-#define EEL_ASSERT_METHOD(class_cast_macro, object, method)                   \
-g_assert (EEL_ACCESS_METHOD (class_cast_macro, object, method) != NULL)
-
-/* Invoke a method if it ain't null. */
-#define EEL_INVOKE_METHOD_IF(class_cast_macro, object, method, parameters)    \
-(EEL_ACCESS_METHOD (class_cast_macro, object, method) ? 0 :                   \
-	EEL_INVOKE_METHOD (class_cast_macro, object, method, parameters))
-
-#endif /* EEL_GTK_MACROS_H */
diff --git a/eel/eel.h b/eel/eel.h
index b283993b9..294ff93fa 100644
--- a/eel/eel.h
+++ b/eel/eel.h
@@ -31,7 +31,6 @@
 #include <eel/eel-gnome-extensions.h>
 #include <eel/eel-graphic-effects.h>
 #include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <eel/eel-self-checks.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c
index 744dfb829..914bea8b4 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@@ -28,9 +28,6 @@
 
 #include "nautilus-bookmark.h"
 
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
 #include <gio/gio.h>
 #include <glib/gi18n.h>
diff --git a/libnautilus-private/nautilus-clipboard-monitor.c b/libnautilus-private/nautilus-clipboard-monitor.c
index 694c01cb3..6947a3fb2 100644
--- a/libnautilus-private/nautilus-clipboard-monitor.c
+++ b/libnautilus-private/nautilus-clipboard-monitor.c
@@ -27,8 +27,6 @@
 #include "nautilus-file.h"
 
 #include <eel/eel-debug.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
 #include <gtk/gtk.h>
 
 /* X11 has a weakness when it comes to clipboard handling,
diff --git a/libnautilus-private/nautilus-desktop-directory.c b/libnautilus-private/nautilus-desktop-directory.c
index b2fd7c5f1..623f645d3 100644
--- a/libnautilus-private/nautilus-desktop-directory.c
+++ b/libnautilus-private/nautilus-desktop-directory.c
@@ -32,8 +32,6 @@
 #include "nautilus-file-private.h"
 #include "nautilus-file-utilities.h"
 #include "nautilus-global-preferences.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <gtk/gtk.h>
 
 struct NautilusDesktopDirectoryDetails {
diff --git a/libnautilus-private/nautilus-desktop-link-monitor.c b/libnautilus-private/nautilus-desktop-link-monitor.c
index 4798cbbfe..1e0ade7a1 100644
--- a/libnautilus-private/nautilus-desktop-link-monitor.c
+++ b/libnautilus-private/nautilus-desktop-link-monitor.c
@@ -31,8 +31,6 @@
 #include "nautilus-global-preferences.h"
 
 #include <eel/eel-debug.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 #include <gtk/gtk.h>
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 093480985..3f50e44f2 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -36,7 +36,6 @@
 #include "nautilus-desktop-directory.h"
 #include "nautilus-vfs-directory.h"
 #include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <eel/eel-string.h>
 #include <gtk/gtk.h>
 
diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c
index 489967190..9c65bb157 100644
--- a/libnautilus-private/nautilus-entry.c
+++ b/libnautilus-private/nautilus-entry.c
@@ -30,8 +30,6 @@
 #include <string.h>
 #include "nautilus-global-preferences.h"
 #include "nautilus-undo-signal-handlers.h"
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 3965852ba..3dcc92672 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -49,7 +49,6 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-vfs-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <eel/eel-string.h>
 #include <grp.h>
 #include <gtk/gtk.h>
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index a68164af2..87373b425 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -35,7 +35,6 @@
 #include <eel/eel-gdk-extensions.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-graphic-effects.h>
-#include <eel/eel-gtk-macros.h>
 #include <eel/eel-string.h>
 #include <eel/eel-accessibility.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index cacbc524d..c1146a9fc 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -44,7 +44,6 @@
 #include <eel/eel-gnome-extensions.h>
 #include <eel/eel-graphic-effects.h>
 #include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
diff --git a/libnautilus-private/nautilus-merged-directory.c b/libnautilus-private/nautilus-merged-directory.c
index 56f79fd92..9b1d60785 100644
--- a/libnautilus-private/nautilus-merged-directory.c
+++ b/libnautilus-private/nautilus-merged-directory.c
@@ -30,7 +30,6 @@
 #include "nautilus-directory-notify.h"
 #include "nautilus-file.h"
 #include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <gtk/gtk.h>
 
 struct NautilusMergedDirectoryDetails {
diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c
index 1e5ed0a9e..4c68cf3ad 100644
--- a/libnautilus-private/nautilus-module.c
+++ b/libnautilus-private/nautilus-module.c
@@ -25,7 +25,6 @@
 #include <config.h>
 #include "nautilus-module.h"
 
-#include <eel/eel-gtk-macros.h>
 #include <eel/eel-debug.h>
 #include <gmodule.h>
 
diff --git a/libnautilus-private/nautilus-query.c b/libnautilus-private/nautilus-query.c
index 9b6695d6d..e96ba649b 100644
--- a/libnautilus-private/nautilus-query.c
+++ b/libnautilus-private/nautilus-query.c
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include "nautilus-query.h"
-#include <eel/eel-gtk-macros.h>
 #include <eel/eel-glib-extensions.h>
 #include <glib/gi18n.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
diff --git a/libnautilus-private/nautilus-search-engine-simple.c b/libnautilus-private/nautilus-search-engine-simple.c
index f258f986a..30696a2b3 100644
--- a/libnautilus-private/nautilus-search-engine-simple.c
+++ b/libnautilus-private/nautilus-search-engine-simple.c
@@ -26,7 +26,6 @@
 
 #include <string.h>
 #include <glib.h>
-#include <eel/eel-gtk-macros.h>
 #include <gio/gio.h>
 
 #define BATCH_SIZE 500
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.c b/libnautilus-private/nautilus-tree-view-drag-dest.c
index e32e65a36..117c02782 100644
--- a/libnautilus-private/nautilus-tree-view-drag-dest.c
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.c
@@ -37,7 +37,6 @@
 #include "nautilus-icon-dnd.h"
 #include "nautilus-link.h"
 
-#include <eel/eel-gtk-macros.h>
 #include <gtk/gtk.h>
 
 #include <stdio.h>
diff --git a/libnautilus-private/nautilus-undo-manager.c b/libnautilus-private/nautilus-undo-manager.c
index 04b6d519d..5dbde404e 100644
--- a/libnautilus-private/nautilus-undo-manager.c
+++ b/libnautilus-private/nautilus-undo-manager.c
@@ -26,8 +26,6 @@
 #include <libnautilus-private/nautilus-undo-manager.h>
 #include <libnautilus-private/nautilus-undo-transaction.h>
 
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-gtk-extensions.h>
 #include <gtk/gtk.h>
 #include "nautilus-undo-private.h"
 
diff --git a/libnautilus-private/nautilus-undo-signal-handlers.c b/libnautilus-private/nautilus-undo-signal-handlers.c
index 7eab1e497..ac51b485d 100644
--- a/libnautilus-private/nautilus-undo-signal-handlers.c
+++ b/libnautilus-private/nautilus-undo-signal-handlers.c
@@ -29,7 +29,6 @@
 #include <glib/gi18n.h>
 #include <libnautilus-private/nautilus-undo.h>
 
-#include <eel/eel-gtk-macros.h>
 #include <string.h>
 
 #include "nautilus-undo-signal-handlers.h"
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index b72d980c6..089687315 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -71,7 +71,6 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
 #include <libnotify/notify.h>
 #include <gdk/gdkx.h>
diff --git a/src/nautilus-icon-view.c b/src/nautilus-icon-view.c
index b87344f3f..0eaf243ab 100644
--- a/src/nautilus-icon-view.c
+++ b/src/nautilus-icon-view.c
@@ -34,11 +34,6 @@
 #include "nautilus-view-factory.h"
 
 #include <stdlib.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 7b6a487be..969197cc1 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -37,7 +37,6 @@
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-gdk-extensions.h>
 #include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c
index 2a0008f5a..3cf337cf6 100644
--- a/src/nautilus-location-bar.c
+++ b/src/nautilus-location-bar.c
@@ -39,7 +39,6 @@
 #include "nautilus-window.h"
 #include <eel/eel-accessibility.h>
 #include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 9d5bd09ec..e123bd42c 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -50,7 +50,6 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gnome-extensions.h>
 #include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index d54964766..1aab5733f 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -41,10 +41,7 @@
 #include "nautilus-x-content-bar.h"
 #include <eel/eel-accessibility.h>
 #include <eel/eel-debug.h>
-#include <eel/eel-gdk-extensions.h>
 #include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 #include <gtk/gtk.h>
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 5ba27b88f..4feb9731e 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -32,7 +32,6 @@
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 
-#include <eel/eel-gtk-macros.h>
 #include <eel/eel-string.h>
 
 G_DEFINE_TYPE (NautilusWindowSlot, nautilus_window_slot, G_TYPE_OBJECT);