qulogic/libgnt

Merged the GSoC 2013 gobjectification branch (soc.2013.gobjectification)

2013-12-06, Ankit Vani
bb6c7481a92e
Parents afe0971f0a1baafedfc9474d
Children e874cda5c77efcee6fdf0e91
Merged the GSoC 2013 gobjectification branch (soc.2013.gobjectification)
7 files changed, 13 insertions(+), 15 deletions(-)
  • +4 -5
    gntbox.c
  • +2 -2
    gntlabel.c
  • +1 -1
    gntline.c
  • +1 -1
    gntprogressbar.c
  • +2 -2
    gntprogressbar.h
  • +2 -3
    gnttree.c
  • +1 -1
    wms/s.c
    • --- a/gntbox.c Tue Sep 03 14:25:57 2013 +0200
    +++ b/gntbox.c Fri Dec 06 01:10:31 2013 +0530
    @@ -592,7 +592,7 @@
    g_param_spec_boolean("vertical", "Vertical",
    "Whether the child widgets in the box should be stacked vertically.",
    TRUE,
    - G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
    + G_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_STATIC_STRINGS
    )
    );
    g_object_class_install_property(gclass,
    @@ -600,7 +600,7 @@
    g_param_spec_boolean("homogeneous", "Homogeneous",
    "Whether the child widgets in the box should have the same size.",
    TRUE,
    - G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
    + G_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_STATIC_STRINGS
    )
    );
    @@ -662,11 +662,10 @@
    GntWidget *gnt_box_new(gboolean homo, gboolean vert)
    {
    - GntWidget *widget = g_object_new(GNT_TYPE_BOX, NULL);
    + GntWidget *widget = g_object_new(GNT_TYPE_BOX, "homogeneous", homo,
    + "vertical", vert, NULL);
    GntBox *box = GNT_BOX(widget);
    - box->homogeneous = homo;
    - box->vertical = vert;
    box->alignment = vert ? GNT_ALIGN_LEFT : GNT_ALIGN_MID;
    return widget;
    --- a/gntlabel.c Tue Sep 03 14:25:57 2013 +0200
    +++ b/gntlabel.c Fri Dec 06 01:10:31 2013 +0530
    @@ -123,7 +123,7 @@
    g_param_spec_string("text", "Text",
    "The text for the label.",
    NULL,
    - G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
    + G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS
    )
    );
    @@ -135,7 +135,7 @@
    GNT_TEXT_FLAG_NORMAL|GNT_TEXT_FLAG_BOLD|GNT_TEXT_FLAG_UNDERLINE|
    GNT_TEXT_FLAG_BLINK|GNT_TEXT_FLAG_DIM|GNT_TEXT_FLAG_HIGHLIGHT,
    GNT_TEXT_FLAG_NORMAL,
    - G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
    + G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS
    )
    );
    GNTDEBUG;
    --- a/gntline.c Tue Sep 03 14:25:57 2013 +0200
    +++ b/gntline.c Fri Dec 06 01:10:31 2013 +0530
    @@ -120,7 +120,7 @@
    g_param_spec_boolean("vertical", "Vertical",
    "Whether it's a vertical line or a horizontal one.",
    TRUE,
    - G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
    + G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS
    )
    );
    }
    --- a/gntprogressbar.c Tue Sep 03 14:25:57 2013 +0200
    +++ b/gntprogressbar.c Fri Dec 06 01:10:31 2013 +0530
    @@ -143,7 +143,7 @@
    }
    GType
    -gnt_progress_bar_get_type (void)
    +gnt_progress_bar_get_gtype (void)
    {
    static GType type = 0;
    --- a/gntprogressbar.h Tue Sep 03 14:25:57 2013 +0200
    +++ b/gntprogressbar.h Fri Dec 06 01:10:31 2013 +0530
    @@ -30,7 +30,7 @@
    #include "gnt.h"
    #include "gntwidget.h"
    -#define GNT_TYPE_PROGRESS_BAR (gnt_progress_bar_get_type ())
    +#define GNT_TYPE_PROGRESS_BAR (gnt_progress_bar_get_gtype ())
    #define GNT_PROGRESS_BAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNT_TYPE_PROGRESS_BAR, GntProgressBar))
    #define GNT_PROGRESS_BAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNT_TYPE_PROGRESS_BAR, GntProgressBarClass))
    #define GNT_IS_PROGRESS_BAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNT_TYPE_PROGRESS_BAR))
    @@ -64,7 +64,7 @@
    * @return The GType for GntProrgressBar
    **/
    GType
    -gnt_progress_bar_get_type (void);
    +gnt_progress_bar_get_gtype (void);
    /**
    * Create a new GntProgressBar
    --- a/gnttree.c Tue Sep 03 14:25:57 2013 +0200
    +++ b/gnttree.c Fri Dec 06 01:10:31 2013 +0530
    @@ -1009,7 +1009,6 @@
    if (tree->priv->expander_level == g_value_get_int(value))
    break;
    tree->priv->expander_level = g_value_get_int(value);
    - g_object_notify(obj, "expander-level");
    default:
    break;
    }
    @@ -1054,7 +1053,7 @@
    g_param_spec_int("columns", "Columns",
    "Number of columns in the tree.",
    1, G_MAXINT, 1,
    - G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
    + G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS
    )
    );
    g_object_class_install_property(gclass,
    @@ -1062,7 +1061,7 @@
    g_param_spec_int("expander-level", "Expander level",
    "Number of levels to show expander in the tree.",
    0, G_MAXINT, 1,
    - G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
    + G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS
    )
    );
    --- a/wms/s.c Tue Sep 03 14:25:57 2013 +0200
    +++ b/wms/s.c Fri Dec 06 01:10:31 2013 +0530
    @@ -11,7 +11,7 @@
    #include "gntwindow.h"
    #include "gntlabel.h"
    -#include "blist.h"
    +#include "buddylist.h"
    #define TYPE_S (s_get_gtype())