GNOME.org
 

[gnome-packagekit] Ship the .ui files as GResources

commit f8f43265508221cab03732973cf306ec38adc31e
Author: Richard Hughes <richard hughsie com>
Date:   Tue Jul 19 09:56:04 2016 +0100

    Ship the .ui files as GResources

 contrib/gnome-packagekit.spec.in    |    8 -----
 data/Makefile.am                    |   12 --------
 po/POTFILES.in                      |   16 +++++-----
 src/Makefile.am                     |   53 +++++++++++++++++++++++++++++++++++
 src/gpk-application.c               |    4 ++-
 src/gpk-application.gresource.xml   |   10 ++++++
 {data => src}/gpk-application.ui    |    0
 {data => src}/gpk-client.ui         |    0
 src/gpk-error.c                     |    4 ++-
 {data => src}/gpk-error.ui          |    0
 {data => src}/gpk-eula.ui           |    0
 src/gpk-log.c                       |    4 ++-
 src/gpk-log.gresource.xml           |    6 ++++
 {data => src}/gpk-log.ui            |    0
 src/gpk-prefs.c                     |    4 ++-
 src/gpk-prefs.gresource.xml         |    6 ++++
 {data => src}/gpk-prefs.ui          |    0
 {data => src}/gpk-signature.ui      |    0
 src/gpk-task.c                      |   12 ++++++--
 src/gpk-update-viewer.c             |    4 ++-
 src/gpk-update-viewer.gresource.xml |   10 ++++++
 {data => src}/gpk-update-viewer.ui  |    0
 22 files changed, 117 insertions(+), 36 deletions(-)
---
diff --git a/contrib/gnome-packagekit.spec.in b/contrib/gnome-packagekit.spec.in
index a6c92f3..8965e69 100644
--- a/contrib/gnome-packagekit.spec.in
+++ b/contrib/gnome-packagekit.spec.in
@@ -112,12 +112,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_bindir}/gpk-log
 %{_bindir}/gpk-prefs
 %dir %{_datadir}/gnome-packagekit
