Merge lp:~diwic/unity-settings-daemon/lp1287584 into lp:unity-settings-daemon

[David Henningsson]

Fix what-did-you-plug-in dialog showing up behind other windows.
Simplify launching of "unity-control-center sound".

Fix what-did-you-plug-in dialog showing up behind other windows.
Simplify launching of "unity-control-center sound".

[Sebastien Bacher (seb128)]

Thanks for the work, some comments though:

- it would be better to not batch unrelated changes in one merge proposal

- enforcing the current timestamp is going to bypass the focus-stealing-prevention, can we get the time from the udev event rather?

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4029
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-armhf-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/22/rebuild

review: Approve (continuous-integration)

[lp:~diwic/unity-settings-daemon/lp1287584]

4030. By David Henningsson on 2014-03-04

what-did-you-plug-in: Clarify comment in previous commit

[Sebastien Bacher (seb128)]

ok, discussed on IRC, it's not easy to get the event timestamp and in practice it's not likely an user can plug a device and type at the same time so the hack should be ok

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4030
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-armhf-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/23/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
--- plugins/media-keys/gsd-media-keys-manager.c	2014-02-24 12:18:42 +0000
+++ plugins/media-keys/gsd-media-keys-manager.c	2014-03-04 11:30:35 +0000
@@ -2698,19 +2698,6 @@
 	}
 }
 
-
-static void
-launch_sound_settings()
-{
-    if (fork() != 0)
-        return;
-
-    /* Child process */
-    if (system("unity-control-center sound") == -1)
-        g_warning("Failed to launch sound settings.\n");
-    exit(0);
-}
-
 static void
 on_wdypi_action (int action, void *userdata)
 {
@@ -2721,7 +2708,7 @@
 
         switch (action) {
         case WDYPI_DIALOG_SOUND_SETTINGS:
-                launch_sound_settings();
+                execute(manager, "unity-control-center sound", FALSE);
                 break;
         case WDYPI_DIALOG_HEADPHONES:
                 pa_backend_set_port(pb, "analog-output-headphones", true);

=== modified file 'plugins/media-keys/what-did-you-plug-in/dialog-window.c'
--- plugins/media-keys/what-did-you-plug-in/dialog-window.c	2014-02-18 12:19:40 +0000
+++ plugins/media-keys/what-did-you-plug-in/dialog-window.c	2014-03-04 11:30:35 +0000
@@ -2,6 +2,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdkx.h>
 
 #include "dialog-window.h"
 
@@ -82,6 +83,7 @@
 
 static void dialog_create(dialog_window *d, bool show_headset, bool show_mic)
 {
+    guint32 timestamp;
     d->dialog = gtk_dialog_new();
     gtk_window_set_title(GTK_WINDOW(d->dialog), _("Unknown Audio Device"));
     gtk_container_set_border_width(GTK_CONTAINER(d->dialog), 6);
@@ -117,6 +119,12 @@
     g_signal_connect(d->dialog, "response", G_CALLBACK(on_response), d);
 
     gtk_widget_show_all(d->dialog);
+    /* This event did not originate from a pointer or key movement, so we can't
+       use GDK_CURRENT_TIME (or just gtk_window_present) here. There is also no
+       other source timestamp to rely on. Without a timestamp, the dialog would
+       often show up behind other windows. */
+    timestamp = gdk_x11_get_server_time(gtk_widget_get_window(GTK_WIDGET(d->dialog)));
+    gtk_window_present_with_time(GTK_WINDOW(d->dialog), timestamp);
 }
 
 void wdypi_dialog_run(bool show_headset, bool show_mic, wdypi_dialog_cb cb, void *cb_userdata)