From 4145c29279197d5985d348fbe2ef219a4c015a11 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Wed, 8 Feb 2012 17:23:19 +0000
Subject: correct conflict

---
 src/user-widget.c | 6 ++++++
 1 file changed, 6 insertions(+)

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