Only in panel: Makefile
diff panel.orig/aligned-widget.c panel/aligned-widget.c
287a288
> 			      gboolean span_screens,
314a316
> 				     span_screens,
344a347
> 				      basep->span_screens,
370a374
> 				      basep->span_screens,
389a394
> 		    gboolean span_screens,
413a419
> 				 span_screens,
diff panel.orig/aligned-widget.h panel/aligned-widget.h
55a56
> 			       gboolean span_screens,
73a75
> 				   gboolean span_screens,
Only in panel: appletsConf.sh
diff panel.orig/basep-widget.c panel/basep-widget.c
92a93
> 	SPAN_SCREENS_CHANGE_SIGNAL,
273,280c274,292
< 		max = multiscreen_width (basep->screen) -
< 			allocation->width +
< 			multiscreen_x (basep->screen);
< 
< 		if (allocation->x < multiscreen_x (basep->screen))
< 			allocation->x = multiscreen_x (basep->screen);
< 		else if (allocation->x > max)
< 			allocation->x = max;
---
> 		if (basep->span_screens)
> 			max = gdk_screen_width () - allocation->width;
> 		else
> 			max = multiscreen_width (basep->screen) -
> 				allocation->width +
> 				multiscreen_x (basep->screen);
> 
> 		if (basep->span_screens) {
> 			if (allocation->x < 0)
> 				allocation->x = 0;
> 			else if (allocation->x > max)
> 				allocation->x = max;
> 		}
> 		else {
> 			if (allocation->x < multiscreen_x (basep->screen))
> 				allocation->x = multiscreen_x (basep->screen);
> 			else if (allocation->x > max)
> 				allocation->x = max;
> 		}
283,285c295,300
< 		max = multiscreen_height (basep->screen) -
< 			allocation->height +
< 			multiscreen_y (basep->screen);
---
> 		if (basep->span_screens)
> 			max = gdk_screen_height () - allocation->height;
> 		else
> 			max = multiscreen_height (basep->screen) -
> 				allocation->height +
> 				multiscreen_y (basep->screen);
291c306,318
< 				       
---
> 
> 		if (basep->span_screens) {
> 			if (allocation->y < 0)
> 				allocation->y = 0;
> 			else if (allocation->y > max)
> 				allocation->y = max;
> 		}
> 		else {
> 			if (allocation->y < multiscreen_y (basep->screen))
> 				allocation->y = multiscreen_y (basep->screen);
> 			else if (allocation->y > max)
> 				allocation->y = max;
> 		}
320a348,362
> basep_widget_real_span_screens_change (BasePWidget *basep,
> 				       gboolean span_screens)
> {
> 	if (basep->span_screens != span_screens) {
> 		basep_border_queue_recalc (basep->screen);
> 		basep->span_screens = span_screens;
> 		/* this will queue border recalc in the new screen */
> 		gtk_widget_queue_resize (GTK_WIDGET (basep));
> 		panels_to_sync = TRUE;
> 
> 		update_config_span_screens (basep);
> 	}
> }
> 
> static void
382a425,435
> 	basep_widget_signals[SPAN_SCREENS_CHANGE_SIGNAL] = 
> 		gtk_signal_new("span_screens_change",
> 			       GTK_RUN_LAST,
> 			       object_class->type,
> 			       GTK_SIGNAL_OFFSET(BasePWidgetClass,
> 						 span_screens_change),
> 			       gtk_marshal_NONE__BOOL,
> 			       GTK_TYPE_NONE,
> 			       1,
> 			       GTK_TYPE_BOOL);
> 
389a443
> 	klass->span_screens_change = basep_widget_real_span_screens_change;
1295a1350
> 			gboolean span_screens,
1391a1447
> 	basep->span_screens = span_screens;
1422a1479
> 			    gboolean span_screens,
1498a1556
> 	basep_widget_span_screens_change (basep, span_screens);
1918,1930c1976,2005
< 	if (*x + mreq.width >
< 	    multiscreen_x (basep->screen) + multiscreen_width (basep->screen))
< 		*x = multiscreen_x (basep->screen) + 
< 			multiscreen_width (basep->screen) - mreq.width;
< 	if (*x < multiscreen_x (basep->screen))
< 		*x = multiscreen_x (basep->screen);
< 
< 	if (*y + mreq.height >
< 	    multiscreen_y (basep->screen) + multiscreen_height (basep->screen))
< 		*y = multiscreen_y (basep->screen) + 
< 			multiscreen_height (basep->screen) - mreq.height;
< 	if (*y < multiscreen_y (basep->screen))
< 		*y = multiscreen_y (basep->screen);
---
> 
> 	if (basep->span_screens) {
> 		if (*x + mreq.width > gdk_screen_width ())
> 			*x = gdk_screen_width () - mreq.width;
> 		if (*x < 0)
> 			*x = 0;
> 
> 		if (*y + mreq.height > gdk_screen_height ())
> 			*y = gdk_screen_height () - mreq.height;
> 		if (*y < 0)
> 			*y = 0;
> 	}
> 	else {
> 		if (*x + mreq.width >
> 			multiscreen_x (basep->screen) +
> 				multiscreen_width (basep->screen))
> 			*x = multiscreen_x (basep->screen) + 
> 				multiscreen_width (basep->screen) - mreq.width;
> 		if (*x < multiscreen_x (basep->screen))
> 			*x = multiscreen_x (basep->screen);
> 
> 		if (*y + mreq.height >
> 			multiscreen_y (basep->screen) + 
> 				multiscreen_height (basep->screen))
> 			*y = multiscreen_y (basep->screen) + 
> 				multiscreen_height (basep->screen) -
> 				mreq.height;
> 		if (*y < multiscreen_y (basep->screen))
> 			*y = multiscreen_y (basep->screen);
> 	}
2060,2064c2135,2141
< 	newscreen = multiscreen_screen_from_pos (x, y);
< 	if (newscreen >= 0 &&
< 	    newscreen != basep->screen) {
< 		force = TRUE;
< 		basep_widget_screen_change (basep, newscreen);
---
> 	if (!basep->span_screens) {
> 		newscreen = multiscreen_screen_from_pos (x, y);
> 		if (newscreen >= 0 &&
> 		    newscreen != basep->screen) {
> 			force = TRUE;
> 			basep_widget_screen_change (basep, newscreen);
> 		}
2108a2186,2199
> }
> 
> void
> basep_widget_span_screens_change (BasePWidget *basep, gboolean span_screens)
> {
> 	g_return_if_fail (basep != NULL);
> 	g_return_if_fail (IS_BASEP_WIDGET (basep));
> 
> 	if (basep->span_screens == span_screens)
> 		return;
> 
> 	gtk_signal_emit (GTK_OBJECT (basep),
> 			 basep_widget_signals[SPAN_SCREENS_CHANGE_SIGNAL],
> 			 span_screens);
diff panel.orig/basep-widget.h panel/basep-widget.h
58a59,60
> 	gboolean		span_screens;
> 
117a120,122
> 	void (* span_screens_change) (BasePWidget *basep,
> 				      gboolean span_screens);
> 
183a189
> 						 gboolean span_screens,
201a208
> 						 gboolean span_screens,
298a306,307
> void		basep_widget_span_screens_change (BasePWidget *basep,
> 						  gboolean span_screens);
diff panel.orig/border-widget.c panel/border-widget.c
200a201
> 			     gboolean span_screens,
232a234
> 				    span_screens,
297a300
> 				     basep->span_screens,
317a321
> 			 gboolean span_screens,
350a355
> 				span_screens,
diff panel.orig/border-widget.h panel/border-widget.h
56a57
> 				    gboolean span_screens,
75a77
> 				  gboolean span_screens,
Common subdirectories: panel.orig/config and panel/config
Common subdirectories: panel.orig/doc and panel/doc
Only in panel: dockletsConf.sh
diff panel.orig/drawer-widget.c panel/drawer-widget.c
417a418
> 				    BASEP_WIDGET (drawer)->span_screens,
498a500
> 				TRUE /* FIXME */,
diff panel.orig/edge-widget.c panel/edge-widget.c
105,108c105,117
< 	innerx = x - multiscreen_x (basep->screen);
< 	innery = y - multiscreen_y (basep->screen);
< 	screen_width = multiscreen_width (basep->screen);
< 	screen_height = multiscreen_height (basep->screen);
---
> 
> 	if (basep->span_screens) {
> 		innerx = x;
> 		innery = y;
> 		screen_width = gdk_screen_width ();
> 		screen_height = gdk_screen_height ();
> 	}
> 	else {
> 		innerx = x - multiscreen_x (basep->screen);
> 		innery = y - multiscreen_y (basep->screen);
> 		screen_width = multiscreen_width (basep->screen);
> 		screen_height = multiscreen_height (basep->screen);
> 	}
147c156,159
< 		*x = multiscreen_width(basep->screen) - w;
---
> 		if (basep->span_screens)
> 			*x = gdk_screen_width() - w;
> 		else
> 			*x = multiscreen_width(basep->screen) - w;
158c170,173
< 		*y = multiscreen_height(basep->screen) - h;
---
> 		if (basep->span_screens)
> 			*y = gdk_screen_height() - h;
> 		else
> 			*y = multiscreen_height(basep->screen) - h;
162,163c177,180
< 	*x += multiscreen_x (basep->screen);
< 	*y += multiscreen_y (basep->screen);
---
> 	if (!basep->span_screens) {
> 		*x += multiscreen_x (basep->screen);
> 		*y += multiscreen_y (basep->screen);
> 	}
179c196,199
< 		*h = multiscreen_height (basep->screen) - foobar_widget_get_height (basep->screen) - a - b;
---
> 		if (basep->span_screens)
> 			*h = gdk_screen_height () - foobar_widget_get_height (basep->screen) - a - b;
> 		else 
> 			*h = multiscreen_height (basep->screen) - foobar_widget_get_height (basep->screen) - a - b;
184c204,207
< 		*h = multiscreen_height (basep->screen) - foobar_widget_get_height (basep->screen) - a - b;
---
> 		if (basep->span_screens)
> 			*h = gdk_screen_height () - foobar_widget_get_height (basep->screen) - a - b;
> 		else
> 			*h = multiscreen_height (basep->screen) - foobar_widget_get_height (basep->screen) - a - b;
188c211,214
< 		*w = multiscreen_width (basep->screen);
---
> 		if (basep->span_screens)
> 			*w = gdk_screen_width ();
> 		else
> 			*w = multiscreen_width (basep->screen);
201a228
> 		 gboolean span_screens,
223a251
> 				 span_screens,
diff panel.orig/edge-widget.h panel/edge-widget.h
48a49
> 			    gboolean span_screens,
diff panel.orig/floating-widget.c panel/floating-widget.c
414a415
> 			       gboolean span_screens,
450a452
> 				    span_screens,
477a480
> 					       basep->span_screens,
506a510
> 					       basep->span_screens,
527a532
> 		     gboolean span_screens,
557a563
> 				span_screens,
diff panel.orig/floating-widget.h panel/floating-widget.h
48a49
> 				gboolean span_screens,
67a69
> 				    gboolean span_screens,
diff panel.orig/foobar-widget.h panel/foobar-widget.h
31a32
> 	gboolean span_screens;
Only in panel.orig/: gnome-panel-common.c
Only in panel: gnome-panel-properties.desktop
Only in panel.orig/: gnome-panel-skels.c
Only in panel.orig/: gnome-panel-stubs.c
Only in panel.orig/: gnome-panel.h
Common subdirectories: panel.orig/help and panel/help
diff panel.orig/menu.c panel/menu.c
33a34
> 
2397,2400d2397
<       int screen_basex, screen_basey;
<       int screen;
< 
<       screen = multiscreen_screen_from_pos (x, y);
2402,2415c2399,2400
<       if (screen < 0) {
< 	      screen_width = gdk_screen_width ();
< 	      screen_height = gdk_screen_height ();
< 	      screen_basex = 0;
< 	      screen_basey = 0;
<       } else {
< 	      screen_width = multiscreen_width (screen);
< 	      screen_height = multiscreen_height (screen);
< 	      screen_basex = multiscreen_x (screen);
< 	      screen_basey = multiscreen_y (screen);
<       }
< 
<       x -= screen_basex;
<       y -= screen_basey;
---
>       screen_width = gdk_screen_width ();
>       screen_height = gdk_screen_height ();
2428,2430d2412
< 
<       x += screen_basex;
<       y += screen_basey;
3336,3337c3318,3319
< 	sw2 = 2 * (sw = multiscreen_width (screen) / 3);
< 	sh2 = 2 * (sh = multiscreen_height (screen) / 3);
---
> 	sw2 = 2 * (sw = gdk_screen_width () / 3);
> 	sh2 = 2 * (sh = gdk_screen_height () / 3);
3352,3353c3334,3335
< 		tx -= multiscreen_x (screen);
< 		ty -= multiscreen_y (screen);
---
> 		tx -= 0;
> 		ty -= 0;
3389,3393c3371,3372
< 	*x = ((float)lowi * multiscreen_width (screen)) / 2.0;
< 	*y = ((float)lowj * multiscreen_height (screen)) / 2.0;
< 
< 	*x += multiscreen_x (screen);
< 	*y += multiscreen_y (screen);
---
> 	*x = ((float)lowi * gdk_screen_width ()) / 2.0;
> 	*y = ((float)lowj * gdk_screen_height ()) / 2.0;
3434,3435c3413
< 		screen = multiscreen_screen_from_panel
< 			(menu_panel->panel_parent);
---
> 		screen = multiscreen_screen_from_panel (menu_panel->panel_parent);
3442a3421
> 					    FALSE,
3461a3441
> 					 FALSE,
3479a3460
> 					    FALSE,
3497a3479
> 					     FALSE,
4070,4071c4052
< 			edge = (y - multiscreen_y (basep->screen) >
< 				(multiscreen_height (basep->screen) / 2))
---
> 			edge = (y > (gdk_screen_height () / 2))
4074,4075c4055
< 			edge = (x - multiscreen_x (basep->screen) >
< 				(multiscreen_width (basep->screen) / 2))
---
> 			edge = (x > (gdk_screen_width () / 2))
4092,4093c4072
< 			edge = (y - multiscreen_y (basep->screen) >
< 				(multiscreen_height (basep->screen) / 2))
---
> 			edge = (y > (gdk_screen_height () / 2))
4096,4097c4075
< 			edge = (x - multiscreen_x (basep->screen) >
< 				(multiscreen_width (basep->screen) / 2))
---
> 			edge = (x > (gdk_screen_width () / 2))
4101,4102c4079,4080
< 			mid = x + w / 2 - multiscreen_x (basep->screen);
< 			max = multiscreen_width (basep->screen);
---
> 			mid = x + w / 2;
> 			max = gdk_screen_width ();
4104,4105c4082,4083
< 			mid = y + h / 2 - multiscreen_y (basep->screen);
< 			max = multiscreen_height (basep->screen);
---
> 			mid = y + h / 2;
> 			max = gdk_screen_height ();
4130,4131c4108
< 			edge = (y - multiscreen_y (basep->screen) >
< 				(multiscreen_height (basep->screen) / 2))
---
> 			edge = (y > (gdk_screen_height () / 2))
4134,4135c4111
< 			edge = (x - multiscreen_x (basep->screen) >
< 				(multiscreen_width (basep->screen) / 2))
---
> 			edge = (x > (gdk_screen_width () / 2))
4139,4140c4115,4116
< 			val = x - multiscreen_x (basep->screen);
< 			max = multiscreen_width (basep->screen);
---
> 			val = x;
> 			max = gdk_screen_width ();
4142,4143c4118,4119
< 			val = y - multiscreen_y (basep->screen);
< 			max = multiscreen_height (basep->screen);
---
> 			val = y;
> 			max = gdk_screen_height ();
4193a4170
> 				    basep->span_screens,
4230a4208
> 				    basep->span_screens,
4267a4246
> 				    basep->span_screens,
4325a4305
> 				    basep->span_screens,
4399a4380
> 				    basep->span_screens,
6270,6272c6251,6252
< 				     multiscreen_y (screen),
< 				     multiscreen_y (screen) +
< 				     	multiscreen_height (screen));
---
> 				     0,
> 				     gdk_screen_height ());
6277,6289c6257,6265
< 	if (x + menutop->allocation.width >
< 	    multiscreen_x (screen) + multiscreen_width (screen))
< 		x = multiscreen_x (screen) + multiscreen_width (screen) -
< 			menutop->allocation.width;
< 	if (y + menutop->allocation.height >
< 	    multiscreen_y (screen) + multiscreen_height (screen))
< 		y = multiscreen_y (screen) + multiscreen_height (screen) -
< 			menutop->allocation.height;
< 
< 	if (x < multiscreen_x (screen))
< 		x = multiscreen_x (screen);
< 	if (y < multiscreen_y (screen))
< 		y = multiscreen_y (screen);
---
> 	if (x + menutop->allocation.width > gdk_screen_width ())
> 		x = gdk_screen_width () - menutop->allocation.width;
> 	if (y + menutop->allocation.height > gdk_screen_height ())
> 		y = gdk_screen_height () - menutop->allocation.height;
> 
> 	if (x < 0)
> 		x = 0;
> 	if (y < 0)
> 		y = 0;
diff panel.orig/multiscreen-stuff.c panel/multiscreen-stuff.c
127a128
> 
181c182
< 		if (x >= rectangles[i].x &&
---
> 		    if (x >= rectangles[i].x &&
Only in panel: panel.soundlist
diff panel.orig/panel_config.c panel/panel_config.c
9d8
< 
141,142c140,147
< 	xlimit = multiscreen_width(panel->screen) - widget->allocation.width;
< 	ylimit = multiscreen_height(panel->screen) - widget->allocation.height;
---
> 	if (ppc->span_screens) {
> 	    xlimit = gdk_screen_width() - widget->allocation.width;
> 	    ylimit = gdk_screen_height() - widget->allocation.height;
> 	}
> 	else {
> 	    xlimit = multiscreen_width(panel->screen) - widget->allocation.width;
> 	    ylimit = multiscreen_height(panel->screen) - widget->allocation.height;
> 	}
206a212,221
> update_config_span_screens (BasePWidget *w)
> {
> 	PerPanelConfig *ppc = get_config_struct (GTK_WIDGET (w));
> 
> 	if (ppc == NULL ||
> 	    ppc->ppc_origin_change)
> 		return;
> }
> 
> void
451,452c466,471
< 		range = multiscreen_height (panel->screen)
< 			- widget->allocation.height;
---
> 		if (ppc->span_screens)
> 			range = gdk_screen_height ()
> 				- widget->allocation.height;
> 		else
> 			range = multiscreen_height (panel->screen)
> 				- widget->allocation.height;
454,455c473,477
< 		range = multiscreen_width (panel->screen)
< 			- widget->allocation.width;
---
> 		if (ppc->span_screens)
> 			range = gdk_screen_width() - widget->allocation.width;
> 		else
> 			range = multiscreen_width (panel->screen)
> 				- widget->allocation.width;
509a532
> 					    ppc->span_screens,
526a550
> 					     ppc->span_screens,
545a570
> 					      ppc->span_screens,
563a589
> 					       ppc->span_screens,
711a738,753
> static void
> span_screens_set (GtkWidget *widget, gpointer data)
> {
> 	PerPanelConfig *ppc = gtk_object_get_user_data (GTK_OBJECT (widget));
> 
> 	if (ppc->span_screens_radio == widget)
> 		ppc->span_screens = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
> 
> 	if (ppc->span_screens)
> 		gtk_widget_set_sensitive(ppc->screen_spin, FALSE);
> 	else
> 		gtk_widget_set_sensitive(ppc->screen_spin, TRUE);
> 
> 	panel_config_register_changes (ppc);
> }
> 
716,717c758,760
< 	GtkWidget *box, *hbox;
< 	GtkWidget *button, *label;
---
> 	GtkWidget *box, *hbox, *vbox;
> 	GtkWidget *button;
> 	GtkWidget *span_screens, *limit_screens;
742a786
> 	/* Multiscreen */
745d788
< 		gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
747,748c790,804
< 		label = gtk_label_new (_("Current screen:"));
< 		gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
---
> 		vbox = gtk_vbox_new (FALSE, 0);
> 		gtk_box_pack_start (GTK_BOX (box), vbox, FALSE, FALSE, 0);
> 
> 		ppc->span_screens_radio = span_screens =
> 			gtk_radio_button_new_with_label(NULL, _("Panel spans all screens"));
> 		gtk_box_pack_start (GTK_BOX (vbox), span_screens, FALSE, FALSE, 0);
> 		gtk_object_set_user_data (GTK_OBJECT (span_screens), ppc);
> 		gtk_signal_connect (GTK_OBJECT (span_screens), "toggled",
> 				    GTK_SIGNAL_FUNC (span_screens_set),
> 				    NULL);
> 
> 		ppc->single_screen_radio = limit_screens =
> 			gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (span_screens), _("Panel remains on screen: "));
> 		gtk_box_pack_start (GTK_BOX (hbox), limit_screens, FALSE, FALSE, 0);
> 		gtk_object_set_user_data (GTK_OBJECT (limit_screens), ppc);
760,761c816
< 		gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
< 	}
---
> 		gtk_box_pack_start (GTK_BOX(hbox), button, FALSE, FALSE, 0);
762a818,828
> 		gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
> 
> 		if (ppc->span_screens) {
> 			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ppc->span_screens_radio), TRUE);
> 			gtk_widget_set_sensitive(ppc->screen_spin, FALSE);
> 		}
> 		else {
> 			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ppc->single_screen_radio), TRUE);
> 			gtk_widget_set_sensitive(ppc->screen_spin, TRUE);
> 		}
> 	}
1030,1033c1096,1105
< 	xlimit = multiscreen_width (ppc->screen)
< 		- ppc->panel->allocation.width;
< 	ylimit = multiscreen_height (ppc->screen)
< 		- ppc->panel->allocation.height;
---
> 	if (ppc->span_screens) {
> 		xlimit = gdk_screen_width() - ppc->panel->allocation.width;
> 		ylimit = gdk_screen_height() - ppc->panel->allocation.height;
> 	}
> 	else {
> 		xlimit = multiscreen_width (ppc->screen)
> 			- ppc->panel->allocation.width;
> 		ylimit = multiscreen_height (ppc->screen)
> 			- ppc->panel->allocation.height;
> 	}
1143c1215
< 	
---
> 
1175,1176c1247,1252
< 		range = multiscreen_height (ppc->screen)
< 			- ppc->panel->allocation.height;
---
> 		if (ppc->span_screens)
> 			range = gdk_screen_height ()
> 				- ppc->panel->allocation.height;
> 		else
> 			range = multiscreen_height (ppc->screen)
> 				- ppc->panel->allocation.height;
1178,1179c1254,1260
< 		range = multiscreen_width (ppc->screen)
< 			- ppc->panel->allocation.width;
---
> 		if (ppc->span_screens)
> 			range = gdk_screen_width ()
> 				- ppc->panel->allocation.width;
> 		else
> 			range = multiscreen_width (ppc->screen)
> 				- ppc->panel->allocation.width;
> 
1558d1638
< 	GtkWidget *spinbutton;
1842a1923
> 	ppc->span_screens = basep->span_screens;
diff panel.orig/panel_config.h panel/panel_config.h
30a31,32
> 	gboolean		span_screens;
> 
71a74
> 	
73c76,78
< 	/*avoid_on_maximize*/
---
> 	/*multiscreen*/
> 	GtkWidget		*span_screens_radio;
> 	GtkWidget		*single_screen_radio;
75a81
> 
112a119
> void update_config_span_screens (BasePWidget *panel);
diff panel.orig/session.c panel/session.c
584,585c584,585
< 		gnome_config_set_int ("screen",
< 				      basep->screen);
---
> 		gnome_config_set_int ("screen", basep->screen);
> 		gnome_config_set_bool ("span_screens", basep->span_screens);
632a633
> 		gnome_config_set_bool ("span_screens", FOOBAR_WIDGET (pd->panel)->span_screens);
1272a1274
> 					 FALSE /* span_screens */,
1319a1322
> 		gboolean span_screens;
1379a1383,1385
> 		span_screens = conditional_get_bool ("span_screens", 
> 						     FALSE, NULL);
> 
1394a1401
> 						 span_screens,
1418a1426
> 						    span_screens,
1451a1460
> 						    span_screens,
1517a1527
> 						     span_screens,
diff panel.orig/sliding-widget.c panel/sliding-widget.c
283a284
> 		    gboolean span_screens,
310a312
> 				 span_screens,
332a335
> 			      gboolean span_screens,
368a372
> 				     span_screens,
396a401
> 				      basep->span_screens,
426a432
> 				      basep->span_screens,
455a462
> 				      basep->span_screens,
diff panel.orig/sliding-widget.h panel/sliding-widget.h
58a59
> 			       gboolean span_screens,
77a79
> 				   gboolean span_screens,
