From 42fc8277d9a517436ddb4367cd922e8b73a4b632 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Mon, 6 Feb 2012 12:11:38 +0000 Subject: handle gtk3 box constructor changes --- src/user-widget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/user-widget.c') diff --git a/src/user-widget.c b/src/user-widget.c index 937a9eb..8388ec5 100644 --- a/src/user-widget.c +++ b/src/user-widget.c @@ -136,7 +136,7 @@ user_widget_init (UserWidget *self) gtk_misc_set_padding (GTK_MISC(priv->user_image),0, 4.0); priv->user_name = gtk_label_new (""); - priv->container = gtk_hbox_new (FALSE, 0); + priv->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); priv->tick_icon = gtk_image_new_from_icon_name ("account-logged-in", GTK_ICON_SIZE_MENU); gtk_misc_set_alignment(GTK_MISC(priv->tick_icon), 1.0, 0.5); -- cgit v1.2.3 From 4145c29279197d5985d348fbe2ef219a4c015a11 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 8 Feb 2012 17:23:19 +0000 Subject: correct conflict --- src/user-widget.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/user-widget.c') diff --git a/src/user-widget.c b/src/user-widget.c index 8388ec5..33b9e40 100644 --- a/src/user-widget.c +++ b/src/user-widget.c @@ -136,7 +136,13 @@ user_widget_init (UserWidget *self) gtk_misc_set_padding (GTK_MISC(priv->user_image),0, 4.0); priv->user_name = gtk_label_new (""); + +#if HAVE_GTK3 priv->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); +#else + priv->container = gtk_hbox_new (FALSE, 0); +#endif + priv->tick_icon = gtk_image_new_from_icon_name ("account-logged-in", GTK_ICON_SIZE_MENU); gtk_misc_set_alignment(GTK_MISC(priv->tick_icon), 1.0, 0.5); -- cgit v1.2.3