Chris Coulson has proposed merging lp:~chrisccoulson/gnome-media/bug337235 into
lp:~ubuntu-desktop/gnome-media/ubuntu.
Requested reviews:
Sebastien Bacher (seb128)
--
https://code.launchpad.net/~chrisccoulson/gnome-media/bug337235/+merge/4422
Your team Ubuntu Desktop is subscribed to branch
lp:~ubuntu-desktop/gnome-media/ubuntu.
=== modified file 'debian/changelog'
--- debian/changelog 2009-03-03 22:22:58 +0000
+++ debian/changelog 2009-03-12 21:49:02 +0000
@@ -1,3 +1,11 @@
+gnome-media (2.25.92-0ubuntu2) jaunty; urgency=low
+
+ * debian/patches/04_gst-mixer_help.patch:
+ - Correctly display the help by calling gtk_show_uri
+ as opposed to running xdg-open (LP: #337235).
+
+ -- Chris Coulson <[email protected]> Thu, 12 Mar 2009 21:18:37 +0000
+
gnome-media (2.25.92-0ubuntu1) jaunty; urgency=low
* New upstream version (LP: #337462):
=== added file 'debian/patches/04_gst-mixer_help.patch'
--- debian/patches/04_gst-mixer_help.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/04_gst-mixer_help.patch 2009-03-12 21:49:02 +0000
@@ -0,0 +1,47 @@
+diff -Nur -x '*.orig' -x '*~' gnome-media-2.25.92/gst-mixer/src/window.c gnome-media-2.25.92.new/gst-mixer/src/window.c
+--- gnome-media-2.25.92/gst-mixer/src/window.c 2009-03-03 17:20:53.000000000 +0000
++++ gnome-media-2.25.92.new/gst-mixer/src/window.c 2009-03-12 21:32:07.000000000 +0000
+@@ -99,34 +99,23 @@
+ }
+
+ static void
+-open_uri (GtkWindow *parent,
+- const char *uri)
++cb_help (GtkAction *action,
++ GnomeVolumeControlWindow *win)
+ {
+- GtkWidget *dialog;
+ GdkScreen *screen;
++ GtkWidget *dialog;
+ GError *error = NULL;
+- gchar *cmdline;
+-
+- screen = gtk_window_get_screen (parent);
+-
+- cmdline = g_strconcat ("xdg-open ", uri, NULL);
+-
+- if (gdk_spawn_command_line_on_screen (screen, cmdline, &error) == FALSE) {
+- dialog = gtk_message_dialog_new (parent, GTK_DIALOG_DESTROY_WITH_PARENT,
++
++ screen = gtk_window_get_screen (GTK_WINDOW (win));
++
++ if (gtk_show_uri (screen, "ghelp:gnome-volume-control", GDK_CURRENT_TIME,
++ &error) == FALSE) {
++ dialog = gtk_message_dialog_new (GTK_WINDOW (win), GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", error->message);
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
+ g_error_free(error);
+ }
+- g_free(cmdline);
+-}
+-
+-
+-static void
+-cb_help (GtkAction *action,
+- GnomeVolumeControlWindow *win)
+-{
+- open_uri (GTK_WINDOW (win), "ghelp:gnome-volume-control");
+ }
+
+ static void
--
ubuntu-desktop mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
