aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am9
-rw-r--r--src/config.vapi3
-rw-r--r--src/indicator-bluetooth-service.vala6
3 files changed, 10 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 8f8d7eb..5fcfc5c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,12 +3,15 @@ indicatordir = ${libdir}/indicators3/7
indicator_LTLIBRARIES = libbluetooth.la
indicator_bluetooth_service_SOURCES = \
- config.vapi \
indicator3-0.4.vapi \
gnome-bluetooth-1.0.vapi \
indicator-bluetooth-service.vala
indicator_bluetooth_service_VALAFLAGS = \
+ --ccode \
+ --vapidir=$(top_srcdir)/vapi/ \
+ --vapidir=./ \
+ --pkg config \
--pkg posix \
--pkg glib-2.0 \
--pkg gtk+-3.0 \
@@ -23,12 +26,14 @@ indicator_bluetooth_service_LDADD = \
$(INDICATOR_BLUETOOTH_SERVICE_LIBS)
libbluetooth_la_SOURCES = \
- config.vapi \
indicator3-0.4.vapi \
indicator-bluetooth.vala \
libido3-0.1.vapi
libbluetooth_la_VALAFLAGS = \
+ --ccode \
+ --vapidir=$(top_srcdir)/vapi/ \
+ --vapidir=./ \
--pkg posix \
--pkg glib-2.0 \
--pkg gtk+-3.0 \
diff --git a/src/config.vapi b/src/config.vapi
deleted file mode 100644
index a1bb094..0000000
--- a/src/config.vapi
+++ /dev/null
@@ -1,3 +0,0 @@
-public const string VERSION;
-public const string GETTEXT_PACKAGE;
-public const string LOCALE_DIR;
diff --git a/src/indicator-bluetooth-service.vala b/src/indicator-bluetooth-service.vala
index ac84f33..e9d8e76 100644
--- a/src/indicator-bluetooth-service.vala
+++ b/src/indicator-bluetooth-service.vala
@@ -397,9 +397,9 @@ private void show_control_center (string panel)
public static int main (string[] args)
{
Intl.setlocale (LocaleCategory.ALL, "");
- Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
- Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- Intl.textdomain (GETTEXT_PACKAGE);
+ Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.GNOMELOCALEDIR);
+ Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
+ Intl.textdomain (Config.GETTEXT_PACKAGE);
var loop = new MainLoop ();