[nautilus/wip/exalm/libhandy: 1/4] Add libhandy-1 dep
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/exalm/libhandy: 1/4] Add libhandy-1 dep
- Date: Tue, 8 Sep 2020 22:04:23 +0000 (UTC)
commit f67e124d1825e52b0092dac60358ecaf4bf4ec95
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Wed Sep 9 00:18:22 2020 +0500
Add libhandy-1 dep
build-aux/flatpak/org.gnome.Nautilus.json | 18 ++++++++++++++++++
build-aux/flatpak/org.gnome.Nautilus.yml | 12 ++++++++++++
build-aux/flatpak/org.gnome.NautilusMaster.yml | 12 ++++++++++++
meson.build | 1 +
src/meson.build | 1 +
src/nautilus-application.c | 3 +++
6 files changed, 47 insertions(+)
---
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index 8956d6b68..d7d5ee5dd 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -107,6 +107,24 @@
}
]
},
+ {
+ "name" : "libhandy",
+ "buildsystem" : "meson",
+ "config-opts" : [
+ "-Dexamples=false",
+ "-Dglade_catalog=disabled",
+ "-Dintrospection=disabled",
+ "-Dtests=false",
+ "-Dvapi=false"
+ ],
+ "sources" : [
+ {
+ "type" : "git",
+ "url" : "https://gitlab.gnome.org/exalm/libhandy.git",
+ "branch" : "tabs"
+ }
+ ]
+ },
{
"buildsystem": "meson",
"builddir": true,
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index 7add949f5..8f95ece01 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -76,6 +76,18 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/gnome-autoar.git
+- name: libhandy
+ buildsystem: meson
+ confir-opts:
+ - "-Dexamples=false"
+ - "-Dglade_catalog=disabled"
+ - "-Dintrospection=disabled"
+ - "-Dtests=false"
+ - "-Dvapi=false"
+ sources:
+ - type: git
+ url: https://gitlab.gnome.org/exalm/libhandy.git
+ branch: tabs
- buildsystem: meson
builddir: true
name: nautilus
diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml
index b467e6c40..6f9ca0530 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -75,6 +75,18 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/gnome-autoar.git
+- name: libhandy
+ buildsystem: meson
+ confir-opts:
+ - "-Dexamples=false"
+ - "-Dglade_catalog=disabled"
+ - "-Dintrospection=disabled"
+ - "-Dtests=false"
+ - "-Dvapi=false"
+ sources:
+ - type: git
+ url: https://gitlab.gnome.org/exalm/libhandy.git
+ branch: tabs
- buildsystem: meson
builddir: true
name: nautilus
diff --git a/meson.build b/meson.build
index 376d54610..ed96ad844 100644
--- a/meson.build
+++ b/meson.build
@@ -120,6 +120,7 @@ gmodule = dependency('gmodule-no-export-2.0', version: glib_ver)
gnome_autoar = dependency('gnome-autoar-0', version: '>= 0.2.1')
gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0')
gtk = dependency('gtk+-3.0', version: '>= 3.22.27')
+libhandy = dependency('libhandy-1', version: '>= 1.0')
selinux = []
if get_option('selinux')
selinux = dependency('libselinux', version: '>= 2.0')
diff --git a/src/meson.build b/src/meson.build
index 51cdb06f8..cbc9ab15e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -283,6 +283,7 @@ nautilus_deps = [
gnome_autoar,
gnome_desktop,
libgd_dep,
+ libhandy,
nautilus_extension,
selinux,
tracker_sparql,
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 10478da9c..9f7445407 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -34,6 +34,7 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
+#include <handy.h>
#include <nautilus-extension.h>
#include <sys/stat.h>
#include <sys/types.h>
@@ -1326,6 +1327,8 @@ nautilus_application_startup_common (NautilusApplication *self)
*/
G_APPLICATION_CLASS (nautilus_application_parent_class)->startup (G_APPLICATION (self));
+ hdy_init ();
+
gtk_window_set_default_icon_name (APPLICATION_ID);
setup_theme_extensions ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]