summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gtk/gtksignal.h11
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9957e34da8..6a1a5a9ba1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-27 Michael Natterer <mitch@imendio.com>
+
+ * gtk/gtksignal.h: move deprecated guards around everything,
+ including includes and include guards (just as in all other
+ deprecated files).
+
2008-05-27 Tor Lillqvist <tml@novell.com>
* gtk/updateiconcache.c (build_cache): Use simpler mode for open()
diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h
index 56bbe0b4b1..8f33207e66 100644
--- a/gtk/gtksignal.h
+++ b/gtk/gtksignal.h
@@ -21,20 +21,19 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef GTK_DISABLE_DEPRECATED
+
#ifndef __GTK_SIGNAL_H__
#define __GTK_SIGNAL_H__
-
#include <gtk/gtkenums.h>
#include <gtk/gtkobject.h>
#include <gtk/gtkmarshal.h>
G_BEGIN_DECLS
-
-#ifndef GTK_DISABLE_DEPRECATED
#define gtk_signal_default_marshaller g_cclosure_marshal_VOID__VOID
@@ -144,8 +143,8 @@ void gtk_signal_compat_matched (GtkObject *object,
GSignalMatchType match,
guint action);
-#endif /* GTK_DISABLE_DEPRECATED */
-
G_END_DECLS
#endif /* __GTK_SIGNAL_H__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */