[patch] patch for single-screen gnome-panel

screens.patch (text/plain), 4.22 KB, created by BoyZonder on 2010-12-09 08:28:06 UTC

diff -Naur gnome-panel-2.32.1/applets/notification_area/na-tray.c gnome-panel-2.32.1-mod/applets/notification_area/na-tray.c
--- gnome-panel-2.32.1/applets/notification_area/na-tray.c	2010-06-23 01:00:27.000000000 +0200
+++ gnome-panel-2.32.1-mod/applets/notification_area/na-tray.c	2010-12-09 09:04:11.506444066 +0100
@@ -607,7 +607,8 @@
       int n_screens;
 
       display = gdk_display_get_default ();
-      n_screens = gdk_display_get_n_screens (display);
+//      n_screens = gdk_display_get_n_screens (display);
+      n_screens = 1;
       trays_screens = g_new0 (TraysScreen, n_screens);
       initialized = TRUE;
     }
diff -Naur gnome-panel-2.32.1/applets/notification_area/testtray.c gnome-panel-2.32.1-mod/applets/notification_area/testtray.c
--- gnome-panel-2.32.1/applets/notification_area/testtray.c	2010-06-23 01:00:27.000000000 +0200
+++ gnome-panel-2.32.1-mod/applets/notification_area/testtray.c	2010-12-09 09:04:23.206444009 +0100
@@ -207,7 +207,8 @@
   gtk_window_set_default_icon_name (NOTIFICATION_AREA_ICON);
 
   display = gdk_display_get_default ();
-  n_screens =  gdk_display_get_n_screens (display);
+//  n_screens =  gdk_display_get_n_screens (display);
+  n_screens =  1;
   for (i = 0; i < n_screens; ++i) {
     screen = gdk_display_get_screen (display, i);
 
diff -Naur gnome-panel-2.32.1/gnome-panel/panel-background-monitor.c gnome-panel-2.32.1-mod/gnome-panel/panel-background-monitor.c
--- gnome-panel-2.32.1/gnome-panel/panel-background-monitor.c	2010-02-09 13:32:08.000000000 +0100
+++ gnome-panel-2.32.1-mod/gnome-panel/panel-background-monitor.c	2010-12-09 09:02:28.788444002 +0100
@@ -180,7 +180,8 @@
 	if (!global_background_monitors) {
 		int n_screens;
 
-		n_screens = gdk_display_get_n_screens (gdk_display_get_default ());
+//		n_screens = gdk_display_get_n_screens (gdk_display_get_default ());
+		n_screens = 1;
 
 		global_background_monitors = g_new0 (PanelBackgroundMonitor *, n_screens);
 	}
diff -Naur gnome-panel-2.32.1/gnome-panel/panel-multiscreen.c gnome-panel-2.32.1-mod/gnome-panel/panel-multiscreen.c
--- gnome-panel-2.32.1/gnome-panel/panel-multiscreen.c	2010-02-09 13:32:08.000000000 +0100
+++ gnome-panel-2.32.1-mod/gnome-panel/panel-multiscreen.c	2010-12-09 09:03:49.653444002 +0100
@@ -450,7 +450,8 @@
 		return;
 
 	display = gdk_display_get_default ();
-	screens = gdk_display_get_n_screens (display);
+//	screens = gdk_display_get_n_screens (display);
+	screens = 1;
 
 	panel_multiscreen_init_randr (display);
 
@@ -501,7 +502,8 @@
 	display = gdk_display_get_default ();
 	/* Don't use the screens variable since in the future, we might
 	 * want to call this function when a screen appears/disappears. */
-	new_screens = gdk_display_get_n_screens (display);
+//	new_screens = gdk_display_get_n_screens (display);
+	new_screens = 1;
 
 	for (i = 0; i < new_screens; i++) {
 		GdkScreen *screen;
diff -Naur gnome-panel-2.32.1/gnome-panel/panel-profile.c gnome-panel-2.32.1-mod/gnome-panel/panel-profile.c
--- gnome-panel-2.32.1/gnome-panel/panel-profile.c	2010-09-07 01:00:14.000000000 +0200
+++ gnome-panel-2.32.1-mod/gnome-panel/panel-profile.c	2010-12-09 09:03:24.725444009 +0100
@@ -1601,7 +1601,8 @@
 
 	display = gdk_display_get_default ();
 
-	if (screen_n < 0 || screen_n >= gdk_display_get_n_screens (display)) {
+//	if (screen_n < 0 || screen_n >= gdk_display_get_n_screens (display)) {
+	if (screen_n < 0 || screen_n >= 1) {
 #if 0
 		g_warning (_("Panel '%s' is set to be displayed on screen %d which "
 			     "is not currently available. Not loading this panel."),
@@ -2487,7 +2488,8 @@
 
 	display = gdk_display_get_default ();
 
-	n_screens = gdk_display_get_n_screens (display);
+//	n_screens = gdk_display_get_n_screens (display);
+	n_screens = 1;
 	for (i = 0; i < n_screens; i++) {
 		GdkScreen *screen;
 
diff -Naur gnome-panel-2.32.1/gnome-panel/xstuff.c gnome-panel-2.32.1-mod/gnome-panel/xstuff.c
--- gnome-panel-2.32.1/gnome-panel/xstuff.c	2010-09-11 13:42:25.000000000 +0200
+++ gnome-panel-2.32.1-mod/gnome-panel/xstuff.c	2010-12-09 09:02:43.359443962 +0100
@@ -674,7 +674,8 @@
 	int         i;
 
 	display   = gdk_display_get_default ();
-	n_screens = gdk_display_get_n_screens (display);
+//	n_screens = gdk_display_get_n_screens (display);
+	n_screens = 1;
 
 	for (i = 0; i < n_screens; i++) {
 		GdkWindow *root;