[vala] Fix dbus-glib support
- From: Jürg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] Fix dbus-glib support
- Date: Thu, 12 Aug 2010 14:19:47 +0000 (UTC)
commit 3354f54288665434b03c97fa72c2aadd04dfa3e3
Author: Jürg Billeter <j bitron ch>
Date: Thu Aug 12 16:01:59 2010 +0200
Fix dbus-glib support
compiler/valacompiler.vala | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index 5539965..6570d81 100644
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@ -313,18 +313,6 @@ class Vala.Compiler {
}
}
- if (context.profile == Profile.GOBJECT) {
- if (context.has_package ("dbus-glib-1")) {
- context.codegen = new DBusServerModule ();
- } else {
- context.codegen = new GDBusServerModule ();
- }
- } else if (context.profile == Profile.DOVA) {
- context.codegen = new DovaErrorModule ();
- } else {
- context.codegen = new CCodeDelegateModule ();
- }
-
if (packages != null) {
foreach (string package in packages) {
if (!add_package (context, package) && !add_gir (context, package)) {
@@ -340,7 +328,19 @@ class Vala.Compiler {
if (context.report.get_errors () > 0) {
return quit ();
}
-
+
+ if (context.profile == Profile.GOBJECT) {
+ if (context.has_package ("dbus-glib-1")) {
+ context.codegen = new DBusServerModule ();
+ } else {
+ context.codegen = new GDBusServerModule ();
+ }
+ } else if (context.profile == Profile.DOVA) {
+ context.codegen = new DovaErrorModule ();
+ } else {
+ context.codegen = new CCodeDelegateModule ();
+ }
+
bool has_c_files = false;
foreach (string source in sources) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]