← Back to branch summary

~swem/totem/assignment

« back to all changes in this revision

Viewing changes to src/plugins/brasero-disc-recorder/totem-disc-recorder.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2010-01-27 09:40:18 UTC
  • mfrom: (1.4.2 upstream) (5.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100127094018-q6rzt7va0y8ketwt
Tags: 2.29.4-1
* New upstream development release:
  + debian/patches/90_autotools.patch:
    - Refreshed for the new version.
  + debian/control.in:
    - Update build dependencies and dependencies.
    - Drop tracker plugin, it needs tracker 0.7.
  + debian/totem-mozilla.links:
    - Drop the complex plugin, it doesn't exist anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/brasero-disc-recorder/totem-disc-recorder.c
91
91
                                          gboolean copy)
92
92
{
93
93
        GtkWindow *main_window;
 
94
        GdkScreen *screen;
94
95
        GPtrArray *array;
95
96
        char **args, *xid_str;
96
97
        GError *error = NULL;
97
98
        gboolean ret;
 
99
        int xid;
98
100
 
99
101
        array = g_ptr_array_new ();
100
102
        g_ptr_array_add (array, (gpointer) "brasero");
105
107
        g_ptr_array_add (array, (gpointer) path);
106
108
 
107
109
        main_window = totem_get_main_window (pi->totem);
108
 
        if (main_window && GTK_WIDGET (main_window)->window) {
109
 
                int xid;
110
 
                xid = gdk_x11_drawable_get_xid (GDK_DRAWABLE (GTK_WIDGET (main_window)->window));
111
 
                xid_str = g_strdup_printf ("%d", xid);
112
 
                g_ptr_array_add (array, (gpointer) "-x");
113
 
                g_ptr_array_add (array, xid_str);
114
 
        } else {
115
 
                xid_str = NULL;
116
 
        }
 
110
        screen = gtk_widget_get_screen (GTK_WIDGET (main_window));
 
111
        xid = gdk_x11_drawable_get_xid (GDK_DRAWABLE (GTK_WIDGET (main_window)->window));
 
112
        xid_str = g_strdup_printf ("%d", xid);
 
113
        g_ptr_array_add (array, (gpointer) "-x");
 
114
        g_ptr_array_add (array, xid_str);
117
115
 
118
116
        g_ptr_array_add (array, NULL);
119
117
        args = (char **) g_ptr_array_free (array, FALSE);
120
118
 
121
119
        ret = TRUE;
122
 
        if (!g_spawn_async (NULL, args, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error)) {
 
120
        if (gdk_spawn_on_screen (screen, NULL, args, NULL,
 
121
                                 G_SPAWN_SEARCH_PATH | G_SPAWN_FILE_AND_ARGV_ZERO,
 
122
                                 NULL, NULL, NULL, &error) == FALSE) {
123
123
                if (copy != FALSE) {
124
124
                        totem_interface_error (_("The video disc could not be duplicated."),
125
125
                                               error->message,