qulogic/libgnt

Merge gtkdoc-conversion
soc.2013.gobjectification.plugins
2014-02-06, Ankit Vani
ce87619dd973
Parents 604edddaa44b5a2f6c4d244f
Children 54ff9fb64abd
Merge gtkdoc-conversion
5 files changed, 26 insertions(+), 12 deletions(-)
  • +1 -1
    gnt-skel.h
  • +3 -3
    gntkeys.h
  • +11 -1
    gntstyle.c
  • +10 -7
    gnttree.h
  • +1 -0
    gntwm.h
    • --- a/gnt-skel.h Thu Feb 06 21:03:55 2014 +0530
    +++ b/gnt-skel.h Thu Feb 06 23:00:37 2014 +0530
    @@ -19,7 +19,7 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -/**
    +/*
    * SECTION:gnt-skel
    * @section_id: libgnt-gnt-skel
    * @short_description: <filename>gnt-skel.h</filename>
    --- a/gntkeys.h Thu Feb 06 21:03:55 2014 +0530
    +++ b/gntkeys.h Thu Feb 06 23:00:37 2014 +0530
    @@ -42,7 +42,7 @@
    extern char *gnt_key_cleft;
    extern char *gnt_key_cright;
    -#define SAFE(x) ((x) ? (x) : "")
    +#define SAFE(x) ((cur_term && (x)) ? (x) : "")
    #define GNT_KEY_POPUP SAFE(key_f16) /* Apparently */
    @@ -62,12 +62,12 @@
    #define GNT_KEY_HOME SAFE(key_home)
    #define GNT_KEY_END SAFE(key_end)
    -#define GNT_KEY_ENTER carriage_return
    +#define GNT_KEY_ENTER SAFE(carriage_return)
    #define GNT_KEY_BACKSPACE SAFE(key_backspace)
    #define GNT_KEY_DEL SAFE(key_dc)
    #define GNT_KEY_INS SAFE(key_ic)
    -#define GNT_KEY_BACK_TAB (back_tab ? back_tab : SAFE(key_btab))
    +#define GNT_KEY_BACK_TAB ((cur_term && back_tab) ? back_tab : SAFE(key_btab))
    #define GNT_KEY_CTRL_A "\001"
    #define GNT_KEY_CTRL_B "\002"
    --- a/gntstyle.c Thu Feb 06 21:03:55 2014 +0530
    +++ b/gntstyle.c Thu Feb 06 23:00:37 2014 +0530
    @@ -48,7 +48,13 @@
    char *gnt_style_get_from_name(const char *group, const char *key)
    {
    - const char *prg = g_get_prgname();
    + const char *prg;
    +
    + /* gkfile is NULL when run by gtkdoc-scanobj or g-ir-scanner */
    + if (!gkfile)
    + return NULL;
    +
    + prg = g_get_prgname();
    if ((group == NULL || *group == '\0') && prg &&
    g_key_file_has_group(gkfile, prg))
    group = prg;
    @@ -202,6 +208,10 @@
    char *name;
    GError *error = NULL;
    + /* gkfile is NULL when run by gtkdoc-scanobj or g-ir-scanner */
    + if (!gkfile)
    + return;
    +
    name = g_strdup_printf("%s::binding", g_type_name(type));
    if (g_key_file_has_group(gkfile, name))
    --- a/gnttree.h Thu Feb 06 21:03:55 2014 +0530
    +++ b/gnttree.h Thu Feb 06 23:00:37 2014 +0530
    @@ -48,6 +48,7 @@
    typedef struct _GntTreeRow GntTreeRow;
    typedef struct _GntTreeCol GntTreeCol;
    +typedef struct _GntTreeColInfo GntTreeColInfo;
    typedef enum {
    GNT_TREE_COLUMN_INVISIBLE = 1 << 0,
    @@ -56,6 +57,14 @@
    GNT_TREE_COLUMN_RIGHT_ALIGNED = 1 << 3,
    } GntTreeColumnFlag;
    +struct _GntTreeColInfo
    +{
    + int width;
    + char *title;
    + int width_ratio;
    + GntTreeColumnFlag flags;
    +};
    +
    struct _GntTree
    {
    GntWidget parent;
    @@ -75,13 +84,7 @@
    GDestroyNotify value_destroy;
    int ncol; /* No. of columns */
    - struct _GntTreeColInfo
    - {
    - int width;
    - char *title;
    - int width_ratio;
    - GntTreeColumnFlag flags;
    - } *columns; /* Would a GList be better? */
    + GntTreeColInfo *columns; /* Would a GList be better? */
    gboolean show_title;
    gboolean show_separator; /* Whether to show column separators */
    --- a/gntwm.h Thu Feb 06 21:03:55 2014 +0530
    +++ b/gntwm.h Thu Feb 06 23:00:37 2014 +0530
    @@ -102,6 +102,7 @@
    {
    GntBindable inherit;
    + /*< public >*/
    GMainLoop *loop;
    GList *workspaces;