Fix new build warnings.

Author: mtwebster

data/meson.build

@@ -62,11 +62,13 @@ mimeFile_translated = custom_target('nemo.xml',
   ],
   install: true,
   install_dir: join_paths(get_option('datadir'), 'mime', 'packages'),
-  build_always: true,
+  build_by_default: true,
 )
 
 ################################################################################
 dataConf = configuration_data()
+dataConf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
+
 rootPolicyFile = configure_file(
   input : 'org.nemo.root.policy.in',
   output: 'org.nemo.root.policy',

data/org.nemo.root.policy.in

@@ -17,7 +17,7 @@
      <allow_inactive>no</allow_inactive>
      <allow_active>auth_admin_keep</allow_active>
    </defaults>
-   <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/nemo</annotate>
+   <annotate key="org.freedesktop.policykit.exec.path">@bindir@/nemo</annotate>
    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
  </action>
 

libnemo-extension/meson.build

@@ -1,10 +1,13 @@
 
+nemo_i18n_header = [
+  'nemo-extension-i18n.h'
+]
+
 nemo_extension_sources = [
   gresources,
   'nemo-column-provider.c',
   'nemo-column.c',
   'nemo-desktop-preferences.c',
-  'nemo-extension-i18n.h',
   'nemo-extension-private.h',
   'nemo-file-info.c',
   'nemo-info-provider.c',
@@ -40,7 +43,7 @@ nemo_extension_incdir = include_directories('.')
 nemo_extension_deps = [ glib, gtk ]
 
 nemo_extension_lib = shared_library('nemo-extension',
-  nemo_extension_sources,
+  nemo_extension_sources + nemo_i18n_header,
   dependencies: nemo_extension_deps,
   include_directories: [ rootInclude, ],
   install: true,

src/nemo-open-with-main.c

@@ -123,8 +123,8 @@ main (int argc, char *argv[])
 
 	nemo_global_preferences_init ();
 
-    const gchar *uri, *basename;
-    gchar *mime_type;
+    const gchar *uri;
+    gchar *mime_type, *basename;
 
     uri = argv[1];