From 8910e9333d40e5f0af68eaf65d33358f684d1f5d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Wed, 29 Mar 2006 21:08:06 +0000
Subject: [PATCH] Fix some symbol aliasing glitches

---
 ChangeLog                     | 5 +++++
 ChangeLog.pre-2-10            | 5 +++++
 gtk/gtkrecentchooser.c        | 2 +-
 gtk/gtkrecentchooserdefault.c | 3 ++-
 gtk/gtkrecentchoosermenu.c    | 7 +++++++
 gtk/gtkrecentchooserutils.c   | 3 ---
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ce7c8d160..42df3f9f00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-29  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtk.symbols:
+	* gtk/gtkrecent*.c: Fix some symbol aliasing glitches.
+
 2006-03-29  Emmanuele Bassi  <ebassi@cvs.gnome.org>
 
 	* gtk/gtkrecentchoosermenu.c: Make gtkalias.h the last included file.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6ce7c8d160..42df3f9f00 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-03-29  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtk.symbols:
+	* gtk/gtkrecent*.c: Fix some symbol aliasing glitches.
+
 2006-03-29  Emmanuele Bassi  <ebassi@cvs.gnome.org>
 
 	* gtk/gtkrecentchoosermenu.c: Make gtkalias.h the last included file.
diff --git a/gtk/gtkrecentchooser.c b/gtk/gtkrecentchooser.c
index 873eee1d46..3fd58e034c 100644
--- a/gtk/gtkrecentchooser.c
+++ b/gtk/gtkrecentchooser.c
@@ -962,5 +962,5 @@ _gtk_recent_chooser_selection_changed (GtkRecentChooser *chooser)
   g_signal_emit (chooser, chooser_signals[SELECTION_CHANGED], 0);
 }
 
-#define __GTK_RECENT_CHOOSER_H__
+#define __GTK_RECENT_CHOOSER_C__
 #include "gtkaliasdef.c"
diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index e830e96cbf..41c8accf32 100644
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -68,7 +68,6 @@
 #include "gtktooltips.h"
 #include "gtktypebuiltins.h"
 #include "gtkvbox.h"
-#include "gtkalias.h"
 
 #include "gtkrecentmanager.h"
 #include "gtkrecentfilter.h"
@@ -77,6 +76,8 @@
 #include "gtkrecentchooserutils.h"
 #include "gtkrecentchooserdefault.h"
 
+#include "gtkalias.h"
+
 
 
 struct _GtkRecentChooserDefault
diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c
index b575f8f718..f1f3f016ad 100644
--- a/gtk/gtkrecentchoosermenu.c
+++ b/gtk/gtkrecentchoosermenu.c
@@ -45,6 +45,13 @@
 #include "gtkobject.h"
 #include "gtktooltips.h"
 #include "gtktypebuiltins.h"
+
+#include "gtkrecentmanager.h"
+#include "gtkrecentfilter.h"
+#include "gtkrecentchooser.h"
+#include "gtkrecentchooserutils.h"
+#include "gtkrecentchooserprivate.h"
+#include "gtkrecentchoosermenu.h"
 #include "gtkalias.h"
 
 struct _GtkRecentChooserMenuPrivate
diff --git a/gtk/gtkrecentchooserutils.c b/gtk/gtkrecentchooserutils.c
index b7fa81d5a0..3f1cdb4c5e 100644
--- a/gtk/gtkrecentchooserutils.c
+++ b/gtk/gtkrecentchooserutils.c
@@ -293,6 +293,3 @@ delegate_item_activated (GtkRecentChooser *receiver,
 {
   _gtk_recent_chooser_item_activated (GTK_RECENT_CHOOSER (user_data));
 }
-
-#define __GTK_RECENT_CHOOSER_UTILS_H__
-#include "gtkaliasdef.c"