[gnome-packagekit] trivial: Use the standard PKGDATADIR
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-packagekit] trivial: Use the standard PKGDATADIR
- Date: Tue, 6 Dec 2016 19:54:17 +0000 (UTC)
commit 78b4af25700674325eee2daa32290cfd9c50ccc6
Author: Richard Hughes <richard hughsie com>
Date: Tue Dec 6 19:46:54 2016 +0000
trivial: Use the standard PKGDATADIR
src/Makefile.am | 2 +-
src/gpk-application.c | 2 +-
src/gpk-log.c | 2 +-
src/gpk-prefs.c | 2 +-
src/gpk-update-viewer.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index ff3affe..b20e15a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ AM_CPPFLAGS = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DLOCALEDIR=\""$(localedir)"\" \
-DVERSION="\"$(VERSION)\"" \
- -DGPK_DATA=\"$(pkgdatadir)\" \
+ -DPKGDATADIR=\"$(pkgdatadir)\" \
-DG_LOG_DOMAIN=\"GnomePackageKit\"
bin_PROGRAMS = \
diff --git a/src/gpk-application.c b/src/gpk-application.c
index b5b63db..a824747 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -2737,7 +2737,7 @@ gpk_application_startup_cb (GtkApplication *application, GpkApplicationPrivate *
/* add application specific icons to search path */
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- GPK_DATA G_DIR_SEPARATOR_S "icons");
+ PKGDATADIR G_DIR_SEPARATOR_S "icons");
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
"/usr/share/PackageKit/icons");
diff --git a/src/gpk-log.c b/src/gpk-log.c
index c9cbba1..db11eb6 100644
--- a/src/gpk-log.c
+++ b/src/gpk-log.c
@@ -706,7 +706,7 @@ main (int argc, char *argv[])
/* add application specific icons to search path */
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- GPK_DATA G_DIR_SEPARATOR_S "icons");
+ PKGDATADIR G_DIR_SEPARATOR_S "icons");
/* are we already activated? */
application = gtk_application_new ("org.freedesktop.PackageKit.LogViewer", 0);
diff --git a/src/gpk-prefs.c b/src/gpk-prefs.c
index 12ecfa2..239dfbf 100644
--- a/src/gpk-prefs.c
+++ b/src/gpk-prefs.c
@@ -453,7 +453,7 @@ gpk_pack_startup_cb (GtkApplication *application, GpkPrefsPrivate *priv)
/* add application specific icons to search path */
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- GPK_DATA G_DIR_SEPARATOR_S "icons");
+ PKGDATADIR G_DIR_SEPARATOR_S "icons");
/* get actions */
control = pk_control_new ();
diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
index 5d76a7f..be764e2 100644
--- a/src/gpk-update-viewer.c
+++ b/src/gpk-update-viewer.c
@@ -2943,7 +2943,7 @@ main (int argc, char *argv[])
/* add application specific icons to search path */
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- GPK_DATA G_DIR_SEPARATOR_S "icons");
+ PKGDATADIR G_DIR_SEPARATOR_S "icons");
/* TRANSLATORS: title to pass to the user if there are not enough privs */
ret = gpk_check_privileged_user (_("Package Updater"), TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]