[maemo-commits] [maemo-commits] r8932 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gdk/x11

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-01-03 16:07:34 +0200 (Wed, 03 Jan 2007)
New Revision: 8932

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c
Log:
2007-01-03  Kristian Rietveld  <kris at imendio.com>

	* gdk/x11/gdkwindow-x11.c (utf8_is_latin1),
	(set_text_property), (set_wm_name), (gdk_window_set_title),
	(gdk_window_set_icon_name): disable code setting legacy ICCCM
	properties by wrapping the responsible code in ENABLE_ICCCM_LEGACY
	defines.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-03 14:02:07 UTC (rev 8931)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-03 14:07:34 UTC (rev 8932)
@@ -1,5 +1,13 @@
 2007-01-03  Kristian Rietveld  <kris at imendio.com>
 
+	* gdk/x11/gdkwindow-x11.c (utf8_is_latin1),
+	(set_text_property), (set_wm_name), (gdk_window_set_title),
+	(gdk_window_set_icon_name): disable code setting legacy ICCCM
+	properties by wrapping the responsible code in ENABLE_ICCCM_LEGACY
+	defines.
+
+2007-01-03  Kristian Rietveld  <kris at imendio.com>
+
 	* gdk/x11/gdkwindow-x11.c (gdk_window_set_type_hint): fix build by
 	having the dropdown menu hint set the message hint.
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c	2007-01-03 14:02:07 UTC (rev 8931)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c	2007-01-03 14:07:34 UTC (rev 8932)
@@ -2745,6 +2745,7 @@
   XFree (size_hints);
 }
 
+#ifdef ENABLE_ICCCM_LEGACY
 static gboolean
 utf8_is_latin1 (const gchar *str)
 {
@@ -2812,6 +2813,7 @@
 	g_free (prop_text);
     }
 }
+#endif
 
 /* Set WM_NAME and _NET_WM_NAME
  */
@@ -2825,9 +2827,11 @@
 		   gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING"), 8,
 		   PropModeReplace, (guchar *)name, strlen (name));
   
+#ifdef ENABLE_ICCCM_LEGACY
   set_text_property (display, xwindow,
 		     gdk_x11_get_xatom_by_name_for_display (display, "WM_NAME"),
 		     name);
+#endif
 }
 
 /**
@@ -2868,9 +2872,11 @@
 		       gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING"), 8,
 		       PropModeReplace, (guchar *)title, strlen (title));
       
+#ifdef ENABLE_ICCCM_LEGACY
       set_text_property (display, xwindow,
 			 gdk_x11_get_xatom_by_name_for_display (display, "WM_ICON_NAME"),
 			 title);
+#endif
     }
 }
 
@@ -4485,9 +4491,11 @@
 		   gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING"), 8,
 		   PropModeReplace, (guchar *)name, strlen (name));
   
+#ifdef ENABLE_ICCCM_LEGACY
   set_text_property (display, GDK_WINDOW_XID (window),
 		     gdk_x11_get_xatom_by_name_for_display (display, "WM_ICON_NAME"),
 		     name);
+#endif
 }
 
 /**