From 6b6ce54b4875dfb554f7e2831af900a851c52e24 Mon Sep 17 00:00:00 2001 From: Denis Gorodnichev Date: Sun, 8 Feb 2015 23:25:17 +0300 Subject: na: gtk2: fix build --- applets/notification_area/main.c | 4 ++++ applets/notification_area/na-tray.c | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) (limited to 'applets') diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c index 3068642c..c17fb446 100644 --- a/applets/notification_area/main.c +++ b/applets/notification_area/main.c @@ -188,6 +188,7 @@ na_tray_applet_unrealize (GtkWidget *widget) GTK_WIDGET_CLASS (na_tray_applet_parent_class)->unrealize (widget); } +#if GTK_CHECK_VERSION (3, 0, 0) static inline gboolean style_context_lookup_color (GtkStyleContext *context, const gchar *color_name, @@ -245,6 +246,7 @@ na_tray_applet_style_updated (GtkWidget *widget) gtk_widget_style_get (widget, "icon-size", &icon_size, NULL); na_tray_set_icon_size (applet->priv->tray, icon_size); } +#endif #if GTK_CHECK_VERSION (3, 0, 0) static void @@ -313,7 +315,9 @@ na_tray_applet_class_init (NaTrayAppletClass *class) widget_class->realize = na_tray_applet_realize; widget_class->unrealize = na_tray_applet_unrealize; +#if GTK_CHECK_VERSION (3, 0, 0) widget_class->style_updated = na_tray_applet_style_updated; +#endif applet_class->change_background = na_tray_applet_change_background; applet_class->change_orient = na_tray_applet_change_orient; diff --git a/applets/notification_area/na-tray.c b/applets/notification_area/na-tray.c index 4cb2a34a..c1b24da8 100644 --- a/applets/notification_area/na-tray.c +++ b/applets/notification_area/na-tray.c @@ -89,6 +89,27 @@ static TraysScreen *trays_screens = NULL; static void icon_tip_show_next (IconTip *icontip); +#if !GTK_CHECK_VERSION (3, 0, 0) +/* NaBox, an instantiable GtkBox */ + +typedef GtkBox NaBox; +typedef GtkBoxClass NaBoxClass; + +static GType na_box_get_type (void); + +G_DEFINE_TYPE (NaBox, na_box, GTK_TYPE_BOX) + +static void +na_box_init (NaBox *box) +{ +} + +static void +na_box_class_init (NaBoxClass *klass) +{ +} +#endif + /* NaTray */ G_DEFINE_TYPE (NaTray, na_tray, GTK_TYPE_BIN) -- cgit v1.2.1