diff --git a/Makefile.am b/Makefile.am
index 206076f9b09f440f0f95adc21c9e0177a85114a3..c72598e5529407f03614d7c4f18de15a62211ea8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,8 @@
-## Process this file with automake to produce Makefile.in
SUBDIRS = src po icons
desktopdir = $(datadir)/applications
-desktop_in_files = ristretto.desktop.in
+desktop_in_files = org.xfce.ristretto.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
@@ -13,7 +12,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_XML_RULE@
appdatadir = $(datadir)/metainfo
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = ristretto.appdata.xml.in
+appdata_in_files = org.xfce.ristretto.appdata.xml.in
EXTRA_DIST = \
README.md \
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 000f39ff77f498fef653311efa7642243a7c815c..ea998b1667b7bc4d094fcb011dedbee4d5871aa3 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -2,7 +2,7 @@
# Inspired by Makefile.am from the Thunar file-manager
iconsdir = $(datadir)/icons/hicolor/16x16/apps
-icons_DATA = ristretto.png
+icons_DATA = org.xfce.ristretto.png
EXTRA_DIST = $(icons_DATA)
diff --git a/icons/16x16/org.xfce.ristretto.png b/icons/16x16/org.xfce.ristretto.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4fa6c6384fb2a7e92a4e113126df5569bc25ee2
Binary files /dev/null and b/icons/16x16/org.xfce.ristretto.png differ
diff --git a/icons/16x16/org.xfce.ristretto.svg b/icons/16x16/org.xfce.ristretto.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7749f247ab87fb15db1518e3aeed35fea99912b7
--- /dev/null
+++ b/icons/16x16/org.xfce.ristretto.svg
@@ -0,0 +1,294 @@
+
+
diff --git a/icons/16x16/ristretto.png b/icons/16x16/ristretto.png
deleted file mode 100644
index 9144752308c3b0c721a7e4225c88d4f71d3d28dc..0000000000000000000000000000000000000000
Binary files a/icons/16x16/ristretto.png and /dev/null differ
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index b7f2fcaa89ff258e66c2d059f4b38665eac62624..4ef67425443f62aedd9c8bad2d3cda1c71dcf4eb 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -2,7 +2,7 @@
# Inspired by Makefile.am from the Thunar file-manager
iconsdir = $(datadir)/icons/hicolor/48x48/apps
-icons_DATA = ristretto.png
+icons_DATA = org.xfce.ristretto.png
EXTRA_DIST = $(icons_DATA)
diff --git a/icons/48x48/org.xfce.ristretto.png b/icons/48x48/org.xfce.ristretto.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ebcae9cd366fad4a2acb128d5f5d5cb2078fadc
Binary files /dev/null and b/icons/48x48/org.xfce.ristretto.png differ
diff --git a/icons/48x48/org.xfce.ristretto.svg b/icons/48x48/org.xfce.ristretto.svg
new file mode 100644
index 0000000000000000000000000000000000000000..69f64100d98eeef054b97b3c6022d9efc3373983
--- /dev/null
+++ b/icons/48x48/org.xfce.ristretto.svg
@@ -0,0 +1,292 @@
+
+
diff --git a/icons/48x48/ristretto.png b/icons/48x48/ristretto.png
deleted file mode 100644
index 679971d3343e00eb38aaafaca4654f077786cd5e..0000000000000000000000000000000000000000
Binary files a/icons/48x48/ristretto.png and /dev/null differ
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
index 992f72a8c2bce36d435a6e7584955e1fce9a0660..7265167b3830b0ed2be9772ba01450072aa57ae0 100644
--- a/icons/scalable/Makefile.am
+++ b/icons/scalable/Makefile.am
@@ -2,6 +2,6 @@
# Inspired by Makefile.am from the Thunar file-manager
iconsdir = $(datadir)/icons/hicolor/scalable/apps
-icons_DATA = ristretto.svg
+icons_DATA = org.xfce.ristretto.svg
EXTRA_DIST = $(icons_DATA)
diff --git a/icons/scalable/org.xfce.ristretto.svg b/icons/scalable/org.xfce.ristretto.svg
new file mode 100644
index 0000000000000000000000000000000000000000..716cc1a42ad61dd6091f358c9b274f01020f55bd
--- /dev/null
+++ b/icons/scalable/org.xfce.ristretto.svg
@@ -0,0 +1,568 @@
+
+
diff --git a/icons/scalable/ristretto.svg b/icons/scalable/ristretto.svg
deleted file mode 100644
index 20b4d0282aab4f79d365c4752283d82009087459..0000000000000000000000000000000000000000
--- a/icons/scalable/ristretto.svg
+++ /dev/null
@@ -1,1620 +0,0 @@
-
-
-
-
diff --git a/ristretto.appdata.xml.in b/org.xfce.ristretto.appdata.xml.in
similarity index 97%
rename from ristretto.appdata.xml.in
rename to org.xfce.ristretto.appdata.xml.in
index d3b2e4c1f2e6d89f737caab7a078f511d7a13b23..4e546aeff926c43329299094cf4b3fabecfd4469 100644
--- a/ristretto.appdata.xml.in
+++ b/org.xfce.ristretto.appdata.xml.in
@@ -1,7 +1,7 @@
- ristretto.desktop
+ org.xfce.ristretto.desktop
CC-BY-3.0
GPL-2.0+
Ristretto
diff --git a/ristretto.desktop.in b/org.xfce.ristretto.desktop.in
similarity index 93%
rename from ristretto.desktop.in
rename to org.xfce.ristretto.desktop.in
index 6b8233ef0509b6c7bb5ca42ebc42bfab3c82b7b2..519322843cc3d5df264e19a4435f2353c1474f60 100644
--- a/ristretto.desktop.in
+++ b/org.xfce.ristretto.desktop.in
@@ -4,7 +4,7 @@ _Name=Ristretto Image Viewer
_Comment=Look at your images easily
_GenericName=Image Viewer
Exec=ristretto %F
-Icon=ristretto
+Icon=org.xfce.ristretto
Terminal=false
Type=Application
X-MultipleArgs=false
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 91421bd15478e5a63ff5542c8e7eb7c13b486b1c..279dd0f03528c87508ca7bac6315cca39258f808 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,5 +11,5 @@ src/thumbnailer.c
src/wallpaper_manager.c
src/xfce_wallpaper_manager.c
src/gnome_wallpaper_manager.c
-ristretto.desktop.in
-ristretto.appdata.xml.in
+org.xfce.ristretto.desktop.in
+org.xfce.ristretto.appdata.xml.in
diff --git a/src/image_viewer.c b/src/image_viewer.c
index ebacd7304042a7c78ee3ca14764b55d829f575e8..c7d0d3671101be9fd5d6f8175821298a3c8cd34e 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -39,7 +39,7 @@
#endif
#ifndef BACKGROUND_ICON_NAME
-#define BACKGROUND_ICON_NAME "ristretto"
+#define BACKGROUND_ICON_NAME "org.xfce.ristretto"
#endif
#ifndef BACKGROUND_ICON_SIZE
diff --git a/src/main.c b/src/main.c
index b4e4869d97449135fb6fea5e14a88a7c7eaabdeb..ca85bc12a9c63bda082dabbaf527cdb6f77bf206 100644
--- a/src/main.c
+++ b/src/main.c
@@ -120,7 +120,7 @@ main(int argc, char **argv)
xfconf_init (NULL);
- gtk_window_set_default_icon_name ("ristretto");
+ gtk_window_set_default_icon_name ("org.xfce.ristretto");
settings = rstto_settings_new ();
if (FALSE == show_settings)
@@ -168,7 +168,7 @@ main(int argc, char **argv)
{
xfce_dialog_show_help (
GTK_WINDOW (window),
- "ristretto",
+ "org.xfce.ristretto",
"preferences",
NULL);
}
diff --git a/src/main_window.c b/src/main_window.c
index 7978f79576462806b1fff46201615131b337761d..cf165710ac8a2d8d8782d201da934639c7cd8cae 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -53,7 +53,7 @@
#define RISTRETTO_APP_TITLE _("Image Viewer")
#endif
-#define RISTRETTO_DESKTOP_ID "ristretto.desktop"
+#define RISTRETTO_DESKTOP_ID "org.xfce.ristretto.desktop"
#define RSTTO_RECENT_FILES_APP_NAME "ristretto"
#define RSTTO_RECENT_FILES_GROUP "Graphics"
@@ -1468,7 +1468,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
else
{
gtk_window_set_icon (GTK_WINDOW (window), NULL);
- gtk_window_set_icon_name (GTK_WINDOW (window), "ristretto");
+ gtk_window_set_icon_name (GTK_WINDOW (window), "org.xfce.ristretto");
}
app_list = g_app_info_get_all_for_type (content_type);
@@ -1560,7 +1560,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
title = g_strdup (RISTRETTO_APP_TITLE);
gtk_window_set_icon (GTK_WINDOW (window), NULL);
- gtk_window_set_icon_name (GTK_WINDOW (window), "ristretto");
+ gtk_window_set_icon_name (GTK_WINDOW (window), "org.xfce.ristretto");
}
rstto_main_window_update_buttons (window);
@@ -2845,7 +2845,7 @@ cb_rstto_main_window_about (GtkWidget *widget, RsttoMainWindow *window)
gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about_dialog),
"https://docs.xfce.org/apps/ristretto/start");
gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG (about_dialog),
- "ristretto");
+ "org.xfce.ristretto");
gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (about_dialog),
authors);
gtk_about_dialog_set_translator_credits (GTK_ABOUT_DIALOG (about_dialog),
@@ -2874,7 +2874,7 @@ cb_rstto_main_window_contents (GtkWidget *widget, RsttoMainWindow *window)
{
xfce_dialog_show_help (
GTK_WINDOW (window),
- "ristretto",
+ "org.xfce.ristretto",
"start",
"");
}
@@ -4671,7 +4671,7 @@ cb_rstto_thumbnailer_ready(
else
{
gtk_window_set_icon (GTK_WINDOW (window), NULL);
- gtk_window_set_icon_name (GTK_WINDOW (window), "ristretto");
+ gtk_window_set_icon_name (GTK_WINDOW (window), "org.xfce.ristretto");
}
}
}
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index 314261b40f48adf3760d7257820a23280dca033f..ae7918d6e6ad42392603343cd954bb7b50451cd0 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -578,7 +578,7 @@ rstto_preferences_dialog_new (GtkWindow *parent)
{
GtkWidget *dialog = g_object_new (RSTTO_TYPE_PREFERENCES_DIALOG,
"title", _("Image Viewer Preferences"),
- "icon-name", "ristretto",
+ "icon-name", "org.xfce.ristretto",
"transient-for", parent,
NULL);