GNOME media utilities

Merge lp://staging/~chrisccoulson/gnome-media/bug337235 into lp://staging/~ubuntu-desktop/gnome-media/ubuntu

  1. bug337235
  2. Merge into ubuntu
Proposed by Chris Coulson
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~chrisccoulson/gnome-media/bug337235
Merge into: lp://staging/~ubuntu-desktop/gnome-media/ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~chrisccoulson/gnome-media/bug337235
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+4422@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-03-03 22:22:58 +0000
3+++ debian/changelog 2009-03-12 21:49:02 +0000
4@@ -1,3 +1,11 @@
5+gnome-media (2.25.92-0ubuntu2) jaunty; urgency=low
6+
7+ * debian/patches/04_gst-mixer_help.patch:
8+ - Correctly display the help by calling gtk_show_uri
9+ as opposed to running xdg-open (LP: #337235).
10+
11+ -- Chris Coulson <chrisccoulson@googlemail.com> Thu, 12 Mar 2009 21:18:37 +0000
12+
13 gnome-media (2.25.92-0ubuntu1) jaunty; urgency=low
14
15 * New upstream version (LP: #337462):
16
17=== added file 'debian/patches/04_gst-mixer_help.patch'
18--- debian/patches/04_gst-mixer_help.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/04_gst-mixer_help.patch 2009-03-12 21:49:02 +0000
20@@ -0,0 +1,47 @@
21+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
22+--- gnome-media-2.25.92/gst-mixer/src/window.c 2009-03-03 17:20:53.000000000 +0000
23++++ gnome-media-2.25.92.new/gst-mixer/src/window.c 2009-03-12 21:32:07.000000000 +0000
24+@@ -99,34 +99,23 @@
25+ }
26+
27+ static void
28+-open_uri (GtkWindow *parent,
29+- const char *uri)
30++cb_help (GtkAction *action,
31++ GnomeVolumeControlWindow *win)
32+ {
33+- GtkWidget *dialog;
34+ GdkScreen *screen;
35++ GtkWidget *dialog;
36+ GError *error = NULL;
37+- gchar *cmdline;
38+-
39+- screen = gtk_window_get_screen (parent);
40+-
41+- cmdline = g_strconcat ("xdg-open ", uri, NULL);
42+-
43+- if (gdk_spawn_command_line_on_screen (screen, cmdline, &error) == FALSE) {
44+- dialog = gtk_message_dialog_new (parent, GTK_DIALOG_DESTROY_WITH_PARENT,
45++
46++ screen = gtk_window_get_screen (GTK_WINDOW (win));
47++
48++ if (gtk_show_uri (screen, "ghelp:gnome-volume-control", GDK_CURRENT_TIME,
49++ &error) == FALSE) {
50++ dialog = gtk_message_dialog_new (GTK_WINDOW (win), GTK_DIALOG_DESTROY_WITH_PARENT,
51+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", error->message);
52+ gtk_dialog_run(GTK_DIALOG(dialog));
53+ gtk_widget_destroy(dialog);
54+ g_error_free(error);
55+ }
56+- g_free(cmdline);
57+-}
58+-
59+-
60+-static void
61+-cb_help (GtkAction *action,
62+- GnomeVolumeControlWindow *win)
63+-{
64+- open_uri (GTK_WINDOW (win), "ghelp:gnome-volume-control");
65+ }
66+
67+ static void

Subscribers

People subscribed via source and target branches