Author: dannym
Date: 2007-02-05 23:39:59 +0000 (Mon, 05 Feb 2007)
New Revision: 24859
Modified:
libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.c
Log:
back out netk_window_get_icon_geometry
Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.c
===================================================================
--- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.c 2007-02-05
20:49:11 UTC (rev 24858)
+++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.c 2007-02-05
23:39:59 UTC (rev 24859)
@@ -135,7 +135,6 @@
guint need_update_transient_for:1;
guint need_update_wmclass : 1;
guint need_update_wmhints : 1;
- guint need_update_icon_geometry : 1;
/* if available */
char *client_machine;
@@ -385,7 +384,6 @@
window->priv->need_update_transient_for = TRUE;
window->priv->need_update_wmclass = TRUE;
window->priv->need_update_wmhints = TRUE;
- window->priv->need_update_icon_geometry = TRUE;
force_update_now (window);
return window;
@@ -1275,42 +1273,6 @@
}
/**
- * netk_window_get_icon_geometry:
- * @window: a #NetkWindow
- * @xp: return location for X coordinate of icon
- * @yp: return location for Y coordinate of icon
- * @widthp: return location for width of icon
- * @heightp: return location for height of icon
- *
- * Gets the size and position of the icon.
- * returns %TRUE if there was one.
- *
- **/
-gboolean
-netk_window_get_icon_geometry (NetkWindow * window, int *xp, int *yp, int
*widthp, int *heightp)
-{
- g_return_val_if_fail (NETK_IS_WINDOW (window), FALSE);
-
- if (window->priv->icon_geometry.width == -1) {
- return FALSE;
- }
-
- if (xp != NULL)
- *xp = window->priv->icon_geometry.x;
-
- if (yp != NULL)
- *yp = window->priv->icon_geometry.y;
-
- if (widthp != NULL)
- *widthp = window->priv->icon_geometry.width;
-
- if (heightp != NULL)
- *heightp = window->priv->icon_geometry.height;
-
- return TRUE;
-}
-
-/**
* netk_window_set_icon_geometry:
* @window: a #NetkWindow
* @x: x coordinate in pixels
@@ -1490,11 +1452,6 @@
window->priv->need_update_wmhints = TRUE;
queue_update (window);
}
- else if (xevent->xproperty.atom == p_netk_atom_get
("_NET_WM_ICON_GEOMETRY"))
- {
- window->priv->need_update_icon_geometry = TRUE;
- queue_update (window);
- }
}
void
@@ -1925,18 +1882,6 @@
&window->priv->res_name);
}
-static void
-update_icon_geometry (NetkWindow *window)
-{
- if (!window->priv->need_update_icon_geometry)
- return;
-
- window->priv->need_update_icon_geometry = FALSE;
- if (!p_netk_get_icon_geometry(window->priv->xwindow,
&window->priv->icon_geometry.x, &window->priv->icon_geometry.y,
&window->priv->icon_geometry.width, &window->priv->icon_geometry.height)) {
- window->priv->icon_geometry.width = -1;
- }
-}
-
static void
update_wmhints (NetkWindow *window)
{
@@ -2007,13 +1952,13 @@
update_wmhints (window);
update_transient_for (window); /* wintype needs this to be first */
update_wintype (window);
- update_icon_geometry (window);
update_wm_state (window);
update_state (window); /* must come after the above, since they affect
* our calculated state
*/
update_workspace (window); /* emits signals */
update_actions (window);
+
get_icons (window);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
