Change FSF Address

[~andy/gtk] / gdk / x11 / gdkxid.c

diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index 2d229976f24a6a0158796f4cc806ae77ef7d305a..5eaa36af1e8cc0e622bc877b0f357c83fcaf8866 100644 (file)
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -48,12 +46,12 @@ _gdk_x11_display_add_window (GdkDisplay *display,
                              XID        *xid,
                              GdkWindow  *data)
 {
-  GdkDisplayX11 *display_x11;
+  GdkX11Display *display_x11;
 
   g_return_if_fail (xid != NULL);
   g_return_if_fail (GDK_IS_DISPLAY (display));
 
-  display_x11 = GDK_DISPLAY_X11 (display);
+  display_x11 = GDK_X11_DISPLAY (display);
 
   if (!display_x11->xid_ht)
     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
@@ -69,11 +67,11 @@ void
 _gdk_x11_display_remove_window (GdkDisplay *display,
                                 XID         xid)
 {
-  GdkDisplayX11 *display_x11;
+  GdkX11Display *display_x11;
 
   g_return_if_fail (GDK_IS_DISPLAY (display));
 
-  display_x11 = GDK_DISPLAY_X11 (display);
+  display_x11 = GDK_X11_DISPLAY (display);
 
   if (display_x11->xid_ht)
     g_hash_table_remove (display_x11->xid_ht, &xid);
@@ -81,7 +79,8 @@ _gdk_x11_display_remove_window (GdkDisplay *display,
 
 /**
  * gdk_x11_window_lookup_for_display:
- * @display: the #GdkDisplay corresponding to the window handle
+ * @display: (type GdkX11Window): the #GdkDisplay corresponding to the
+ *           window handle
  * @window: an XLib <type>Window</type>
  *
  * Looks up the #GdkWindow that wraps the given native window handle.
@@ -89,18 +88,18 @@ _gdk_x11_display_remove_window (GdkDisplay *display,
  * Return value: (transfer none): the #GdkWindow wrapper for the native
  *    window, or %NULL if there is none.
  *
- * Since: 3.0
+ * Since: 2.24
  */
 GdkWindow *
 gdk_x11_window_lookup_for_display (GdkDisplay *display,
                                    Window      window)
 {
-  GdkDisplayX11 *display_x11;
+  GdkX11Display *display_x11;
   GdkWindow *data = NULL;
 
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
 
-  display_x11 = GDK_DISPLAY_X11 (display);
+  display_x11 = GDK_X11_DISPLAY (display);
 
   if (display_x11->xid_ht)
     data = g_hash_table_lookup (display_x11->xid_ht, &window);