File indicator-sound-drop-url-dispatcher.patch of Package indicator-sound

Overview Repositories Revisions Requests Users Attributes Meta

File indicator-sound-drop-url-dispatcher.patch of Package indicator-sound

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,14 +26,12 @@ set(SOURCE_BINARY_DIR "${CMAKE_BINARY_DI
 set(PULSE_AUDIO_REQUIRED_VERSION 0.9.19)
 set(GLIB_2_0_REQUIRED_VERSION 2.32)
 set(GIO_2_0_REQUIRED_VERSION 2.25.13)
-set(URL_DISPATCHER_1_REQUIRED_VERSION 1)
 
 pkg_check_modules(
   PULSEAUDIO REQUIRED
   libpulse-mainloop-glib>=${PULSE_AUDIO_REQUIRED_VERSION}
   glib-2.0>=${GLIB_2_0_REQUIRED_VERSION}
   gio-unix-2.0>=${GIO_2_0_REQUIRED_VERSION}
-  url-dispatcher-1>=${URL_DISPATCHER_1_REQUIRED_VERSION}
 )
 include_directories(${PULSEAUDIO_INCLUDE_DIRS})
 
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,7 +35,6 @@ vala_init(indicator-sound-service
     --target-glib=${GLIB_2_0_REQUIRED_VERSION}
     --vapidir=${CMAKE_SOURCE_DIR}/vapi/
     --vapidir=.
-    --pkg=url-dispatcher
     --pkg=bus-watcher
 )
 
--- a/src/service.vala
+++ b/src/service.vala
@@ -98,9 +98,7 @@ public class IndicatorSound.Service: Obj
 
 		this.menus = new HashTable<string, SoundMenu> (str_hash, str_equal);
 		this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_PLAYERS | SoundMenu.DisplayFlags.GREETER_PLAYERS));
-		this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_SILENT_MODE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS | SoundMenu.DisplayFlags.GREETER_PLAYERS));
 		this.menus.insert ("desktop", new SoundMenu ("indicator.desktop-settings", SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS_PLAY_CONTROLS | SoundMenu.DisplayFlags.ADD_PLAY_CONTROL_INACTIVE_PLAYER));
-		this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.SHOW_SILENT_MODE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
 
 		this.menus.@foreach ( (profile, menu) => {
 			this.volume_control.bind_property ("active-mic", menu, "show-mic-volume", BindingFlags.SYNC_CREATE);
@@ -191,7 +189,6 @@ public class IndicatorSound.Service: Obj
 		{ "root", null, null, "@a{sv} {}", null },
 		{ "scroll", activate_scroll_action, "i", null, null },
 		{ "desktop-settings", activate_desktop_settings, null, null, null },
-		{ "phone-settings", activate_phone_settings, null, null, null },
 		{ "indicator-shown", null, null, "@b false", null },
 	};
 
@@ -252,10 +249,7 @@ public class IndicatorSound.Service: Obj
 		string cmd;
 
 		if (Environment.get_variable ("MIR_SOCKET") != null)
-		{
-			UrlDispatch.send ("settings:///system/sound");
-			return;
-		}
+			cmd = "system-settings";
 
 		if (env == "xubuntu" || env == "ubuntustudio")
 			cmd = "pavucontrol";
@@ -273,10 +267,6 @@ public class IndicatorSound.Service: Obj
 		}
 	}
 
-	void activate_phone_settings (SimpleAction action, Variant? param) {
-		UrlDispatch.send ("settings:///system/sound");
-	}
-
 	/* Returns a serialized version of @icon_name suited for the panel */
 	static Variant serialize_themed_icon (string icon_name)
 	{
--- a/vapi/url-dispatcher.vapi
+++ b/vapi/url-dispatcher.vapi
@@ -1,9 +0,0 @@
-[CCode (cprefix="", lower_case_cprefix="", cheader_filename="liburl-dispatcher-1/url-dispatcher.h")]
-
-namespace UrlDispatch
-{
-  public delegate void DispatchCallback ();
-
-  [CCode (cname = "url_dispatch_send")]
-  public static void send (string url, DispatchCallback? func = null);
-}

Places

File indicator-sound-drop-url-dispatcher.patch of Package indicator-sound

Places