Merge branch 'wip/hadess/update-app-id' into 'master'

all: Update application ID to org.gnome.Rhythmbox3

See merge request !57

.gitignore

@@ -41,8 +41,8 @@ bindings/gi/RB-3.0.typelib
 #
 org.gnome.Rhythmbox3.service
 *.desktop
-rhythmbox.desktop.in
-rhythmbox-device.desktop.in
+org.gnome.Rhythmbox3.desktop.in
+org.gnome.Rhythmbox3.device.desktop.in
 playlists.xml
 gschemas.compiled
 org.gnome.rhythmbox.gschema.valid

configure.ac

@@ -667,8 +667,8 @@ widgets/Makefile
 podcast/Makefile
 shell/Makefile
 data/Makefile
-data/rhythmbox.desktop.in
-data/rhythmbox-device.desktop.in
+data/org.gnome.Rhythmbox3.desktop.in
+data/org.gnome.Rhythmbox3.device.desktop.in
 data/ui/Makefile
 data/icons/Makefile
 data/icons/hicolor/Makefile

data/Makefile.am

@@ -4,7 +4,7 @@ SUBDIRS = ui icons
 @INTLTOOL_DESKTOP_RULE@
 
 Multimediadir = $(datadir)/applications
-Multimedia_in_files = rhythmbox.desktop.in rhythmbox-device.desktop.in
+Multimedia_in_files = org.gnome.Rhythmbox3.desktop.in org.gnome.Rhythmbox3.device.desktop.in
 Multimedia_DATA = $(Multimedia_in_files:.desktop.in=.desktop)
 
 playlists_in_files = playlists.xml.in
@@ -34,7 +34,7 @@ service_DATA = $(service_in_files:.service.in=.service)
 
 appdatadir = $(datadir)/metainfo
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = rhythmbox.appdata.xml.in
+appdata_in_files = org.gnome.Rhythmbox3.appdata.xml.in
 
 # Rule to make the service file with bindir expanded
 $(service_DATA): $(service_in_files) Makefile
@@ -60,15 +60,15 @@ EXTRA_DIST = $(service_in_files)    \
 	     $(playlists_in_files)  \
 	     $(profiles_DATA)       \
 	     $(appdata_in_files)    \
-	     rhythmbox.desktop.in.in \
-	     rhythmbox-device.desktop.in.in
+	     org.gnome.Rhythmbox3.desktop.in.in \
+	     org.gnome.Rhythmbox3.device.desktop.in.in
 
 CLEANFILES = 					\
-	rhythmbox.desktop			\
-	rhythmbox-device.desktop		\
+	org.gnome.Rhythmbox3.desktop			\
+	org.gnome.Rhythmbox3.device.desktop		\
 	org.gnome.Rhythmbox3.service		\
 	playlists.xml				\
-	rhythmbox.desktop.in			\
-	rhythmbox-device.desktop.in		\
+	org.gnome.Rhythmbox3.desktop.in			\
+	org.gnome.Rhythmbox3.device.desktop.in		\
 	gschemas.compiled			\
 	$(appdata_DATA)

data/icons/hicolor/scalable/apps/Makefile.am

@@ -5,8 +5,8 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-	org.gnome.Rhythmbox.svg \
-	org.gnome.Rhythmbox-symbolic.svg
+	org.gnome.Rhythmbox3.svg \
+	org.gnome.Rhythmbox3-symbolic.svg
 
 noinst_DATA =
 

data/rhythmbox.appdata.xml.in → data/org.gnome.Rhythmbox3.appdata.xml.in

@@ -2,7 +2,7 @@
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <!-- Copyright 2014 Jonathan Matthew <jonathan@d14n.org> -->
 <component type="desktop">
-  <id>rhythmbox.desktop</id>
+  <id>org.gnome.Rhythmbox3.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+ and GFDL-1.3</project_license>
   <_name>Rhythmbox</_name>

data/rhythmbox.desktop.in.in → data/org.gnome.Rhythmbox3.desktop.in.in

@@ -7,7 +7,7 @@ _Keywords=Audio;Song;MP3;CD;Podcast;MTP;iPod;Playlist;Last.fm;UPnP;DLNA;Radio;
 Exec=rhythmbox %U
 Terminal=false
 Type=Application
-Icon=org.gnome.Rhythmbox
+Icon=org.gnome.Rhythmbox3
 X-GNOME-DocPath=rhythmbox/rhythmbox.xml
 Categories=GNOME;GTK;AudioVideo;Audio;Player;
 MimeType=application/x-ogg;application/ogg;audio/x-vorbis+ogg;audio/vorbis;audio/x-vorbis;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;audio/x-flac;audio/mp4;audio/x-it;audio/x-mod;audio/x-s3m;audio/x-stm;audio/x-xm;

data/rhythmbox-device.desktop.in.in → data/org.gnome.Rhythmbox3.device.desktop.in.in

@@ -7,7 +7,7 @@ Exec=rhythmbox-client --select-source %U
 Terminal=false
 NoDisplay=true
 Type=Application
-Icon=org.gnome.Rhythmbox
+Icon=org.gnome.Rhythmbox3
 X-GNOME-DocPath=rhythmbox/rhythmbox.xml
 Categories=GNOME;GTK;AudioVideo;
 MimeType=x-content/audio-player;x-content/audio-cdda;

lib/rb-stock-icons.c

@@ -37,7 +37,7 @@
 #include "rb-file-helpers.h"
 #include "rb-stock-icons.h"
 
