diff options
| -rw-r--r-- | po/POTFILES.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 9 | ||||
| -rw-r--r-- | src/common-defs.h | 4 | ||||
| -rw-r--r-- | src/playlists-menu-item.vala | 1 | ||||
| -rw-r--r-- | src/sound-service.c | 1 | ||||
| -rw-r--r-- | vapi/config.vapi | 8 |
6 files changed, 18 insertions, 7 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 37b6d8e..35c47bd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,4 +2,4 @@ src/indicator-sound.c src/mute-menu-item.c src/sound-service-dbus.c -src/playlists-menu-item.vala +src/playlists-menu-item.c diff --git a/src/Makefile.am b/src/Makefile.am index c494c49..ae0d55a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -68,10 +68,11 @@ music_bridge_VALAFLAGS = \ --pkg gee-1.0 \ --pkg Dbusmenu-0.4 \ --pkg common-defs \ - --pkg gio-2.0 \ - --pkg gio-unix-2.0 \ - --pkg gdk-pixbuf-2.0 \ - --pkg libxml-2.0 + --pkg config \ + --pkg gio-2.0 \ + --pkg gio-unix-2.0 \ + --pkg gdk-pixbuf-2.0 \ + --pkg libxml-2.0 $(MAINTAINER_VALAFLAGS) diff --git a/src/common-defs.h b/src/common-defs.h index e95b7e0..68cb0b8 100644 --- a/src/common-defs.h +++ b/src/common-defs.h @@ -19,6 +19,10 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef __COMMON_DEFS_H__ #define __COMMON_DEFS_H__ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + typedef enum { MUTED, ZERO_LEVEL, diff --git a/src/playlists-menu-item.vala b/src/playlists-menu-item.vala index c169297..79ab506 100644 --- a/src/playlists-menu-item.vala +++ b/src/playlists-menu-item.vala @@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -using GLib; using Config; using Dbusmenu; using DbusmenuPlaylists; diff --git a/src/sound-service.c b/src/sound-service.c index 051e03e..7e6426c 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -55,7 +55,6 @@ main (int argc, char ** argv) g_type_init(); 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, diff --git a/vapi/config.vapi b/vapi/config.vapi new file mode 100644 index 0000000..4be6d11 --- /dev/null +++ b/vapi/config.vapi @@ -0,0 +1,8 @@ +[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "../config.h")] +namespace Config { + public const string GETTEXT_PACKAGE; + public const string LOCALEDIR; + public const string PKGDATADIR; + public const string PACKAGE_NAME; + public const string PACKAGE_VERSION; +} |