[gnome-screenshot/wip/exalm/cleanups: 2/6] gresource: Use prefix matching appid
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-screenshot/wip/exalm/cleanups: 2/6] gresource: Use prefix matching appid
- Date: Tue, 10 Mar 2020 13:06:14 +0000 (UTC)
commit deaafeb19394bc2b7b9fbb80673430f61ec938b3
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Tue Mar 10 17:23:29 2020 +0500
gresource: Use prefix matching appid
This means we no longer need to manually add the path.
data/gnome-screenshot.gresource.xml | 2 +-
src/screenshot-application.c | 1 -
src/screenshot-dialog.c | 2 +-
src/screenshot-interactive-dialog.c | 4 ++--
4 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/data/gnome-screenshot.gresource.xml b/data/gnome-screenshot.gresource.xml
index 82da126..faa537c 100644
--- a/data/gnome-screenshot.gresource.xml
+++ b/data/gnome-screenshot.gresource.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
- <gresource prefix="/org/gnome/screenshot">
+ <gresource prefix="/org/gnome/Screenshot">
<file preprocess="xml-stripblanks">icons/display-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/selection-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/window-symbolic.svg</file>
diff --git a/src/screenshot-application.c b/src/screenshot-application.c
index b588437..b64b6fb 100644
--- a/src/screenshot-application.c
+++ b/src/screenshot-application.c
@@ -789,7 +789,6 @@ screenshot_application_startup (GApplication *app)
const gchar *help_accels[2] = { "F1", NULL };
const gchar *quit_accels[2] = { "<Primary>q", NULL };
ScreenshotApplication *self = SCREENSHOT_APPLICATION (app);
- g_application_set_resource_base_path (app, "/org/gnome/screenshot");
G_APPLICATION_CLASS (screenshot_application_parent_class)->startup (app);
diff --git a/src/screenshot-dialog.c b/src/screenshot-dialog.c
index a91b305..dadfd99 100644
--- a/src/screenshot-dialog.c
+++ b/src/screenshot-dialog.c
@@ -215,7 +215,7 @@ screenshot_dialog_new (GdkPixbuf *screenshot,
dialog->user_data = user_data;
ui = gtk_builder_new ();
- res = gtk_builder_add_from_resource (ui, "/org/gnome/screenshot/ui/screenshot-dialog.ui", NULL);
+ res = gtk_builder_add_from_resource (ui, "/org/gnome/Screenshot/ui/screenshot-dialog.ui", NULL);
g_assert (res != 0);
dialog->dialog = GTK_WIDGET (gtk_builder_get_object (ui, "toplevel"));
diff --git a/src/screenshot-interactive-dialog.c b/src/screenshot-interactive-dialog.c
index 7ba971e..b8ac750 100644
--- a/src/screenshot-interactive-dialog.c
+++ b/src/screenshot-interactive-dialog.c
@@ -232,8 +232,8 @@ screenshot_interactive_dialog_new (CaptureClickedCallback f, gpointer user_data)
CaptureData *data;
guint res;
- ui = gtk_builder_new_from_resource ("/org/gnome/screenshot/ui/screenshot-interactive.ui");
- res = gtk_builder_add_from_resource (ui, "/org/gnome/screenshot/ui/screenshot-app-menu.ui", NULL);
+ ui = gtk_builder_new_from_resource ("/org/gnome/Screenshot/ui/screenshot-interactive.ui");
+ res = gtk_builder_add_from_resource (ui, "/org/gnome/Screenshot/ui/screenshot-app-menu.ui", NULL);
g_assert (res != 0);
dialog = GTK_WIDGET (gtk_builder_get_object (ui, "screenshot_window"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]