-const char RB_APP_ICON[] = "org.gnome.Rhythmbox";
+const char RB_APP_ICON[] = "org.gnome.Rhythmbox3";
 const char RB_STOCK_SET_STAR[] = "rhythmbox-set-star";
 const char RB_STOCK_UNSET_STAR[] = "rhythmbox-unset-star";
 const char RB_STOCK_NO_STAR[] = "rhythmbox-no-star";

plugins/mpris/rb-mpris-plugin.c

@@ -291,9 +291,9 @@ get_root_property (GDBusConnection *connection,
 		char *path;
 
 #ifdef USE_UNINSTALLED_DIRS
-		path = g_build_filename (SHARE_UNINSTALLED_BUILDDIR, "rhythmbox.desktop", NULL);
+		path = g_build_filename (SHARE_UNINSTALLED_BUILDDIR, "org.gnome.Rhythmbox3.desktop", NULL);
 #else
-		path = g_build_filename (DATADIR, "applications", "rhythmbox.desktop", NULL);
+		path = g_build_filename (DATADIR, "applications", "org.gnome.Rhythmbox3.desktop", NULL);
 #endif
 		if (path != NULL) {
 			char *basename;

plugins/notification/rb-notification-plugin.c

@@ -206,7 +206,7 @@ do_notify (RBNotificationPlugin *plugin,
         if (playback)
         	notify_notification_set_category (notification, "x-gnome.music");
         notify_notification_set_hint (notification, "desktop-entry",
-                                      g_variant_new_string ("rhythmbox"));
+                                      g_variant_new_string ("org.gnome.Rhythmbox3"));
 
 	notify_notification_clear_actions (notification);
 	if (playback && plugin->notify_supports_actions) {

plugins/rbzeitgeist/rbzeitgeist.py

@@ -68,7 +68,7 @@ class ZeitgeistPlugin(GObject.Object, Peas.Activatable):
             event = Zeitgeist.Event.new()
             event.set_property("interpretation", "Source Registration")
             event.set_property("manifestation", Zeitgeist.USER_ACTIVITY)
-            event.set_property("actor", "application://rhythmbox.desktop")
+            event.set_property("actor", "application://org.gnome.Rhythmbox3.desktop")
 
             datasource = Zeitgeist.DataSource.new()
             datasource.set_unique_id("org.gnome.Rhythmbox3,dataprovider")
@@ -165,7 +165,7 @@ class ZeitgeistPlugin(GObject.Object, Peas.Activatable):
             event.set_property("timestamp", int(time.time()*1000))
             event.set_property("interpretation", str(event_type))
             event.set_property("manifestation", str(manifest))
-            event.set_property("actor", "application://rhythmbox.desktop")
+            event.set_property("actor", "application://org.gnome.Rhythmbox3.desktop")
             event.add_subject(subject)
 
             logger.insert_event(event)

plugins/webremote/js/webremote.js

@@ -215,7 +215,7 @@ var connect = function() {
 				imgsrc = path + "?" + sign(path);
 				imgclass = "albumart";
 			} else {
-				imgsrc = "/icon/org.gnome.Rhythmbox-symbolic/128";
+				imgsrc = "/icon/org.gnome.Rhythmbox3-symbolic/128";
 				imgclass = "noalbumart";
 			}
 			replaceImage("trackimage", imgclass, imgsrc);

plugins/webremote/webremote.html

@@ -12,7 +12,7 @@
 
 		<div class="pure-u-1-1">
 			<div id="trackimage">
-				<img class="noalbumart" src="/icon/org.gnome.Rhythmbox-symbolic/128">
+				<img class="noalbumart" src="/icon/org.gnome.Rhythmbox3-symbolic/128">
 			</div>
 		</div>
 

plugins/webremote/webremote.py

@@ -455,7 +455,7 @@ class WebRemotePlugin(GObject.Object, Peas.Activatable):
 			msg.set_status(404)
 			return
 
-		if re.match("/icon/[a-zA-Z.-]+/[0-9]+", path) is None:
+		if re.match("/icon/[a-zA-Z0-9.-]+/[0-9]+", path) is None:
 			msg.set_status(404)
 			return
 

po/POTFILES.in

@@ -4,9 +4,9 @@ backends/gstreamer/rb-player-gst.c
 backends/gstreamer/rb-player-gst-xfade.c
 backends/rb-player.c
 data/playlists.xml.in
-data/rhythmbox.appdata.xml.in
-data/rhythmbox.desktop.in.in
-data/rhythmbox-device.desktop.in.in
+data/org.gnome.Rhythmbox3.appdata.xml.in
+data/org.gnome.Rhythmbox3.desktop.in.in
+data/org.gnome.Rhythmbox3.device.desktop.in.in
 [type: gettext/glade]data/ui/app-menu.ui
 [type: gettext/glade]data/ui/browser-popup.ui
 [type: gettext/glade]data/ui/create-playlist.ui

po/POTFILES.skip

 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
-data/rhythmbox.desktop.in
-data/rhythmbox-device.desktop.in
+data/org.gnome.Rhythmbox3.desktop.in
+data/org.gnome.Rhythmbox3.device.desktop.in
 data/org.gnome.rhythmbox.gschema.xml
 
 # these entries work around an intltool bug so distcheck passes
 # https://bugs.launchpad.net/intltool/+bug/1117944
-sub/data/rhythmbox.desktop.in
-sub/data/rhythmbox-device.desktop.in
+sub/data/org.gnome.Rhythmbox3.desktop.in
+sub/data/org.gnome.Rhythmbox3.device.desktop.in