summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <[email protected]>2012-06-12 19:51:29 +0200
committerraveit65 <[email protected]>2018-03-22 21:24:30 +0100
commitc3fe25efdf8861b9e4582d84a320f37e3b89ccbd (patch)
treedb2cd7a55e3bef9780c1ff710ee5567fd7b4185c
parent9668d3f72eda80945a22aaed3ec5ff5079cc62f4 (diff)
downloadatril-c3fe25efdf8861b9e4582d84a320f37e3b89ccbd.tar.bz2
atril-c3fe25efdf8861b9e4582d84a320f37e3b89ccbd.tar.xz
previewer: Use GResource for data files
origin commit: https://git.gnome.org/browse/evince/commit/?h=gnome-3-6&id=45be486
-rw-r--r--data/Makefile.am4
-rw-r--r--previewer/Makefile.am18
-rw-r--r--previewer/ev-previewer-window.c18
-rw-r--r--previewer/previewer-ui.xml (renamed from data/atril-previewer-ui.xml)0
-rw-r--r--previewer/previewer.gresource.xml23
5 files changed, 41 insertions, 22 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 7c1b5d7c..c442a575 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -19,10 +19,6 @@ ui_DATA = \
atril-toolbar.xml \
hand-open.png
-if ENABLE_PREVIEWER
-ui_DATA += atril-previewer-ui.xml
-endif
-
#
# Desktop file
#
diff --git a/previewer/Makefile.am b/previewer/Makefile.am
index 462665ac..91241f30 100644
--- a/previewer/Makefile.am
+++ b/previewer/Makefile.am
@@ -5,11 +5,12 @@ man_MANS = atril-previewer.1
atril_previewer_SOURCES = \
ev-previewer.c \
+ ev-previewer-resources.c \
ev-previewer-window.h \
- ev-previewer-window.c
+ ev-previewer-window.c \
+ $(NULL)
atril_previewer_CPPFLAGS = \
- -DATRILDATADIR=\"$(pkgdatadir)\" \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/libdocument \
@@ -33,6 +34,17 @@ atril_previewer_LDADD = \
$(PREVIEWER_LIBS) \
$(WEBKIT_LIBS)
-EXTRA_DIST = $(man_MANS)
+ev-previewer-resources.c: previewer.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/previewer.gresource.xml)
+ $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate-source --c-name ev_previewer $<
+
+EXTRA_DIST = \
+ previewer.gresource.xml \
+ previewer-ui.xml \
+ $(man_MANS) \
+ $(NULL)
+
+CLEANFILES = \
+ ev-previewer-resources.c \
+ $(NULL)
-include $(top_srcdir)/git.mk
diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c
index df1cb7a1..a33929a3 100644
--- a/previewer/ev-previewer-window.c
+++ b/previewer/ev-previewer-window.c
@@ -468,12 +468,6 @@ ev_previewer_window_dispose (GObject *object)
G_OBJECT_CLASS (ev_previewer_window_parent_class)->dispose (object);
}
-static gchar*
-data_dir (void)
-{
- return g_strdup (ATRILDATADIR);
-}
-
static void
ev_previewer_window_init (EvPreviewerWindow *window)
{
@@ -513,7 +507,6 @@ ev_previewer_window_constructor (GType type,
GtkWidget *toolbar;
GtkAction *action;
GError *error = NULL;
- gchar *datadir, *ui_path;
gdouble dpi;
object = G_OBJECT_CLASS (ev_previewer_window_parent_class)->constructor (type,
@@ -566,14 +559,9 @@ ev_previewer_window_constructor (GType type,
window->accels_group, 1);
gtk_window_add_accel_group (GTK_WINDOW (window),
gtk_ui_manager_get_accel_group (window->ui_manager));
- datadir = data_dir ();
- ui_path = g_build_filename (datadir, "atril-previewer-ui.xml", NULL);
- if (!gtk_ui_manager_add_ui_from_file (window->ui_manager, ui_path, &error)) {
- g_warning ("Failed to load ui from atril-previewer-ui.xml: %s", error->message);
- g_error_free (error);
- }
- g_free (ui_path);
- g_free (datadir);
+
+ gtk_ui_manager_add_ui_from_resource (window->ui_manager, "/org/mate/atril/previewer/ui/previewer.xml", &error);
+ g_assert_no_error (error);
/* GTKUIManager connects actions accels only for menu items,
* but not for tool items. See bug #612972.
diff --git a/data/atril-previewer-ui.xml b/previewer/previewer-ui.xml
index 8c6e95f6..8c6e95f6 100644
--- a/data/atril-previewer-ui.xml
+++ b/previewer/previewer-ui.xml
diff --git a/previewer/previewer.gresource.xml b/previewer/previewer.gresource.xml
new file mode 100644
index 00000000..31e57f53
--- /dev/null
+++ b/previewer/previewer.gresource.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2012 Christian Persch
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope conf it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
+<gresources>
+ <gresource prefix="/org/mate/atril/previewer">
+ <file alias="ui/previewer.xml" compressed="true" preprocess="xml-stripblanks">previewer-ui.xml</file>
+ </gresource>
+</gresources>
+