summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2013-08-20 16:21:01 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2013-08-20 16:21:01 +0200
commit1cf648d3fd83d1c15eb27509c58ade29a5320203 (patch)
tree5cfe3619e268a49d44bcf8940e063f22bbfb4c2f
parent25f4fb1c6b073569e4561427ae737f0b6fa9da63 (diff)
downloadlibwnck-1cf648d3fd83d1c15eb27509c58ade29a5320203.tar.gz
WnckWindow: Add private function to load an icon and emit signal
-rw-r--r--libwnck/private.h2
-rw-r--r--libwnck/window.c24
2 files changed, 16 insertions, 10 deletions
diff --git a/libwnck/private.h b/libwnck/private.h
index f43a71e..d87661a 100644
--- a/libwnck/private.h
+++ b/libwnck/private.h
@@ -59,6 +59,8 @@ WnckWindow* _wnck_window_create (Window xwindow,
gint sort_order);
void _wnck_window_destroy (WnckWindow *window);
+void _wnck_window_load_icons (WnckWindow *window);
+
char* _wnck_window_get_name_for_display (WnckWindow *window,
gboolean use_icon_name,
gboolean use_state_decorations);
diff --git a/libwnck/window.c b/libwnck/window.c
index 729c51d..f8a2bf0 100644
--- a/libwnck/window.c
+++ b/libwnck/window.c
@@ -2130,6 +2130,18 @@ get_icons (WnckWindow *window)
!(window->priv->icon || window->priv->mini_icon));
}
+void
+_wnck_window_load_icons (WnckWindow *window)
+{
+ g_return_if_fail (WNCK_IS_WINDOW (window));
+
+ get_icons (window);
+ if (window->priv->need_emit_icon_changed)
+ queue_update (window); /* not done in get_icons since we call that from
+ * the update
+ */
+}
+
/**
* wnck_window_get_icon:
* @window: a #WnckWindow.
@@ -2147,11 +2159,7 @@ wnck_window_get_icon (WnckWindow *window)
{
g_return_val_if_fail (WNCK_IS_WINDOW (window), NULL);
- get_icons (window);
- if (window->priv->need_emit_icon_changed)
- queue_update (window); /* not done in get_icons since we call that from
- * the update
- */
+ _wnck_window_load_icons (window);
return window->priv->icon;
}
@@ -2173,11 +2181,7 @@ wnck_window_get_mini_icon (WnckWindow *window)
{
g_return_val_if_fail (WNCK_IS_WINDOW (window), NULL);
- get_icons (window);
- if (window->priv->need_emit_icon_changed)
- queue_update (window); /* not done in get_icons since we call that from
- * the update
- */
+ _wnck_window_load_icons (window);
return window->priv->mini_icon;
}