[gnome-software] trivial: Don't add a non-existent icon search path
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] trivial: Don't add a non-existent icon search path
- Date: Sat, 28 Jan 2017 17:00:09 +0000 (UTC)
commit 2405ca115ddeb2ee18106d2ab4bc5c17e1fa7679
Author: Kalev Lember <klember redhat com>
Date: Fri Jan 27 16:32:07 2017 +0100
trivial: Don't add a non-existent icon search path
meson.build | 4 ----
src/Makefile.am | 3 +--
src/gs-shell.c | 4 ----
3 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/meson.build b/meson.build
index 28b57a4..1ea1686 100644
--- a/meson.build
+++ b/meson.build
@@ -172,10 +172,6 @@ conf.set_quoted('SYSCONFDIR',
conf.set_quoted('LOCALSTATEDIR',
join_paths(get_option('prefix'),
get_option('localstatedir')))
-conf.set_quoted('GS_DATA',
- join_paths(get_option('prefix'),
- get_option('datadir'),
- 'gnome-software'))
configure_file(
output : 'config.h',
configuration : conf
diff --git a/src/Makefile.am b/src/Makefile.am
index 2d9955b..7ace0d5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,8 +22,7 @@ AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\" \
-DLOCALSTATEDIR=\""$(localstatedir)"\" \
-DTESTDATADIR=\""$(top_srcdir)/data"\" \
- -DLOCALPLUGINDIR=\""$(top_builddir)/src/plugins/.libs"\" \
- -DGS_DATA=\"$(pkgdatadir)\"
+ -DLOCALPLUGINDIR=\""$(top_builddir)/src/plugins/.libs"\"
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnome-software.pc
diff --git a/src/gs-shell.c b/src/gs-shell.c
index 734bf2a..323beb7 100644
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@ -1594,10 +1594,6 @@ gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *can
g_signal_connect (priv->main_window, "map",
G_CALLBACK (gs_shell_main_window_mapped_cb), shell);
- /* add application specific icons to search path */
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- GS_DATA G_DIR_SEPARATOR_S "icons");
-
g_signal_connect (priv->main_window, "delete-event",
G_CALLBACK (main_window_closed_cb), shell);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]