diff options
| author | Conor Curran <conor.curran@canonical.com> | 2012-02-08 17:23:19 +0000 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2012-02-08 17:23:19 +0000 |
| commit | 4145c29279197d5985d348fbe2ef219a4c015a11 (patch) | |
| tree | a1d8b6bfaca4cc21ff3e24c209e1f5772732c252 | |
| parent | d4162d24e4bdee56df9bf6815207cf0ecf15fed3 (diff) | |
| download | ayatana-indicator-session-4145c29279197d5985d348fbe2ef219a4c015a11.tar.gz ayatana-indicator-session-4145c29279197d5985d348fbe2ef219a4c015a11.tar.bz2 ayatana-indicator-session-4145c29279197d5985d348fbe2ef219a4c015a11.zip | |
correct conflict
| -rw-r--r-- | src/user-widget.c | 6 |
1 files changed, 6 insertions, 0 deletions
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); |