Comment 44 for bug 198951

Revision history for this message
Sebastien Bacher (seb128) wrote :

The issue was due to "RWOutput *output = rw_output_by_id (output->info, info->clones[i]);", the same variable name is used for the new rwoutput and as function parameter which creates a conflict and breaks the argument used there

The new upload fixes the gnome-settings-daemon issue, testing on an i855 and a xnest configurations

The debdiff is not trivial but those are mostly context changes (the previous change was not likely a cdbs-edit-patch one), the code change is this one

" --- gnome-desktop-2.22.0/libgnome-desktop/randrwrap.c 2008-03-17 15:39:41.000000000 +0100
+++ gnome-desktop-2.22.0.new/libgnome-desktop/randrwrap.c 2008-03-17 15:39:10.000000000 +0100
@@ -603,10 +603,10 @@
     a = g_ptr_array_new ();
     for (i = 0; i < info->nclone; ++i)
     {
- RWOutput *output = rw_output_by_id (output->info, info->clones[i]);
+ RWOutput *rwoutput = rw_output_by_id (output->info, info->clones[i]);

- if (output)
- g_ptr_array_add (a, output);
+ if (rwoutput)
+ g_ptr_array_add (a, rwoutput);
     }
     g_ptr_array_add (a, NULL);
     output->clones = (RWOutput **)g_ptr_array_free (a, FALSE);"