Commit 4cf9d645 authored by Paolo Bacchilega's avatar Paolo Bacchilega

meson files: removed trailing spaces

parent e80cbf60
......@@ -27,7 +27,7 @@ gschema_files = files(
enums_schema = custom_target('enums_schema',
output : 'org.gnome.gthumb.enums.xml',
command : [
command : [
find_program('make-enums.py'),
join_paths(meson.source_root(), 'gthumb'),
join_paths(meson.source_root(), 'extensions'),
......
......@@ -4,7 +4,7 @@ install_man('gthumb.1')
# .desktop file
desktop_data = configuration_data()
desktop_data.set('VERSION', meson.project_version())
desktop_data.set('VERSION', meson.project_version())
desktop_in_file = configure_file(
input : 'org.gnome.gThumb.desktop.in.in',
output : 'org.gnome.gThumb.desktop.in',
......@@ -30,7 +30,7 @@ gthumb_pc = pkg.generate(
subdirs : 'gthumb-@0@'.format(api_version),
requires : [ 'gtk+-3.0' ],
version: meson.project_version(),
variables : [
variables : [
'extensionsdir=${libdir}/gthumb/extensions',
'datarootdir=${prefix}/share',
'datadir=${datarootdir}'
......
......@@ -5,12 +5,12 @@ source_files = files(
'main.c'
)
shared_module('23hq',
shared_module('23hq',
sources : source_files,
dependencies : [
extension_common_deps,
libsoup_dep,
use_libsecret ? libsecret_dep : [],
use_libsecret ? libsecret_dep : [],
],
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
......
......@@ -10,7 +10,7 @@ source_files = files(
gresource_files = gnome.compile_resources('bookmarks-resources', 'resources.xml', c_name : 'gth')
shared_module('bookmarks',
shared_module('bookmarks',
sources : [ source_files, gresource_files ],
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -6,7 +6,7 @@ source_files = files(
'main.c'
)
shared_module('burn_disc',
shared_module('burn_disc',
sources : source_files,
dependencies : [ extension_common_deps, libbrasero_dep ],
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -24,15 +24,15 @@ endif
enum_files = gnome.mkenums_simple('cairo-io-enum-types', sources: [ 'preferences.h' ])
shared_module('cairo_io',
shared_module('cairo_io',
sources : [ source_files, enum_files ],
dependencies : [
extension_common_deps,
dependencies : [
extension_common_deps,
jpeg_deps,
use_libtiff ? tiff_deps : [],
use_librsvg ? librsvg_dep : [],
use_libwebp ? libwebp_dep : []
],
use_libwebp ? libwebp_dep : []
],
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
link_with : jpeg_utils_mod,
......
......@@ -10,7 +10,7 @@ source_files = files(
'main.c'
)
catalogs_mod = shared_module('catalogs',
catalogs_mod = shared_module('catalogs',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -7,7 +7,7 @@ source_files = files(
'main.c'
)
shared_module('change_date',
shared_module('change_date',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -8,7 +8,7 @@ source_files = files(
'main.c'
)
shared_module('comments',
shared_module('comments',
sources : source_files,
dependencies : [ extension_common_deps ],
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -22,7 +22,7 @@ source_files = files(
'main.c'
)
shared_module('contact_sheet',
shared_module('contact_sheet',
sources : [ source_files, enum_files ],
dependencies : [ extension_common_deps, gstreamer_deps ],
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -6,7 +6,7 @@ source_files = files(
'main.c'
)
shared_module('convert_format',
shared_module('convert_format',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -4,7 +4,7 @@ source_files = files(
'main.c'
)
shared_module('desktop_background',
shared_module('desktop_background',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
subdir('ui')
\ No newline at end of file
subdir('ui')
ui_files = files(
'edit-comment-page.ui',
'edit-comment-page.ui',
'tag-chooser.ui'
)
install_data(ui_files, install_dir : ui_install_dir)
......@@ -12,9 +12,9 @@ source_files = files(
'utils.c'
)
edit_metadata_mod = shared_module('edit_metadata',
edit_metadata_mod = shared_module('edit_metadata',
sources : source_files,
dependencies : extension_common_deps,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
install : true,
......
......@@ -5,9 +5,9 @@ source_files = files(
'main.c'
)
exiv2_tools_mod = shared_module('exiv2_tools',
exiv2_tools_mod = shared_module('exiv2_tools',
sources : source_files,
dependencies : [ extension_common_deps, exiv2_dep ],
dependencies : [ extension_common_deps, exiv2_dep ],
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
link_with : [ edit_metadata_mod ],
......
......@@ -5,7 +5,7 @@ source_files = files(
gresource_files = gnome.compile_resources('export-tools-resources', 'resources.xml', c_name : 'gth')
export_tools_mod = shared_module('export_tools',
export_tools_mod = shared_module('export_tools',
sources : [ source_files, gresource_files ],
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -10,7 +10,7 @@ source_files = files(
'main.c'
)
shared_module('facebook',
shared_module('facebook',
sources : source_files,
dependencies : [
extension_common_deps,
......@@ -18,12 +18,12 @@ shared_module('facebook',
libsoup_dep,
libjson_glib_dep,
webkit2_dep,
use_libsecret ? libsecret_dep : [],
use_libsecret ? libsecret_dep : [],
],
include_directories : [
config_inc,
include_directories : [
config_inc,
gthumb_inc,
importer_inc
importer_inc
],
c_args : c_args,
link_with : [
......
......@@ -7,7 +7,7 @@ source_files = files(
'main.c'
)
shared_module('file_manager',
shared_module('file_manager',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -74,12 +74,12 @@ source_files = files(
'main.c'
)
file_tools_mod = shared_module('file_tools',
file_tools_mod = shared_module('file_tools',
sources : [ source_files, enum_files ],
dependencies : extension_common_deps,
include_directories : [
config_inc,
gthumb_inc
dependencies : extension_common_deps,
include_directories : [
config_inc,
gthumb_inc
],
c_args : c_args,
link_with : image_viewer_mod,
......
......@@ -3,7 +3,7 @@ source_files = files(
'main.c'
)
shared_module('file_viewer',
shared_module('file_viewer',
sources : [ source_files ],
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -7,7 +7,7 @@ source_files = files(
'main.c'
)
shared_module('find_duplicates',
shared_module('find_duplicates',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -5,16 +5,16 @@ source_files = files(
'main.c'
)
shared_module('flicker',
shared_module('flicker',
sources : source_files,
dependencies : [
extension_common_deps,
importer_dep,
libsoup_dep,
use_libsecret ? libsecret_dep : [],
use_libsecret ? libsecret_dep : [],
],
include_directories : [
config_inc,
include_directories : [
config_inc,
gthumb_inc,
importer_inc
],
......
......@@ -10,18 +10,18 @@ source_files = files(
'main.c'
)
flicker_utils_mod = shared_module('flicker_utils',
flicker_utils_mod = shared_module('flicker_utils',
sources : source_files,
dependencies : [
extension_common_deps,
importer_dep,
libsoup_dep,
use_libsecret ? libsecret_dep : [],
use_libsecret ? libsecret_dep : [],
],
include_directories : [
config_inc,
include_directories : [
config_inc,
gthumb_inc,
importer_inc
importer_inc
],
c_args : c_args,
link_with : [
......
subdir('ui')
\ No newline at end of file
subdir('ui')
ui_files = files(
'mediabar.ui',
'mediabar.ui',
'media-viewer-preferences.ui'
)
install_data(ui_files, install_dir : ui_install_dir)
......@@ -6,7 +6,7 @@ source_files = files(
'main.c'
)
shared_module('gstreamer_tools',
shared_module('gstreamer_tools',
sources : source_files,
dependencies : [ extension_common_deps, gstreamer_deps ],
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -3,7 +3,7 @@ source_files = files(
'main.c'
)
gstreamer_utils_mod = shared_module('gstreamer_utils',
gstreamer_utils_mod = shared_module('gstreamer_utils',
sources : source_files,
dependencies : [ extension_common_deps, gstreamer_deps ],
include_directories : [ config_inc, gthumb_inc ],
......
ui_files = files(
'print-layout.ui',
'print-layout.ui',
'print-preferences.ui'
)
install_data(ui_files, install_dir : ui_install_dir)
......@@ -8,7 +8,7 @@ source_files = files(
'main.c'
)
shared_module('image_print',
shared_module('image_print',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -7,7 +7,7 @@ source_files = files(
'rotation-utils.c'
)
image_rotation_mod = shared_module('image_rotation',
image_rotation_mod = shared_module('image_rotation',
sources : source_files,
dependencies : [ extension_common_deps, jpeg_deps ],
include_directories : [ config_inc, gthumb_inc ],
......
subdir('ui')
\ No newline at end of file
subdir('ui')
......@@ -167,7 +167,7 @@ _gth_image_preloader_get_requested_size_for_next_images (GthImageViewerPage *sel
requested_size = -1;
break;
default:
requested_size = get_viewer_size (self);
requested_size = (int) floor ((double) get_viewer_size (self) * 0.5);
break;
}
......
......@@ -11,9 +11,9 @@ source_files = files(
gresource_files = gnome.compile_resources('image-viewer-resources', 'resources.xml', c_name : 'gth')
image_viewer_mod = shared_module('image_viewer',
image_viewer_mod = shared_module('image_viewer',
sources : [ source_files, gresource_files ],
dependencies : extension_common_deps,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
link_with : jpeg_utils_mod,
......
ui_files = files(
'import-preferences.ui'
)
install_data(ui_files, install_dir : ui_install_dir)
\ No newline at end of file
install_data(ui_files, install_dir : ui_install_dir)
......@@ -16,13 +16,13 @@ header_files = [
enum_files = gnome.mkenums_simple('gth-import-enum-types', sources: header_files)
importer_mod = shared_module('importer',
importer_mod = shared_module('importer',
sources : [ source_files, enum_files ],
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
link_with : [
catalogs_mod,
catalogs_mod,
image_rotation_mod,
use_exiv2 ? exiv2_tools_mod : []
],
......
......@@ -12,11 +12,11 @@ else
source_files += files('transupp-62.c')
endif
jpeg_utils_mod = shared_module('jpeg_utils',
jpeg_utils_mod = shared_module('jpeg_utils',
sources : source_files,
dependencies : [
extension_common_deps,
jpeg_deps
dependencies : [
extension_common_deps,
jpeg_deps
],
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
......
......@@ -11,7 +11,7 @@ source_files = files(
gresource_files = gnome.compile_resources('list-tools-resources', 'resources.xml', c_name : 'gth')
list_tools_mod = shared_module('list_tools',
list_tools_mod = shared_module('list_tools',
sources : [ source_files, gresource_files ],
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -3,7 +3,7 @@ source_files = files(
'main.c'
)
shared_module('map_view',
shared_module('map_view',
sources : source_files,
dependencies : [ extension_common_deps, libchamplain_deps ],
include_directories : [ config_inc, gthumb_inc ],
......
extension_data = configuration_data()
extension_data.set('GTHUMB_VERSION', meson.project_version())
extension_data.set('GTHUMB_VERSION', meson.project_version())
extension_data.set('GTHUMB_API_VERSION', api_version)
extension_common_deps = [ common_deps, gthumb_h_dep ]
......@@ -28,9 +28,9 @@ subdir('convert_format')
subdir('rename_series')
subdir('resize_images')
# importers
# importers
subdir('photo_importer')
# exporters
subdir('export_tools')
if use_libbrasero
......@@ -39,7 +39,7 @@ endif
subdir('contact_sheet')
if with_webservices
subdir('oauth')
subdir('facebook')
subdir('facebook')
# flickr exporters
subdir('flicker_utils')
......
......@@ -10,14 +10,14 @@ source_files = files(
'web-service.c'
)
oauth_mod = shared_module('oauth',
oauth_mod = shared_module('oauth',
sources : source_files,
dependencies : [
extension_common_deps,
jpeg_deps,
libsoup_dep,
webkit2_dep,
use_libsecret ? libsecret_dep : [],
use_libsecret ? libsecret_dep : [],
],
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
......
......@@ -8,22 +8,22 @@ source_files = files(
gresource_files = gnome.compile_resources('photo-importer-resources', 'resources.xml', c_name : 'gth')
photo_importer_mod = shared_module('photo_importer',
photo_importer_mod = shared_module('photo_importer',
sources : [ source_files, gresource_files ],
dependencies : [
extension_common_deps,
importer_dep
],
include_directories : [
config_inc,
include_directories : [
config_inc,
gthumb_inc,
importer_inc
],
c_args : c_args,
link_with : [
catalogs_mod,
link_with : [
catalogs_mod,
importer_mod,
image_rotation_mod,
image_rotation_mod,
],
install : true,
install_dir : extensions_install_dir,
......
......@@ -11,17 +11,17 @@ source_files = files(
'picasa-web-service.c'
)
shared_module('picasaweb',
shared_module('picasaweb',
sources : source_files,
dependencies : [
extension_common_deps,
importer_dep,
libsoup_dep,
libjson_glib_dep,
use_libsecret ? libsecret_dep : [],
use_libsecret ? libsecret_dep : [],
],
include_directories : [
config_inc,
include_directories : [
config_inc,
gthumb_inc,
importer_inc
],
......
......@@ -3,7 +3,7 @@ source_files = files(
'gth-metadata-provider-raw.c'
)
shared_module('raw_files',
shared_module('raw_files',
sources : source_files,
dependencies : [ extension_common_deps, libraw_dep ],
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -3,21 +3,21 @@ source_files = files(
'main.c'
)
shared_module('red_eye_removal',
shared_module('red_eye_removal',
sources : source_files,
dependencies : [
dependencies : [
extension_common_deps,
file_tools_dep
file_tools_dep
],
include_directories : [
config_inc,
include_directories : [
config_inc,
gthumb_inc,
file_tools_inc
],
c_args : c_args,
link_with: [
file_tools_mod,
image_viewer_mod
file_tools_mod,
image_viewer_mod
],
install : true,
install_dir : extensions_install_dir,
......
......@@ -8,7 +8,7 @@ source_files = files(
'main.c'
)
shared_module('rename_series',
shared_module('rename_series',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -6,7 +6,7 @@ source_files = files(
'main.c'
)
shared_module('resize_images',
shared_module('resize_images',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -8,7 +8,7 @@ source_files = files(
'main.c'
)
shared_module('search',
shared_module('search',
sources : [ source_files, gresource_files ],
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
......
......@@ -293,6 +293,7 @@ _gth_selections_manager_for_each_selection (gpointer user_data)
}