AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-12 13:30:19 +00:00
Code Issues Projects Releases Wiki Activity

GtkRecentAction: move public members to private structure

Browse Source
This commit is contained in:
Javier Jardón 2010-07-08 01:48:01 +02:00
parent 133502d798
commit e6bd773fda
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkrecentaction.c
View File

@ -49,10 +49,6 @@
#define FALLBACK_ITEM_LIMIT 10
#define GTK_RECENT_ACTION_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
GTK_TYPE_RECENT_ACTION, \
GtkRecentActionPrivate))
struct _GtkRecentActionPrivate
{
@ -195,7 +191,7 @@ gtk_recent_action_get_items (GtkRecentChooser *chooser)
static GtkRecentManager *
gtk_recent_action_get_recent_manager (GtkRecentChooser *chooser)
{
return GTK_RECENT_ACTION_GET_PRIVATE (chooser)->manager;
return GTK_RECENT_ACTION (chooser)->priv->manager;
}
static void
@ -259,7 +255,8 @@ static void
gtk_recent_action_add_filter (GtkRecentChooser *chooser,
GtkRecentFilter *filter)
{
GtkRecentActionPrivate *priv = GTK_RECENT_ACTION_GET_PRIVATE (chooser);
GtkRecentAction *action = GTK_RECENT_ACTION (chooser);
GtkRecentActionPrivate *priv = action->priv;
if (priv->current_filter != filter)
set_current_filter (GTK_RECENT_ACTION (chooser), filter);
@ -269,7 +266,8 @@ static void
gtk_recent_action_remove_filter (GtkRecentChooser *chooser,
GtkRecentFilter *filter)
{
GtkRecentActionPrivate *priv = GTK_RECENT_ACTION_GET_PRIVATE (chooser);
GtkRecentAction *action = GTK_RECENT_ACTION (chooser);
GtkRecentActionPrivate *priv = action->priv;
if (priv->current_filter == filter)
set_current_filter (GTK_RECENT_ACTION (chooser), NULL);
@ -278,10 +276,12 @@ gtk_recent_action_remove_filter (GtkRecentChooser *chooser,
static GSList *
gtk_recent_action_list_filters (GtkRecentChooser *chooser)
{
GtkRecentAction *action = GTK_RECENT_ACTION (chooser);
GtkRecentActionPrivate *priv = action->priv;
GSList *retval = NULL;
GtkRecentFilter *current_filter;
current_filter = GTK_RECENT_ACTION_GET_PRIVATE (chooser)->current_filter;
current_filter = priv->current_filter;
retval = g_slist_prepend (retval, current_filter);
return retval;
@ -308,11 +308,14 @@ gtk_recent_chooser_iface_init (GtkRecentChooserIface *iface)
static void
gtk_recent_action_activate (GtkAction *action)
{
GtkRecentAction *recent_action = GTK_RECENT_ACTION (action);
GtkRecentActionPrivate *priv = recent_action->priv;
/* we have probably been invoked by a menu tool button or by a
* direct call of gtk_action_activate(); since no item has been
* selected, we must unset the current recent chooser pointer
*/
GTK_RECENT_ACTION_GET_PRIVATE (action)->current_chooser = NULL;
priv->current_chooser = NULL;
}
static void
@ -561,7 +564,8 @@ gtk_recent_action_get_property (GObject *gobject,
GValue *value,
GParamSpec *pspec)
{
GtkRecentActionPrivate *priv = GTK_RECENT_ACTION_GET_PRIVATE (gobject);
GtkRecentAction *action = GTK_RECENT_ACTION (gobject);
GtkRecentActionPrivate *priv = action->priv;
switch (prop_id)
{
@ -640,7 +644,9 @@ gtk_recent_action_init (GtkRecentAction *action)
{
GtkRecentActionPrivate *priv;
action->priv = priv = GTK_RECENT_ACTION_GET_PRIVATE (action);
action->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (action,
GTK_TYPE_RECENT_ACTION,
GtkRecentActionPrivate);
priv->show_numbers = FALSE;
priv->show_icons = TRUE;

2
gtk/gtkrecentaction.h
View File

@ -47,7 +47,7 @@ struct _GtkRecentAction
GtkAction parent_instance;
/*< private >*/
GtkRecentActionPrivate *GSEAL (priv);
GtkRecentActionPrivate *priv;
};
struct _GtkRecentActionClass