The Birdfont Source Code


All Repositories / birdfont.git / commitdiff – RSS feed

Merge branch '1.x' of gitorious.org:birdfont/birdfont into 1.x

These changes was commited to the Birdfont repository Thu, 06 Nov 2014 11:16:41 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
[Thu, 06 Nov 2014 11:16:41 +0000]

Updated Files

birdfont/Main.vala
libbirdfont/BirdFont.vala
scripts/windows_build.py
--- a/birdfont/Main.vala +++ b/birdfont/Main.vala @@ -35,10 +35,7 @@ window.set_native (native_window); native_window.init (); - file = BirdFont.BirdFont.args.get_file (); - if (file != "") { - FileTab.load_font (file); - } + birdfont.load_file_from_command_line (); load_ucd (); Gtk.main ();
--- a/libbirdfont/BirdFont.vala +++ b/libbirdfont/BirdFont.vala @@ -497,6 +497,13 @@ Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "utf-8"); Intl.bindtextdomain (GETTEXT_PACKAGE, locale_directory); #endif + } + + public static void load_font_from_command_line () { + string file = args.get_file (); + if (file != "") { + FileTab.load_font (file); + } } public static Font get_current_font () {
--- a/scripts/windows_build.py +++ b/scripts/windows_build.py @@ -23,7 +23,7 @@ import configfile configfile.write_config (prefix) - configfile.write_compile_parameters (".\\\\", "build", "gcc", "gee-1.0") + configfile.write_compile_parameters (".\\\\", "build", "gcc", "gee-1.0", "False") import build from translations import compile_translations