diff options
| author | Ted Gould <ted@gould.cx> | 2012-02-07 16:24:23 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-02-07 16:24:23 -0600 |
| commit | 2f7ca00e65c81a0b7313e0202768d9faee2a091b (patch) | |
| tree | 5aa983e81b5a21ce95f34cbcc9c285c7805d1fbf | |
| parent | 5ae829c79f7bbb889f4876732b96469de5eaf01b (diff) | |
| parent | 0d10a8e683b76a3bdb245c0f068027a757be12d4 (diff) | |
| download | ayatana-indicator-session-2f7ca00e65c81a0b7313e0202768d9faee2a091b.tar.gz ayatana-indicator-session-2f7ca00e65c81a0b7313e0202768d9faee2a091b.tar.bz2 ayatana-indicator-session-2f7ca00e65c81a0b7313e0202768d9faee2a091b.zip | |
Fix GTK3 Box Deprecation
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/user-widget.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 3e5fa97..a34450c 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,7 @@ AS_IF([test "x$with_gtk" = x3], ], [AC_MSG_FAILURE([Value for --with-indicator-gtk was neither 2 nor 3])] ) + AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) @@ -77,6 +78,11 @@ AS_IF([test "x$with_gtk" = x3], AC_SUBST(SESSIONERVICE_CFLAGS) AC_SUBST(SESSIONERVICE_LIBS) +AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"]) +AS_IF([test "x$with_gtk" = x3], [ + AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) + ]) + ########################### # GTK Logout Helper ########################### diff --git a/src/user-widget.c b/src/user-widget.c index 937a9eb..88ac11c 100644 --- a/src/user-widget.c +++ b/src/user-widget.c @@ -136,7 +136,11 @@ 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); |