[nautilus/gnome-2-32: 38/283] Don't use C++ keywords in NautilusMenu (#616657).

[Cosimo Cecchi <cosimoc src gnome org>]

commit 0147044a00bd6221b20af37d32489a9769a7ce10
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Apr 27 12:45:45 2010 +0200

    Don't use C++ keywords in NautilusMenu (#616657).

 libnautilus-extension/nautilus-menu.c |   26 +++++++++++++-------------
 libnautilus-extension/nautilus-menu.h |    6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/libnautilus-extension/nautilus-menu.c b/libnautilus-extension/nautilus-menu.c
index dc2dac7..546b81e 100644
--- a/libnautilus-extension/nautilus-menu.c
+++ b/libnautilus-extension/nautilus-menu.c
@@ -35,22 +35,22 @@ struct _NautilusMenuPrivate {
 };
 
 void
-nautilus_menu_append_item (NautilusMenu *this, NautilusMenuItem *item)
+nautilus_menu_append_item (NautilusMenu *menu, NautilusMenuItem *item)
 {
-	g_return_if_fail (this != NULL);
+	g_return_if_fail (menu != NULL);
 	g_return_if_fail (item != NULL);
 	
-	this->private->item_list = g_list_append (this->private->item_list, g_object_ref (item));
+	menu->priv->item_list = g_list_append (menu->priv->item_list, g_object_ref (item));
 }
 
 GList *
-nautilus_menu_get_items (NautilusMenu *this)
+nautilus_menu_get_items (NautilusMenu *menu)
 {
 	GList *item_list;
 
-	g_return_val_if_fail (this != NULL, NULL);
+	g_return_val_if_fail (menu != NULL, NULL);
 	
-	item_list = g_list_copy (this->private->item_list);
+	item_list = g_list_copy (menu->priv->item_list);
 	g_list_foreach (item_list, (GFunc)g_object_ref, NULL);
 	
 	return item_list;
@@ -70,21 +70,21 @@ nautilus_menu_item_list_free (GList *item_list)
 static void
 nautilus_menu_finalize (GObject *object)
 {
-	NautilusMenu *this = NAUTILUS_MENU (object);
+	NautilusMenu *menu = NAUTILUS_MENU (object);
 
-	if (this->private->item_list) {
-		g_list_free (this->private->item_list);
+	if (menu->priv->item_list) {
+		g_list_free (menu->priv->item_list);
 	}
 
 	G_OBJECT_CLASS (nautilus_menu_parent_class)->finalize (object);
 }
 
 static void
-nautilus_menu_init (NautilusMenu *this)
+nautilus_menu_init (NautilusMenu *menu)
 {
-	this->private = NAUTILUS_MENU_GET_PRIVATE (this);
-	
-	this->private->item_list = NULL;
+	menu->priv = NAUTILUS_MENU_GET_PRIVATE (menu);
+
+	menu->priv->item_list = NULL;
 }
 
 static void
diff --git a/libnautilus-extension/nautilus-menu.h b/libnautilus-extension/nautilus-menu.h
index d1511bd..a5a80e7 100644
--- a/libnautilus-extension/nautilus-menu.h
+++ b/libnautilus-extension/nautilus-menu.h
@@ -61,7 +61,7 @@ typedef struct _NautilusMenuItemClass   NautilusMenuItemClass;
 /* NautilusMenu structs */
 struct _NautilusMenu {
 	GObject parent;
-	NautilusMenuPrivate *private;
+	NautilusMenuPrivate *priv;
 };
 
 struct _NautilusMenuClass {
@@ -86,9 +86,9 @@ struct _NautilusMenuItemClass {
 GType		nautilus_menu_get_type	(void);
 NautilusMenu *	nautilus_menu_new	(void);
 
-void	nautilus_menu_append_item	(NautilusMenu      *this,
+void	nautilus_menu_append_item	(NautilusMenu      *menu,
 					 NautilusMenuItem  *item);
-GList*	nautilus_menu_get_items		(NautilusMenu *this);
+GList*	nautilus_menu_get_items		(NautilusMenu *menu);
 void	nautilus_menu_item_list_free	(GList *item_list);
 
 /* NautilusMenuItem methods */