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