aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am9
-rw-r--r--src/config.vala.in14
-rw-r--r--src/playlists-menu-item.vala9
-rw-r--r--src/sound-service.c7
6 files changed, 10 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am
index ef3b423..1742c47 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,8 @@ SUBDIRS = \
EXTRA_DIST = \
autogen.sh \
- vapi/common-defs.vapi
+ vapi/common-defs.vapi \
+ vapi/config.vapi
DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
diff --git a/configure.ac b/configure.ac
index a69ff69..88535b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,6 @@ data/icons/16x16/status/Makefile
data/icons/scalable/Makefile
data/icons/scalable/status/Makefile
po/Makefile.in
-src/config.vala
])
###########################
diff --git a/src/Makefile.am b/src/Makefile.am
index ff9dda6..c494c49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,9 +56,7 @@ music_bridge_VALASOURCES = \
settings-manager.vala \
playlists-menu-item.vala \
freedesktop-interfaces.vala \
- fetch-file.vala \
- config.vala
-
+ fetch-file.vala
music_bridge_VALAFLAGS = \
--ccode \
@@ -138,11 +136,10 @@ EXTRA_DIST = \
#######################
BUILT_SOURCES = \
music_bridge_vala.stamp \
- $(music_bridge_APIFILES) \
+ $(music_bridge_APIFILES) \
gen-sound-service.xml.h \
gen-sound-service.xml.c \
- config.vala \
- $(music_bridge_VALASOURCES:.vala=.c)
+ $(music_bridge_VALASOURCES:.vala=.c)
CLEANFILES = \
$(BUILT_SOURCES)
diff --git a/src/config.vala.in b/src/config.vala.in
deleted file mode 100644
index 3af2967..0000000
--- a/src/config.vala.in
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Config {
-
- const string PREFIX = "@prefix@";
-
- const string DATADIR = "@DATADIR@";
-
- const string BINDIR = "@prefix@/bin";
-
- const string LOCALEDIR = "@DATADIR@/locale";
-
- const string PACKAGE = "@PACKAGE@";
-
- const string VERSION = "@VERSION@";
-} \ No newline at end of file
diff --git a/src/playlists-menu-item.vala b/src/playlists-menu-item.vala
index b3d0aa2..c169297 100644
--- a/src/playlists-menu-item.vala
+++ b/src/playlists-menu-item.vala
@@ -34,15 +34,8 @@ public class PlaylistsMenuitem : PlayerItem
{
Object ( item_type: MENUITEM_TYPE, owner: parent );
}
- construct{
-
- GLib.Intl.textdomain (Config.PACKAGE);
- GLib.Intl.bindtextdomain (Config.PACKAGE, Config.LOCALEDIR);
- GLib.Intl.bind_textdomain_codeset (Config.PACKAGE, "UTF-8");
- GLib.Intl.setlocale(GLib.LocaleCategory.ALL, "");
-
- DesktopAppInfo.set_desktop_env ("GNOME");
+ construct{
this.current_playlists = new HashMap<int, Dbusmenu.Menuitem>();
this.root_item = new Menuitem();
diff --git a/src/sound-service.c b/src/sound-service.c
index cfc0b7e..051e03e 100644
--- a/src/sound-service.c
+++ b/src/sound-service.c
@@ -51,11 +51,12 @@ main:
int
main (int argc, char ** argv)
{
+
g_type_init();
-
- setlocale (LC_ALL, "");
- bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
textdomain (GETTEXT_PACKAGE);
+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ bind_text_domain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ setlocale (LC_ALL, "");
IndicatorService *service = indicator_service_new_version(INDICATOR_SOUND_DBUS_NAME,
INDICATOR_SOUND_DBUS_VERSION);