qulogic/libgnt

Fix more brokenness with GNT_DISABLE_DEPRECATED.
release-2.x.y
2019-06-03, Elliott Sales de Andrade
0ed43e4e8a74
Parents f444cae76500
Children
Fix more brokenness with GNT_DISABLE_DEPRECATED.

Public names may be hidden, but we may still need something to use
later, even if the later field is hidden. Use the private name instead
for these hidden fields.
9 files changed, 20 insertions(+), 14 deletions(-)
  • +1 -1
    gntbindable.h
  • +1 -1
    gntbutton.h
  • +2 -2
    gntentry.h
  • +0 -4
    gntfilesel.h
  • +3 -3
    gntmenuitem.h
  • +5 -1
    gnttree.h
  • +3 -1
    gntwidget.h
  • +1 -1
    gntwindow.h
  • +4 -0
    gntwm.h
    • --- a/gntbindable.h Fri May 24 00:09:15 2019 -0400
    +++ b/gntbindable.h Mon Jun 03 01:57:51 2019 -0400
    @@ -108,7 +108,7 @@
    struct _GntBindableActionParam
    {
    - GntBindableAction *action;
    + struct _GntBindableAction *action;
    GList *list;
    };
    --- a/gntbutton.h Fri May 24 00:09:15 2019 -0400
    +++ b/gntbutton.h Mon Jun 03 01:57:51 2019 -0400
    @@ -67,7 +67,7 @@
    {
    GntWidget parent;
    - GntButtonPriv *GNTSEAL(priv);
    + struct _GntButtonPriv *GNTSEAL(priv);
    /*< private >*/
    void (*gnt_reserved1)(void);
    --- a/gntentry.h Fri May 24 00:09:15 2019 -0400
    +++ b/gntentry.h Mon Jun 03 01:57:51 2019 -0400
    @@ -127,8 +127,8 @@
    gboolean GNTSEAL(word); /* Are the suggestions for only a word, or for the whole thing? */
    gboolean GNTSEAL(always); /* Should the list of suggestions show at all times, or only on tab-press? */
    GntWidget *GNTSEAL(ddown); /* The dropdown with the suggested list */
    - GntEntryKillRing *GNTSEAL(killring); /* Since: 2.3.0 */
    - GntEntrySearch *GNTSEAL(search); /* Since: 2.7.0 */
    + struct _GntEntryKillRing *GNTSEAL(killring); /* Since: 2.3.0 */
    + struct _GntEntrySearch *GNTSEAL(search); /* Since: 2.7.0 */
    };
    struct _GntEntryClass
    --- a/gntfilesel.h Fri May 24 00:09:15 2019 -0400
    +++ b/gntfilesel.h Mon Jun 03 01:57:51 2019 -0400
    @@ -144,16 +144,12 @@
    G_BEGIN_DECLS
    -#ifndef GNT_DISABLE_DEPRECATED
    /**
    * gnt_file_sel_get_gtype:
    *
    * Returns: GType for GntFileSel.
    - *
    - * Deprecated: 2.14.0: This is an internal implementation detail.
    */
    GType gnt_file_sel_get_gtype(void);
    -#endif
    /**
    * gnt_file_sel_new:
    --- a/gntmenuitem.h Fri May 24 00:09:15 2019 -0400
    +++ b/gntmenuitem.h Mon Jun 03 01:57:51 2019 -0400
    @@ -64,12 +64,13 @@
    #endif
    typedef struct _GntMenuItem GntMenuItem;
    +#ifndef GNT_DISABLE_DEPRECATED
    typedef struct _GntMenuItemPriv GntMenuItemPriv;
    +#endif
    typedef struct _GntMenuItemClass GntMenuItemClass;
    #include "gntmenu.h"
    -#ifndef GNT_DISABLE_DEPRECATED
    /**
    * GntMenuItemPriv:
    *
    @@ -84,7 +85,6 @@
    char GNTSEAL(trigger); /* Use gnt_menuitem_get_trigger(). */
    char *GNTSEAL(id); /* Use gnt_menuitem_get_id(). */
    };
    -#endif
    typedef void (*GntMenuItemCallback)(GntMenuItem *item, gpointer data);
    @@ -96,7 +96,7 @@
    struct _GntMenuItem
    {
    GObject parent;
    - GntMenuItemPriv GNTSEAL(priv);
    + struct _GntMenuItemPriv GNTSEAL(priv);
    char *GNTSEAL(text);
    --- a/gnttree.h Fri May 24 00:09:15 2019 -0400
    +++ b/gnttree.h Mon Jun 03 01:57:51 2019 -0400
    @@ -73,6 +73,10 @@
    GNT_TREE_COLUMN_BINARY_DATA = 1 << 2,
    GNT_TREE_COLUMN_RIGHT_ALIGNED = 1 << 3,
    } GntTreeColumnFlag;
    +#else
    +typedef enum {
    + GNT_TREE_COLUMN_SEALED__DO_NOT_USE
    +} GntTreeColumnFlag;
    #endif
    /**
    @@ -109,7 +113,7 @@
    gboolean GNTSEAL(show_title);
    gboolean GNTSEAL(show_separator); /* Whether to show column separators */
    - GntTreePriv *GNTSEAL(priv);
    + struct _GntTreePriv *GNTSEAL(priv);
    };
    struct _GntTreeClass
    --- a/gntwidget.h Fri May 24 00:09:15 2019 -0400
    +++ b/gntwidget.h Mon Jun 03 01:57:51 2019 -0400
    @@ -74,7 +74,9 @@
    #endif
    typedef struct _GntWidget GntWidget;
    +#ifndef GNT_DISABLE_DEPRECATED
    typedef struct _GntWidgetPriv GntWidgetPriv;
    +#endif
    typedef struct _GntWidgetClass GntWidgetClass;
    /**
    @@ -179,7 +181,7 @@
    GntWidget *GNTSEAL(parent); /* Deprecated. Use gnt_widget_get_parent. */
    - GntWidgetPriv GNTSEAL(priv);
    + struct _GntWidgetPriv GNTSEAL(priv);
    WINDOW *GNTSEAL(window);
    /*< private >*/
    --- a/gntwindow.h Fri May 24 00:09:15 2019 -0400
    +++ b/gntwindow.h Mon Jun 03 01:57:51 2019 -0400
    @@ -89,7 +89,7 @@
    {
    GntBox parent;
    GntMenu *GNTSEAL(menu);
    - GntWindowPriv *GNTSEAL(priv);
    + struct _GntWindowPriv *GNTSEAL(priv);
    };
    struct _GntWindowClass
    --- a/gntwm.h Fri May 24 00:09:15 2019 -0400
    +++ b/gntwm.h Mon Jun 03 01:57:51 2019 -0400
    @@ -57,6 +57,10 @@
    GNT_KP_MODE_MOVE,
    GNT_KP_MODE_WAIT_ON_CHILD
    } GntKeyPressMode;
    +#else
    +typedef enum {
    + GNT_KP_MODE_SEALED__DO_NOT_USE
    +} GntKeyPressMode;
    #endif
    typedef struct _GntNode