-%{_datadir}/gnome-packagekit/gpk-client.ui
-%{_datadir}/gnome-packagekit/gpk-error.ui
-%{_datadir}/gnome-packagekit/gpk-eula.ui
-%{_datadir}/gnome-packagekit/gpk-log.ui
-%{_datadir}/gnome-packagekit/gpk-prefs.ui
-%{_datadir}/gnome-packagekit/gpk-signature.ui
 %dir %{_datadir}/gnome-packagekit/icons
 %dir %{_datadir}/gnome-packagekit/icons/hicolor
 %dir %{_datadir}/gnome-packagekit/icons/hicolor/*
@@ -138,14 +132,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_bindir}/gpk-application
 %{_datadir}/appdata/org.gnome.Packages.appdata.xml
 %{_datadir}/applications/org.gnome.Packages.desktop
-%{_datadir}/gnome-packagekit/gpk-application.ui
 %{_datadir}/man/man1/gpk-application.1*
 
 %files updater
 %{_bindir}/gpk-update-viewer
 %{_datadir}/appdata/org.gnome.PackageUpdater.appdata.xml
 %{_datadir}/applications/org.gnome.PackageUpdater.desktop
-%{_datadir}/gnome-packagekit/gpk-update-viewer.ui
 %{_datadir}/man/man1/gpk-update-viewer.1*
 
 %changelog
diff --git a/data/Makefile.am b/data/Makefile.am
index ef5d923..e8ececa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -19,17 +19,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
-pkgdata_DATA =                                         \
-       gpk-eula.ui                                     \
-       gpk-application.ui                              \
-       gpk-update-viewer.ui                            \
-       gpk-prefs.ui                                    \
-       gpk-signature.ui                                \
-       gpk-error.ui                                    \
-       gpk-log.ui                                      \
-       gpk-client.ui                                   \
-       $(NULL)
-
 @GSETTINGS_RULES@
 gsettings_SCHEMAS = org.gnome.packagekit.gschema.xml
 
@@ -37,7 +26,6 @@ EXTRA_DIST =                                          \
        $(gsettings_SCHEMAS)                            \
        $(autostart_in_files)                           \
        $(desktop_in_files)                             \
-       $(pkgdata_DATA)                                 \
        $(service_in_files)                             \
        $(NULL)
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index be2b7a4..b4701ac 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,18 +4,18 @@
 data/appdata/org.gnome.Packages.appdata.xml.in
 data/appdata/org.gnome.PackageUpdater.appdata.xml.in
 data/org.gnome.Packages.desktop.in
-[type: gettext/glade]data/gpk-application.ui
-[type: gettext/glade]data/gpk-client.ui
-[type: gettext/glade]data/gpk-error.ui
-[type: gettext/glade]data/gpk-eula.ui
+[type: gettext/glade]src/gpk-application.ui
+[type: gettext/glade]src/gpk-client.ui
+[type: gettext/glade]src/gpk-error.ui
+[type: gettext/glade]src/gpk-eula.ui
 data/gpk-install-local-file.desktop.in
 data/gpk-log.desktop.in
-[type: gettext/glade]data/gpk-log.ui
+[type: gettext/glade]src/gpk-log.ui
 data/gpk-prefs.desktop.in
-[type: gettext/glade]data/gpk-prefs.ui
-[type: gettext/glade]data/gpk-signature.ui
+[type: gettext/glade]src/gpk-prefs.ui
+[type: gettext/glade]src/gpk-signature.ui
 data/org.gnome.PackageUpdater.desktop.in
-[type: gettext/glade]data/gpk-update-viewer.ui
+[type: gettext/glade]src/gpk-update-viewer.ui
 data/org.gnome.packagekit.gschema.xml
 src/gpk-application.c
 src/gpk-common.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 87fc25d..ef4ad38 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,6 +70,8 @@ shared_LIBS =                                         \
 
 gpk_application_SOURCES =                              \
        gpk-application.c                               \
+       gpk-application-resources.c                     \
+       gpk-application-resources.h                     \
        $(NULL)
 
 gpk_application_LDADD =                                        \
@@ -87,6 +89,8 @@ gpk_prefs_SOURCES =                                   \
        gpk-error.c                                     \
        gpk-error.h                                     \
        gpk-prefs.c                                     \
+       gpk-prefs-resources.c                           \
+       gpk-prefs-resources.h                           \
        $(NULL)
 
 gpk_prefs_LDADD =                                      \
@@ -96,6 +100,8 @@ gpk_prefs_LDADD =                                    \
 
 gpk_update_viewer_SOURCES =                            \
        gpk-update-viewer.c                             \
+       gpk-update-viewer-resources.c                   \
+       gpk-update-viewer-resources.h                   \
        gpk-cell-renderer-size.c                        \
        gpk-cell-renderer-size.h                        \
        gpk-cell-renderer-info.c                        \
@@ -111,6 +117,8 @@ gpk_update_viewer_LDADD =                           \
 
 gpk_log_SOURCES =                                      \
        gpk-log.c                                       \
+       gpk-log-resources.c                             \
+       gpk-log-resources.h                             \
        $(NULL)
 
 gpk_log_LDADD =                                                \
@@ -152,6 +160,51 @@ gpk_self_test_CFLAGS = $(AM_CFLAGS)
 TESTS = gpk-self-test
 endif
 
+gpk-application-resources.c: gpk-application.gresource.xml gpk-application.ui
+       glib-compile-resources --target=$@ --generate-source --c-name gpk 
$(srcdir)/gpk-application.gresource.xml
+gpk-application-resources.h: gpk-application.gresource.xml
+       glib-compile-resources --target=$@ --generate-header --c-name gpk 
$(srcdir)/gpk-application.gresource.xml
+
+gpk-log-resources.c: gpk-log.gresource.xml gpk-log.ui
+       glib-compile-resources --target=$@ --generate-source --c-name gpk $(srcdir)/gpk-log.gresource.xml
+gpk-log-resources.h: gpk-log.gresource.xml
+       glib-compile-resources --target=$@ --generate-header --c-name gpk $(srcdir)/gpk-log.gresource.xml
+
+gpk-prefs-resources.c: gpk-prefs.gresource.xml gpk-prefs.ui
+       glib-compile-resources --target=$@ --generate-source --c-name gpk $(srcdir)/gpk-prefs.gresource.xml
+gpk-prefs-resources.h: gpk-prefs.gresource.xml
+       glib-compile-resources --target=$@ --generate-header --c-name gpk $(srcdir)/gpk-prefs.gresource.xml
+
+gpk-update-viewer-resources.c: gpk-update-viewer.gresource.xml gpk-update-viewer.ui
+       glib-compile-resources --target=$@ --generate-source --c-name gpk 
$(srcdir)/gpk-update-viewer.gresource.xml
+gpk-update-viewer-resources.h: gpk-update-viewer.gresource.xml
+       glib-compile-resources --target=$@ --generate-header --c-name gpk 
$(srcdir)/gpk-update-viewer.gresource.xml
+
+BUILT_SOURCES =                                                \
+       gpk-application-resources.c                     \
+       gpk-application-resources.h                     \
+       gpk-log-resources.c                             \
+       gpk-log-resources.h                             \
+       gpk-prefs-resources.c                           \
+       gpk-prefs-resources.h                           \
+       gpk-update-viewer-resources.c                   \
+       gpk-update-viewer-resources.h                   \
+       $(NULL)
+
+EXTRA_DIST =                                           \
+       gpk-application.gresource.xml                   \
+       gpk-application.ui                              \
+       gpk-client.ui                                   \
+       gpk-error.ui                                    \
+       gpk-eula.ui                                     \
+       gpk-log.gresource.xml                           \
+       gpk-log.ui                                      \
+       gpk-prefs.gresource.xml                         \
+       gpk-prefs.ui                                    \
+       gpk-signature.ui                                \
+       gpk-update-viewer.gresource.xml                 \
+       gpk-update-viewer.ui
+
 clean-local:
        rm -f *~
        rm -f *.out
diff --git a/src/gpk-application.c b/src/gpk-application.c
index 84a7476..cc933da 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -2768,7 +2768,9 @@ gpk_application_startup_cb (GtkApplication *application, GpkApplicationPrivate *
 
        /* get UI */
        priv->builder = gtk_builder_new ();
