diff options
| author | Stefano Facchini <stefano.facchini@gmail.com> | 2013-06-21 23:13:06 +0200 |
|---|---|---|
| committer | Stefano Facchini <stefano.facchini@gmail.com> | 2013-06-21 23:13:06 +0200 |
| commit | 06da24bbc9fed1feded2328af9e758a6d1807b5a (patch) | |
| tree | e5cb92f97d3657309467081d01836aabfd55760d | |
| parent | d7a4e9902eaf50ded3106a35e273fa4b6f872829 (diff) | |
| download | baobab-06da24bbc9fed1feded2328af9e758a6d1807b5a.tar.gz | |
Remove custom vala binding for GThread
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/baobab-scanner.vala | 4 | ||||
| -rw-r--r-- | src/fixes.vapi | 8 |
4 files changed, 4 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 7911b39..1d2262f 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,7 @@ YELP_HELP_INIT PKG_CHECK_MODULES(BAOBAB, [ gtk+-3.0 >= 3.9.3 + glib-2.0 >= 2.32.0 gio-2.0 >= 2.30.0 ]) diff --git a/src/Makefile.am b/src/Makefile.am index 5050215..25cf0e9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,7 @@ bin_PROGRAMS = baobab BUILT_SOURCES = baobab-resources.c baobab_VALAFLAGS = \ + --target-glib=2.32 \ --pkg gtk+-3.0 \ --pkg gio-2.0 \ --pkg gio-unix-2.0 \ @@ -31,7 +32,6 @@ VALA_SOURCES = \ baobab_SOURCES = \ $(VALA_SOURCES) \ - fixes.vapi \ config.vapi \ $(BUILT_SOURCES) diff --git a/src/baobab-scanner.vala b/src/baobab-scanner.vala index eca85ce..be5a006 100644 --- a/src/baobab-scanner.vala +++ b/src/baobab-scanner.vala @@ -79,7 +79,7 @@ namespace Baobab { } } - GLib2.Thread? thread = null; + Thread<void*>? thread = null; uint process_result_idle = 0; HardLink[] hardlinks; @@ -371,7 +371,7 @@ namespace Baobab { // the thread owns a reference on the Scanner object this.self = this; - thread = new GLib2.Thread ("scanner", scan_in_thread); + thread = new Thread<void*> ("scanner", scan_in_thread); process_result_idle = Timeout.add (100, process_results); } else { diff --git a/src/fixes.vapi b/src/fixes.vapi deleted file mode 100644 index 66c0bba..0000000 --- a/src/fixes.vapi +++ /dev/null @@ -1,8 +0,0 @@ -[CCode (cprefix = "G", gir_namespace = "Gio", gir_version = "2.0", lower_case_cprefix = "g_")] -namespace GLib2 { - public class Thread { - public delegate void* ThreadFunc (); - public Thread (string thread_name, ThreadFunc func); - public void* join (); - } -} |