LinGui: use fr.handbrake.ghb consistently

(cherry picked from commit d309b632bd7083d2c2d21463bc50f29fd33c3ab5)

8 files changed, 12 insertions, 30 deletions

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 0de38559c..574f90864 100644
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 icons =	\
-	hb-icon.svg
+	hb-icon.svg fr.handbrake.ghb.svg
 
 icons_dep =	\
 	icons/24x24/apps/hb-remove.png \
@@ -35,12 +35,7 @@ icons_dep =	\
 	icons/scalable/apps/hb-edit.svg \
 	icons/scalable/apps/hb-icon.svg
 
-if GHB_FLATPAK
-icons += fr.handbrake.ghb.svg
 hb_menu = fr.handbrake.ghb.desktop
-else
-hb_menu = ghb.desktop
-endif
 
 @INTLTOOL_XML_RULE@
 appdatadir = $(datarootdir)/metainfo
diff --git a/gtk/src/data_res.gresource.xml b/gtk/src/data_res.gresource.xml
index 5b0741ceb..a0a88bddf 100644
--- a/gtk/src/data_res.gresource.xml
+++ b/gtk/src/data_res.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/handbrake/ghb/data">
+  <gresource prefix="/fr/handbrake/ghb/data">
     <file>internal_defaults.json</file>
     <file>widget.deps</file>
     <file>widget_reverse.deps</file>
diff --git a/gtk/src/ghb.desktop b/gtk/src/ghb.desktop
deleted file mode 100644
index c5b7b3efb..000000000
--- a/gtk/src/ghb.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=HandBrake
-GenericName=Media Transcoder
-GenericName[fr]=Transcodeur de média
-Comment=Transcodes DVD, Blu-ray, and other media
-Comment[ru]=Перекодировка DVD, Blu-ray и других мультимедиа файлов
-Comment[fr]=Transcode les DVD, Bluray, et autres médias
-Exec=ghb %f
-Icon=hb-icon
-Terminal=false
-Type=Application
-Categories=GTK;AudioVideo;Video;
-MimeType=application/ogg;application/x-extension-mp4;application/x-flac;application/x-matroska;application/x-ogg;audio/ac3;audio/mp4;audio/mpeg;audio/ogg;audio/x-flac;audio/x-matroska;audio/x-mp3;audio/x-mpeg;audio/x-vorbis;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/quicktime;video/vnd.divx;video/x-avi;video/x-m4v;video/x-matroska;video/x-mpeg;video/ogg;video/x-ogm+ogg;video/x-theora+ogg;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;
diff --git a/gtk/src/icon_res.gresource.xml b/gtk/src/icon_res.gresource.xml
index 9318a7791..63593bbd3 100644
--- a/gtk/src/icon_res.gresource.xml
+++ b/gtk/src/icon_res.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/handbrake/ghb">
+  <gresource prefix="/fr/handbrake/ghb">
     <file>icons/24x24/apps/hb-remove.png</file>
     <file>icons/32x32/apps/hb-source.png</file>
     <file>icons/32x32/apps/hb-picture.png</file>
diff --git a/gtk/src/icons.c b/gtk/src/icons.c
index f5b462a37..3f9b89b54 100644
--- a/gtk/src/icons.c
+++ b/gtk/src/icons.c
@@ -30,13 +30,13 @@ ghb_load_icons()
 #if GTK_CHECK_VERSION(3, 14, 0)
     ghb_icons_register_resource();
     gtk_icon_theme_add_resource_path(gtk_icon_theme_get_default(),
-                                     "/org/handbrake/ghb/icons");
+                                     "/fr/handbrake/ghb/icons");
 #else
     ghb_icons_register_resource();
     GResource *icon_res = ghb_icons_get_resource();
 
     char ** children = g_resource_enumerate_children(icon_res,
-                            "/org/handbrake/ghb/icons/scalable/apps", 0, NULL);
+                            "/fr/handbrake/ghb/icons/scalable/apps", 0, NULL);
 
     if (children == NULL)
     {
@@ -48,7 +48,7 @@ ghb_load_icons()
     {
         char * path;
 
-        path = g_strdup_printf("/org/handbrake/ghb/icons/scalable/apps/%s",
+        path = g_strdup_printf("/fr/handbrake/ghb/icons/scalable/apps/%s",
                                children[ii]);
         GBytes *gbytes = g_resource_lookup_data(icon_res, path, 0, NULL);
         gsize data_size;
diff --git a/gtk/src/main.c b/gtk/src/main.c
index 026a9174e..6da24ac9b 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -94,7 +94,7 @@ create_builder_or_die(const gchar * name)
 
     GResource *ui_res = ghb_ui_get_resource();
     GBytes *gbytes = g_resource_lookup_data(ui_res,
-                                            "/org/handbrake/ghb/ui/ghb.ui",
+                                            "/fr/handbrake/ghb/ui/ghb.ui",
                                             0, NULL);
     ghb_ui = g_bytes_get_data(gbytes, &data_size);
 
@@ -1340,7 +1340,7 @@ main(int argc, char *argv[])
 
     ghb_ui_register_resource();
     ud = g_malloc0(sizeof(signal_user_data_t));
-    ud->app = gtk_application_new("org.handbrake.ghb",
+    ud->app = gtk_application_new("fr.handbrake.ghb",
                                   G_APPLICATION_NON_UNIQUE |
                                   G_APPLICATION_HANDLES_OPEN);
     // Connect application signals
diff --git a/gtk/src/resources.c b/gtk/src/resources.c
index 231ef3279..47d28b622 100644
--- a/gtk/src/resources.c
+++ b/gtk/src/resources.c
@@ -48,21 +48,21 @@ ghb_resource_init()
     GResource *data_res = ghb_data_get_resource();
 
     gbytes = g_resource_lookup_data(data_res,
-                    "/org/handbrake/ghb/data/internal_defaults.json", 0, NULL);
+                    "/fr/handbrake/ghb/data/internal_defaults.json", 0, NULL);
     data = g_bytes_get_data(gbytes, &data_size);
     val = ghb_json_parse(data);
     g_bytes_unref(gbytes);
     ghb_dict_set(resources, "internal-defaults", val);
 
     gbytes = g_resource_lookup_data(data_res,
-                    "/org/handbrake/ghb/data/widget.deps", 0, NULL);
+                    "/fr/handbrake/ghb/data/widget.deps", 0, NULL);
     data = g_bytes_get_data(gbytes, &data_size);
     val = ghb_json_parse(data);
     g_bytes_unref(gbytes);
     ghb_dict_set(resources, "widget-deps", val);
 
     gbytes = g_resource_lookup_data(data_res,
-                    "/org/handbrake/ghb/data/widget_reverse.deps", 0, NULL);
+                    "/fr/handbrake/ghb/data/widget_reverse.deps", 0, NULL);
     data = g_bytes_get_data(gbytes, &data_size);
     val = ghb_json_parse(data);
     g_bytes_unref(gbytes);
diff --git a/gtk/src/ui_res.gresource.xml b/gtk/src/ui_res.gresource.xml
index 0a06993d6..7a8d0b15b 100644
--- a/gtk/src/ui_res.gresource.xml
+++ b/gtk/src/ui_res.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/handbrake/ghb/ui">
+  <gresource prefix="/fr/handbrake/ghb/ui">
     <file>ghb.ui</file>
   </gresource>
 </gresources>