-       retval = gtk_builder_add_from_file (priv->builder, GPK_DATA "/gpk-application.ui", &error);
+       retval = gtk_builder_add_from_resource (priv->builder,
+                                               "/org/gnome/packagekit/gpk-application.ui",
+                                               &error);
        if (retval == 0) {
                g_warning ("failed to load ui: %s", error->message);
                return;
diff --git a/src/gpk-application.gresource.xml b/src/gpk-application.gresource.xml
new file mode 100644
index 0000000..dcc2d85
--- /dev/null
+++ b/src/gpk-application.gresource.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+ <gresource prefix="/org/gnome/packagekit">
+ <file compressed="true">gpk-client.ui</file>
+ <file compressed="true">gpk-error.ui</file>
+ <file compressed="true">gpk-eula.ui</file>
+ <file compressed="true">gpk-signature.ui</file>
+ <file compressed="true">gpk-application.ui</file>
+ </gresource>
+</gresources>
diff --git a/data/gpk-application.ui b/src/gpk-application.ui
similarity index 100%
rename from data/gpk-application.ui
rename to src/gpk-application.ui
diff --git a/data/gpk-client.ui b/src/gpk-client.ui
similarity index 100%
rename from data/gpk-client.ui
rename to src/gpk-client.ui
diff --git a/src/gpk-error.c b/src/gpk-error.c
index b9dd1ec..803f236 100644
--- a/src/gpk-error.c
+++ b/src/gpk-error.c
@@ -68,7 +68,9 @@ gpk_error_dialog_modal_with_time (GtkWindow *window, const gchar *title, const g
 
        /* get UI */
        builder = gtk_builder_new ();
-       retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-error.ui", &error);
+       retval = gtk_builder_add_from_resource (builder,
+                                               "/org/gnome/packagekit/gpk-error.ui",
+                                               &error);
        if (retval == 0) {
                g_warning ("failed to load ui: %s", error->message);
                return FALSE;
diff --git a/data/gpk-error.ui b/src/gpk-error.ui
similarity index 100%
rename from data/gpk-error.ui
rename to src/gpk-error.ui
diff --git a/data/gpk-eula.ui b/src/gpk-eula.ui
similarity index 100%
rename from data/gpk-eula.ui
rename to src/gpk-eula.ui
diff --git a/src/gpk-log.c b/src/gpk-log.c
index 3755c08..b2b5bad 100644
--- a/src/gpk-log.c
+++ b/src/gpk-log.c
@@ -595,7 +595,9 @@ gpk_log_startup_cb (GtkApplication *application, gpointer user_data)
 
        /* get UI */
        builder = gtk_builder_new ();
-       retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-log.ui", &error);
+       retval = gtk_builder_add_from_resource (builder,
+                                               "/org/gnome/packagekit/gpk-log.ui",
+                                               &error);
        if (retval == 0) {
                g_warning ("failed to load ui: %s", error->message);
                goto out;
diff --git a/src/gpk-log.gresource.xml b/src/gpk-log.gresource.xml
new file mode 100644
index 0000000..94eeb57
--- /dev/null
+++ b/src/gpk-log.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+ <gresource prefix="/org/gnome/packagekit">
+ <file compressed="true">gpk-log.ui</file>
+ </gresource>
+</gresources>
diff --git a/data/gpk-log.ui b/src/gpk-log.ui
similarity index 100%
rename from data/gpk-log.ui
rename to src/gpk-log.ui
diff --git a/src/gpk-prefs.c b/src/gpk-prefs.c
index f0b8ac1..35f13ad 100644
--- a/src/gpk-prefs.c
+++ b/src/gpk-prefs.c
@@ -467,7 +467,9 @@ gpk_pack_startup_cb (GtkApplication *application, GpkPrefsPrivate *priv)
                          G_CALLBACK (gpk_prefs_repo_list_changed_cb), priv);
 
        /* get UI */
-       retval = gtk_builder_add_from_file (priv->builder, GPK_DATA "/gpk-prefs.ui", &error);
+       retval = gtk_builder_add_from_resource (priv->builder,
+                                               "/org/gnome/packagekit/gpk-prefs.ui",
+                                               &error);
        if (retval == 0) {
                g_warning ("failed to load ui: %s", error->message);
                return;
diff --git a/src/gpk-prefs.gresource.xml b/src/gpk-prefs.gresource.xml
new file mode 100644
index 0000000..2bce493
--- /dev/null
+++ b/src/gpk-prefs.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+ <gresource prefix="/org/gnome/packagekit">
+ <file compressed="true">gpk-prefs.ui</file>
+ </gresource>
+</gresources>
diff --git a/data/gpk-prefs.ui b/src/gpk-prefs.ui
similarity index 100%
rename from data/gpk-prefs.ui
rename to src/gpk-prefs.ui
diff --git a/data/gpk-signature.ui b/src/gpk-signature.ui
similarity index 100%
rename from data/gpk-signature.ui
rename to src/gpk-signature.ui
diff --git a/src/gpk-task.c b/src/gpk-task.c
index d4245a5..1de6e0f 100644
--- a/src/gpk-task.c
+++ b/src/gpk-task.c
@@ -507,7 +507,9 @@ gpk_task_setup_dialog_untrusted (GpkTask *task)
 
        /* get UI */
        task->priv->builder_untrusted = gtk_builder_new ();
-       retval = gtk_builder_add_from_file (task->priv->builder_untrusted, GPK_DATA "/gpk-error.ui", &error);
+       retval = gtk_builder_add_from_resource (task->priv->builder_untrusted,
+                                               "/org/gnome/packagekit/gpk-error.ui",
+                                               &error);
        if (retval == 0) {
                g_warning ("failed to load ui: %s", error->message);
        }
@@ -549,7 +551,9 @@ gpk_task_setup_dialog_signature (GpkTask *task)
 
        /* get UI */
        task->priv->builder_signature = gtk_builder_new ();
-       retval = gtk_builder_add_from_file (task->priv->builder_signature, GPK_DATA "/gpk-signature.ui", 
&error);
+       retval = gtk_builder_add_from_resource (task->priv->builder_signature,
+                                               "/org/gnome/packagekit/gpk-signature.ui",
+                                               &error);
        if (retval == 0) {
                g_warning ("failed to load ui: %s", error->message);
        }
@@ -578,7 +582,9 @@ gpk_task_setup_dialog_eula (GpkTask *task)
 
        /* get UI */
        task->priv->builder_eula = gtk_builder_new ();
-       retval = gtk_builder_add_from_file (task->priv->builder_eula, GPK_DATA "/gpk-eula.ui", &error);
+       retval = gtk_builder_add_from_resource (task->priv->builder_eula,
+                                               "/org/gnome/packagekit/gpk-eula.ui",
+                                               &error);
        if (retval == 0) {
                g_warning ("failed to load ui: %s", error->message);
        }
diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
index a6d24b6..1d07de5 100644
--- a/src/gpk-update-viewer.c
+++ b/src/gpk-update-viewer.c
@@ -2805,7 +2805,9 @@ gpk_update_viewer_application_startup_cb (GtkApplication *_application, gpointer
 
        /* get UI */
        builder = gtk_builder_new ();
-       retval = gtk_builder_add_from_file (builder, GPK_DATA "/gpk-update-viewer.ui", &error);
+       retval = gtk_builder_add_from_resource (builder,
+                                               "/org/gnome/packagekit/gpk-update-viewer.ui",
+                                               &error);
        if (retval == 0) {
                g_warning ("failed to load ui: %s", error->message);
                return;
diff --git a/src/gpk-update-viewer.gresource.xml b/src/gpk-update-viewer.gresource.xml
new file mode 100644
index 0000000..dd238a0
--- /dev/null
+++ b/src/gpk-update-viewer.gresource.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+ <gresource prefix="/org/gnome/packagekit">
+ <file compressed="true">gpk-client.ui</file>
+ <file compressed="true">gpk-error.ui</file>
+ <file compressed="true">gpk-eula.ui</file>
+ <file compressed="true">gpk-signature.ui</file>
+ <file compressed="true">gpk-update-viewer.ui</file>
+ </gresource>
+</gresources>
diff --git a/data/gpk-update-viewer.ui b/src/gpk-update-viewer.ui
similarity index 100%
rename from data/gpk-update-viewer.ui
rename to src/gpk-update-viewer.ui
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]