diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2010-04-27 12:45:45 +0200 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2010-04-27 12:45:45 +0200 |
| commit | 4b680e163e41a26c8ace47d43efdc72be9ede93a (patch) | |
| tree | f55dd8a35a7eafe310221726c33390b1ece91f4b /libnautilus-extension | |
| parent | eee505e416678ce7f51999b6a4acd385a0ae99c7 (diff) | |
| download | nautilus-4b680e163e41a26c8ace47d43efdc72be9ede93a.tar.gz | |
Don't use C++ keywords in NautilusMenu (#616657).
Diffstat (limited to 'libnautilus-extension')
| -rw-r--r-- | libnautilus-extension/nautilus-menu.c | 26 | ||||
| -rw-r--r-- | 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 dc2dac71f..546b81e31 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 d1511bd1d..a5a80e751 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 */ |