mirror of https://github.com/GNOME/gimp.git
148 lines
5.6 KiB
Diff
148 lines
5.6 KiB
Diff
From e3c70a67c9f03a3a5af44b1dcf87a3cda4f4443b Mon Sep 17 00:00:00 2001
|
|
From: Bruno Lopes <brunolopesdsilv@outlook.com>
|
|
Date: Thu, 29 Aug 2024 00:34:06 +0200
|
|
Subject: [PATCH] desktop, po: Use reverse DNS naming
|
|
|
|
---
|
|
desktop/meson.build | 2 +-
|
|
desktop/org.gimp.GIMP.appdata.xml.in.in | 4 ++--
|
|
...imp.desktop.in.in => org.gimp.GIMP.desktop.in.in} | 2 +-
|
|
libgimpwidgets/gimpwidgets-private.c | 12 ++++++------
|
|
po/POTFILES.in | 2 +-
|
|
po/POTFILES.skip | 2 +-
|
|
6 files changed, 12 insertions(+), 12 deletions(-)
|
|
rename desktop/{gimp.desktop.in.in => org.gimp.GIMP.desktop.in.in} (96%)
|
|
|
|
diff --git a/desktop/meson.build b/desktop/meson.build
|
|
index bee2e93c48..a517e351ab 100644
|
|
--- a/desktop/meson.build
|
|
+++ b/desktop/meson.build
|
|
@@ -1,4 +1,4 @@
|
|
-desktopfilename = 'gimp.desktop'
|
|
+desktopfilename = 'org.gimp.GIMP.desktop'
|
|
|
|
desktop_conf = configuration_data()
|
|
desktop_conf.set('GIMP_COMMAND', gimp_command)
|
|
diff --git a/desktop/org.gimp.GIMP.appdata.xml.in.in b/desktop/org.gimp.GIMP.appdata.xml.in.in
|
|
index e1dcfa7fdc..41a51e1b68 100644
|
|
--- a/desktop/org.gimp.GIMP.appdata.xml.in.in
|
|
+++ b/desktop/org.gimp.GIMP.appdata.xml.in.in
|
|
@@ -65,12 +65,12 @@
|
|
</kudos>
|
|
<translation type="gettext">gimp30</translation>
|
|
|
|
- <launchable type="desktop-id">gimp.desktop</launchable>
|
|
+ <launchable type="desktop-id">org.gimp.GIMP.desktop</launchable>
|
|
<provides>
|
|
<binary>@GIMP_COMMAND@</binary>
|
|
<!-- Fix the ID renaming, and things like past reviews made on the
|
|
older ID in software installers. -->
|
|
- <id>gimp.desktop</id>
|
|
+ <id>org.gimp.GIMP.desktop</id>
|
|
</provides>
|
|
|
|
<releases>
|
|
diff --git a/desktop/gimp.desktop.in.in b/desktop/org.gimp.GIMP.desktop.in.in
|
|
similarity index 96%
|
|
rename from desktop/gimp.desktop.in.in
|
|
rename to desktop/org.gimp.GIMP.desktop.in.in
|
|
index 0ef73561b0..6f460d6db1 100644
|
|
--- a/desktop/gimp.desktop.in.in
|
|
+++ b/desktop/org.gimp.GIMP.desktop.in.in
|
|
@@ -8,7 +8,7 @@ Comment=Create images and edit photographs
|
|
Keywords=GIMP;graphic;design;illustration;painting;
|
|
Exec=@GIMP_COMMAND@ %U
|
|
TryExec=gimp-@GIMP_APP_VERSION@
|
|
-Icon=gimp
|
|
+Icon=org.gimp.GIMP
|
|
Terminal=false
|
|
Categories=Graphics;2DGraphics;RasterGraphics;GTK;
|
|
StartupNotify=true
|
|
diff --git a/libgimpwidgets/gimpwidgets-private.c b/libgimpwidgets/gimpwidgets-private.c
|
|
index 0ebe7fa7e0..046e737fca 100644
|
|
--- a/libgimpwidgets/gimpwidgets-private.c
|
|
+++ b/libgimpwidgets/gimpwidgets-private.c
|
|
@@ -110,7 +110,7 @@ gimp_widgets_init (GimpHelpFunc standard_help_func,
|
|
* then the application icon is dependant to the theme and for now at
|
|
* least, we want the installed icon.
|
|
*/
|
|
- path = g_build_filename (base_dir, "16x16", cat_dir, "gimp.png", NULL);
|
|
+ path = g_build_filename (base_dir, "16x16", cat_dir, "org.gimp.GIMP.png", NULL);
|
|
pixbuf = gdk_pixbuf_new_from_file (path, &error);
|
|
if (pixbuf)
|
|
icons = g_list_prepend (icons, pixbuf);
|
|
@@ -119,7 +119,7 @@ gimp_widgets_init (GimpHelpFunc standard_help_func,
|
|
g_clear_error (&error);
|
|
g_free (path);
|
|
|
|
- path = g_build_filename (base_dir, "32x32", cat_dir, "gimp.png", NULL);
|
|
+ path = g_build_filename (base_dir, "32x32", cat_dir, "org.gimp.GIMP.png", NULL);
|
|
pixbuf = gdk_pixbuf_new_from_file (path, &error);
|
|
if (pixbuf)
|
|
icons = g_list_prepend (icons, pixbuf);
|
|
@@ -128,7 +128,7 @@ gimp_widgets_init (GimpHelpFunc standard_help_func,
|
|
g_clear_error (&error);
|
|
g_free (path);
|
|
|
|
- path = g_build_filename (base_dir, "48x48", cat_dir, "gimp.png", NULL);
|
|
+ path = g_build_filename (base_dir, "48x48", cat_dir, "org.gimp.GIMP.png", NULL);
|
|
pixbuf = gdk_pixbuf_new_from_file (path, &error);
|
|
if (pixbuf)
|
|
icons = g_list_prepend (icons, pixbuf);
|
|
@@ -137,7 +137,7 @@ gimp_widgets_init (GimpHelpFunc standard_help_func,
|
|
g_clear_error (&error);
|
|
g_free (path);
|
|
|
|
- path = g_build_filename (base_dir, "64x64", cat_dir, "gimp.png", NULL);
|
|
+ path = g_build_filename (base_dir, "64x64", cat_dir, "org.gimp.GIMP.png", NULL);
|
|
pixbuf = gdk_pixbuf_new_from_file (path, &error);
|
|
if (pixbuf)
|
|
icons = g_list_prepend (icons, pixbuf);
|
|
@@ -146,7 +146,7 @@ gimp_widgets_init (GimpHelpFunc standard_help_func,
|
|
g_clear_error (&error);
|
|
g_free (path);
|
|
|
|
- path = g_build_filename (base_dir, "scalable", cat_dir, "gimp.svg", NULL);
|
|
+ path = g_build_filename (base_dir, "scalable", cat_dir, "org.gimp.GIMP.svg", NULL);
|
|
pixbuf = gdk_pixbuf_new_from_file_at_size (path, 128, 128, &error);
|
|
if (pixbuf)
|
|
{
|
|
@@ -179,7 +179,7 @@ gimp_widgets_init (GimpHelpFunc standard_help_func,
|
|
}
|
|
g_free (path);
|
|
|
|
- path = g_build_filename (base_dir, "256x256", cat_dir, "gimp.png", NULL);
|
|
+ path = g_build_filename (base_dir, "256x256", cat_dir, "org.gimp.GIMP.png", NULL);
|
|
pixbuf = gdk_pixbuf_new_from_file (path, &error);
|
|
if (pixbuf)
|
|
icons = g_list_prepend (icons, pixbuf);
|
|
diff --git a/po/POTFILES.in b/po/POTFILES.in
|
|
index bc577b54a4..11bb18e8c1 100644
|
|
--- a/po/POTFILES.in
|
|
+++ b/po/POTFILES.in
|
|
@@ -2,7 +2,7 @@
|
|
# marked to allow runtime translation of messages
|
|
|
|
desktop/org.gimp.GIMP.appdata.xml.in.in
|
|
-desktop/gimp.desktop.in.in
|
|
+desktop/org.gimp.GIMP.desktop.in.in
|
|
|
|
app/about.h
|
|
app/app.c
|
|
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
|
|
index 7e957d8dd4..00ec4d8961 100644
|
|
--- a/po/POTFILES.skip
|
|
+++ b/po/POTFILES.skip
|
|
@@ -3,7 +3,7 @@ build/windows/installer/lang/setup.isl.in
|
|
data/tags/gimp-tags-default.xml.in
|
|
data/tips/gimp-tips.xml.in
|
|
desktop/org.gimp.GIMP.appdata.xml.in
|
|
-desktop/gimp.desktop.in
|
|
+desktop/org.gimp.GIMP.desktop.in
|
|
extensions
|
|
libgimp
|
|
libgimpbase
|
|
--
|
|
2.43.0
|
|
|