[gnome-dictionary: 12/12] Merge branch 'ebassi/for-master' into 'master'




commit 6eba02af8bfbe11170c53ea2d91222fc8e10e03a
Merge: b6a5803 9e6aa4f
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Mon Sep 21 21:12:37 2020 +0000

    Merge branch 'ebassi/for-master' into 'master'
    
    Ebassi/for master
    
    See merge request GNOME/gnome-dictionary!12

 .gitlab-ci.yml                                     |  33 +++++++
 build-aux/flatpak/org.gnome.Dictionary.json        |  40 ++++++++
 build-aux/meson/post-install.py                    |  15 +++
 build-aux/post-install.sh                          |  10 --
 data/icons/meson.build                             |  20 ++--
 data/icons/scalable/org.gnome.Dictionary.Devel.svg |  98 +++++++++++++++++++
 data/meson.build                                   | 106 ++++++++++++---------
 ...l.in => org.gnome.Dictionary.appdata.xml.in.in} |   6 +-
 ...sktop.in => org.gnome.Dictionary.desktop.in.in} |   2 +-
 data/org.gnome.Dictionary.json                     |  44 ---------
 data/org.gnome.Dictionary.service.in               |   2 +-
 gnome-dictionary.doap                              |  23 +----
 help/meson.build                                   |  53 ++++++-----
 libgdict/gdict-client-context.c                    |  20 ++--
 libgdict/gdict-context.c                           |   2 -
 libgdict/gdict-database-chooser-button.c           |   2 -
 libgdict/gdict-database-chooser.c                  |  16 +---
 libgdict/gdict-defbox.c                            |   2 -
 libgdict/gdict-source-chooser.c                    |   2 -
 libgdict/gdict-source-loader.c                     |  44 ++-------
 libgdict/gdict-source.c                            |  34 ++-----
 libgdict/gdict-speller.c                           |   2 -
 libgdict/gdict-strategy-chooser.c                  |   2 -
 libgdict/gdict-utils.c                             |   2 -
 libgdict/meson.build                               |  53 +++++------
 meson.build                                        |  63 +++++++-----
 meson_options.txt                                  |   1 +
 po/POTFILES.in                                     |   4 +-
 src/gdict-about.c                                  |  33 +++----
 src/gdict-app.c                                    |   6 +-
 src/gdict-common.c                                 |  12 ++-
 src/gdict-common.h                                 |   4 +-
 src/gdict-pref-dialog.c                            |   2 -
 src/gdict-print.c                                  |   2 -
 src/gdict-sidebar.c                                |  10 +-
 src/gdict-source-dialog.c                          |   2 -
 src/main.c                                         |   2 +-
 src/meson.build                                    |  54 +++++------
 38 files changed, 451 insertions(+), 377 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]