brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st-theme: Use constructed instead of constructor

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-10-30 18:26:21 -04:00
parent 7fc2183826
commit a347a75617
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/st/st-theme.c
View File

@ -45,10 +45,7 @@
#include "st-theme-node.h" #include "st-theme-node.h"
#include "st-theme-private.h" #include "st-theme-private.h"
static GObject *st_theme_constructor (GType type, static void st_theme_constructed (GObject *object);
guint n_construct_properties,
GObjectConstructParam *construct_properties);
static void st_theme_finalize (GObject *object); static void st_theme_finalize (GObject *object);
static void st_theme_set_property (GObject *object, static void st_theme_set_property (GObject *object,
guint prop_id, guint prop_id,
@ -114,7 +111,7 @@ st_theme_class_init (StThemeClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->constructor = st_theme_constructor; object_class->constructed = st_theme_constructed;
object_class->finalize = st_theme_finalize; object_class->finalize = st_theme_finalize;
object_class->set_property = st_theme_set_property; object_class->set_property = st_theme_set_property;
object_class->get_property = st_theme_get_property; object_class->get_property = st_theme_get_property;
@ -302,21 +299,15 @@ st_theme_get_custom_stylesheets (StTheme *theme)
return result; return result;
} }
static GObject * static void
st_theme_constructor (GType type, st_theme_constructed (GObject *object)
guint n_construct_properties,
GObjectConstructParam *construct_properties)
{ {
GObject *object; StTheme *theme = ST_THEME (object);
StTheme *theme;
CRStyleSheet *application_stylesheet; CRStyleSheet *application_stylesheet;
CRStyleSheet *theme_stylesheet; CRStyleSheet *theme_stylesheet;
CRStyleSheet *default_stylesheet; CRStyleSheet *default_stylesheet;
object = (*G_OBJECT_CLASS (st_theme_parent_class)->constructor) (type, G_OBJECT_CLASS (st_theme_parent_class)->constructed (object);
n_construct_properties,
construct_properties);
theme = ST_THEME (object);
application_stylesheet = parse_stylesheet_nofail (theme->application_stylesheet); application_stylesheet = parse_stylesheet_nofail (theme->application_stylesheet);
theme_stylesheet = parse_stylesheet_nofail (theme->theme_stylesheet); theme_stylesheet = parse_stylesheet_nofail (theme->theme_stylesheet);
@ -332,8 +323,6 @@ st_theme_constructor (GType type,
insert_stylesheet (theme, theme->application_stylesheet, application_stylesheet); insert_stylesheet (theme, theme->application_stylesheet, application_stylesheet);
insert_stylesheet (theme, theme->theme_stylesheet, theme_stylesheet); insert_stylesheet (theme, theme->theme_stylesheet, theme_stylesheet);
insert_stylesheet (theme, theme->default_stylesheet, default_stylesheet); insert_stylesheet (theme, theme->default_stylesheet, default_stylesheet);
return object;
} }
static void static void