Return NULL unless screen number is zero. We have only one screen on

2005-06-05  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkscreen-win32.c
	(_gdk_windowing_substitute_screen_number): Return NULL unless
	screen number is zero. We have only one screen on Win32.
	(gdk_screen_make_display_name): Call gdk_display_get_name() and
	return that.

ChangeLog

@@ -1,5 +1,11 @@
 2005-06-05  Tor Lillqvist  <tml@novell.com>
 
+	* gdk/win32/gdkscreen-win32.c
+	(_gdk_windowing_substitute_screen_number): Return NULL unless
+	screen number is zero. We have only one screen on Win32.
+	(gdk_screen_make_display_name): Call gdk_display_get_name() and
+	return that.
+	
 	* modules/engines/Makefile.am
 	* modules/input/Makefile.am: Decide whether to build the
 	ms-windows theme engine based on the GDK backend, not based on

ChangeLog.pre-2-10

@@ -1,5 +1,11 @@
 2005-06-05  Tor Lillqvist  <tml@novell.com>
 
+	* gdk/win32/gdkscreen-win32.c
+	(_gdk_windowing_substitute_screen_number): Return NULL unless
+	screen number is zero. We have only one screen on Win32.
+	(gdk_screen_make_display_name): Call gdk_display_get_name() and
+	return that.
+	
 	* modules/engines/Makefile.am
 	* modules/input/Makefile.am: Decide whether to build the
 	ms-windows theme engine based on the GDK backend, not based on

ChangeLog.pre-2-8

@@ -1,5 +1,11 @@
 2005-06-05  Tor Lillqvist  <tml@novell.com>
 
+	* gdk/win32/gdkscreen-win32.c
+	(_gdk_windowing_substitute_screen_number): Return NULL unless
+	screen number is zero. We have only one screen on Win32.
+	(gdk_screen_make_display_name): Call gdk_display_get_name() and
+	return that.
+	
 	* modules/engines/Makefile.am
 	* modules/input/Makefile.am: Decide whether to build the
 	ms-windows theme engine based on the GDK backend, not based on

gdk/win32/gdkscreen-win32.c

@@ -106,11 +106,14 @@ gchar *
 _gdk_windowing_substitute_screen_number (const gchar *display_name,
 					 int          screen_number)
 {
+  if (screen_number != 0)
+    return NULL;
+
   return g_strdup (display_name);
 }
 
 gchar *
 gdk_screen_make_display_name (GdkScreen *screen)
 {
-  return g_strdup ("");
+  return gdk_display_get_name (_gdk_display);
 }