Skip to content

Commit

Permalink
Revert "Fix build with newer Vala (#637)" (#659)
Browse files Browse the repository at this point in the history
This reverts commit 9065ac6.

Vala has reverted the API break that necessitated this change, and now
we cannot build with newer Vala again.

Fixes #658
  • Loading branch information
mcatanzaro committed Sep 9, 2023
1 parent e8b4cbb commit b86e04d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
4 changes: 0 additions & 4 deletions demo/Views/UtilsView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,7 @@ public class UtilsView : Gtk.Grid {
Granite.contrasting_foreground_color (bg_color).to_string ()
);

#if VALA_0_58
provider.load_from_data (css);
#else
provider.load_from_data ((uint8[])css);
#endif
demo_label_style_context.add_provider (
provider,
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
Expand Down
4 changes: 0 additions & 4 deletions lib/Widgets/Utils.vala
Original file line number Diff line number Diff line change
Expand Up @@ -263,11 +263,7 @@ namespace Granite.Widgets.Utils {
var css = "@define-color color_primary %s;".printf (color.to_string ());

var css_provider = new Gtk.CssProvider ();
#if VALA_0_58
css_provider.load_from_data (css);
#else
css_provider.load_from_data (css.data);
#endif

Gtk.StyleContext.add_provider_for_display (Gdk.Display.get_default (), css_provider, priority);

Expand Down

0 comments on commit b86e04d

Please sign in to comment.