[gnome-calculator] Add workaround for gtk_builder_add_objects_from_resource vapi fix so we don't require master vala



commit 77d9124fe74e647acda247ae1f94c7a4e57c0f03
Author: Robert Ancell <robert ancell canonical com>
Date:   Sun Apr 14 10:45:17 2013 +1200

    Add workaround for gtk_builder_add_objects_from_resource vapi fix so we don't require master vala

 src/math-buttons.vala | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/src/math-buttons.vala b/src/math-buttons.vala
index 6b1418b..2ff17e4 100644
--- a/src/math-buttons.vala
+++ b/src/math-buttons.vala
@@ -16,6 +16,10 @@ public enum ButtonMode
     PROGRAMMING
 }
 
+/* FIXME: Remove when depend on Vala >= 0.20.2
+ * https://bugzilla.gnome.org/show_bug.cgi?id=697960 */
+extern uint gtk_builder_add_objects_from_resource (Gtk.Builder builder, string resource_path, [CCode 
(array_length = false)] string[] object_ids) throws GLib.Error;
+
 public class MathButtons : Gtk.Box
 {
     private MathEquation equation;
@@ -266,7 +270,9 @@ public class MathButtons : Gtk.Box
 
         try
         {
-            builder.add_objects_from_resource ("/org/gnome/calculator/%s".printf(builder_resource), objects);
+            /* FIXME: Replace with builder.add_objects_from_resource when depend on Vala >= 0.20.2
+             * https://bugzilla.gnome.org/show_bug.cgi?id=697960 */
+            gtk_builder_add_objects_from_resource (builder, 
"/org/gnome/calculator/%s".printf(builder_resource), objects);
         }
         catch (Error e)
         {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]