seahorse-nautilus/repos/extra-x86_64/1.patch

   1 From aaa6af5f6249fc1e25c6913bb4dfe2561fda4a40 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
   3 Date: Thu, 13 Dec 2018 22:08:12 +0100
   4 Subject: [PATCH] Fix UI files usage
   5
   6 This was incomplete in the meson port.
   7 ---
   8  meson.build            | 2 --
   9  tool/meson.build       | 2 +-
  10  tool/seahorse-widget.c | 4 ++--
  11  3 files changed, 3 insertions(+), 5 deletions(-)
  12
  13 diff --git a/meson.build b/meson.build
  14 index 2fe05ee..7af175a 100644
  15 --- a/meson.build
  16 +++ b/meson.build
  17 @@ -19,7 +19,6 @@ po_dir = join_paths(meson.source_root(), 'po')
  18  datadir = join_paths(seahorse_nautilus_prefix, get_option('datadir'))
  19  bindir = join_paths(seahorse_nautilus_prefix, get_option('bindir'))
  20  localedir = join_paths(seahorse_nautilus_prefix, get_option('localedir'))
  21 -uidir = join_paths(datadir, 'seahorse-nautilus', 'ui')
  22  config_h_dir = include_directories('.')
  23
  24  # Dependencies
  25 @@ -75,7 +74,6 @@ conf.set_quoted('G_LOG_DOMAIN', meson.project_name())
  26  conf.set_quoted('DATA_DIR', datadir)
  27  conf.set_quoted('LOCALEDIR', localedir)
  28  conf.set_quoted('GNOMELOCALEDIR', localedir)
  29 -conf.set_quoted('SEAHORSE_UIDIR', uidir)
  30  conf.set('HAVE_LIBNOTIFY', libnotify_enabled)
  31  config_file = configure_file(
  32    output: 'config.h',
  33 diff --git a/tool/meson.build b/tool/meson.build
  34 index b2e4194..7791305 100644
  35 --- a/tool/meson.build
  36 +++ b/tool/meson.build
  37 @@ -43,7 +43,7 @@ seahorse_tool_cflags = [
  38  ]
  39
  40  seahorse_tool = executable('seahorse-tool',
  41 -  seahorse_tool_sources,
  42 +  seahorse_tool_sources, resources,
  43    dependencies: seahorse_tool_dependencies,
  44    c_args: seahorse_tool_cflags,
  45    include_directories: config_h_dir,
  46 diff --git a/tool/seahorse-widget.c b/tool/seahorse-widget.c
  47 index 57e0117..1955823 100644
  48 --- a/tool/seahorse-widget.c
  49 +++ b/tool/seahorse-widget.c
  50 @@ -204,9 +204,9 @@ object_set_property (GObject *object, guint prop_id, const GValue *value, GParam
  51          g_return_if_fail (swidget->name == NULL);
  52          swidget->name = g_value_dup_string (value);
  53          path = g_strdup_printf ("%sseahorse-%s.ui",
  54 -                                SEAHORSE_UIDIR, swidget->name);
  55 +                                "/org/gnome/Seahorse/", swidget->name);
  56          swidget->gtkbuilder = gtk_builder_new ();
  57 -        gtk_builder_add_from_file (swidget->gtkbuilder, path, &error);
  58 +        gtk_builder_add_from_resource (swidget->gtkbuilder, path, &error);
  59          if (error != NULL) {
  60              g_warning ("couldn't load ui file: %s", error->message);
  61              g_error_free (error);
  62 --
  63 2.24.1
  64