Commit fa6f4fb9 authored by Canek Peláez's avatar Canek Peláez
Browse files

Merge branch 'master' of github.com:canek-pelaez/mlm

parents bd88d69e 52853b3a

.gitignore

deleted100644 → 0
+0 −27
Changes for .gitignore: 0 added lines, 27 removed lines.
Original line number Diff line number Diff line 
*.o

*.lo

*.la

*.stamp

*.stamp-t

.deps

.dirstamp

.libs

ABOUT-NLS

Makefile

Makefile.in

aclocal.m4

autom4te.cache

build-aux

config.*

configure

lib/mlm/*.[ch]

libtool

m4

man/*.1

man/*.html

src/*/*.c

src/mlm-*

stamp-h1

stamp-it

vapi/mlm.vapi

po/POTFILES

Makefile.am

+14 −3
Changes for Makefile.am: 14 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -239,14 +239,25 @@ src/application/resources.c: $(gresource_file) $(resource_files) 
		--sourcedir=$(top_srcdir)/data			\

		--generate-source $<



# ====== Desktop files

# ====== Desktop file

MSGFMT_DESKTOP_OPTIONS =						\

	--keyword=GenericName						\

	--keyword=Comment



data_desktopdir = $(datadir)/applications

data_desktop_DATA = data/mlm.desktop

mlm_desktop_in_file = $(top_srcdir)/data/mlm.desktop.in

data/mlm.desktop: $(mlm_desktop_in_file)

	$(AM_V_GEN)$(MSGFMT) $(MSGFMT_DESKTOP_OPTIONS) 			\

		--desktop --template $< 				\

		-d $(top_srcdir)/po -o $@



desktopdir = $(datadir)/applications

desktop_DATA = data/mlm.desktop



# ====== Icons

data_iconsdir = $(datadir)/icons/hicolor/scalable/apps

data_icons_DATA = data/mlm.svg



# ====== Extra files

noinst_DATA =							\

	vapi/config.vapi					\

	vapi/id3tag.vapi					\

data/meson.build

0 → 100644
+12 −0
Changes for data/meson.build: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line 
msgfmt = find_program('msgfmt')

podir = join_paths(meson.source_root(), 'po')



custom_target(

  'desktop-file',

  input: 'mlm.desktop.in',

  output: 'mlm.desktop',

  install: true,

  install_dir: join_paths(get_option('datadir'), 'applications'),

  command: [msgfmt, '--desktop', '--template', '@INPUT@',

            '-d', podir, '-o', '@OUTPUT@'],

)

data/mlm.desktop→data/mlm.desktop.in

+1 −2
Changes for data/mlm.desktop.in: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ Name=MLM 
GenericName=Music Library Maintainer

Comment=Edit, Normalize and Encode MP3 so the music library is consistent

Exec=mlm-gui %F

Terminal=false

Type=Application

Icon=mlm

Type=Application

Categories=GNOME;GTK;AudioVideo;

MimeType=audio/x-mp3;audio/x-mpeg;audio/mpeg;

data/mlm.ui

+1 −1
Changes for data/mlm.ui: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<interface>

  <requires lib="gtk+" version="3.12"/>

  <requires lib="gtk+" version="3.18"/>

  <object class="GtkListStore" id="genre_model">

    <columns>

      <!-- column-name name -->