[mutter/wayland] window: Make window_is_terminal private
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] window: Make window_is_terminal private
- Date: Tue, 18 Mar 2014 14:26:15 +0000 (UTC)
commit 1f15c85c000c9fd6b82d90c1bcdbb0f8906277b7
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Mar 18 10:08:28 2014 -0400
window: Make window_is_terminal private
src/core/window-private.h | 3 ---
src/core/window.c | 11 +++++------
2 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 52132be..1f21664 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -567,9 +567,6 @@ void meta_window_change_workspace (MetaWindow *window,
/* Return whether the window should be currently mapped */
gboolean meta_window_should_be_showing (MetaWindow *window);
-/* See warning in window.c about this function */
-gboolean __window_is_terminal (MetaWindow *window);
-
void meta_window_update_struts (MetaWindow *window);
/* this gets root coords */
diff --git a/src/core/window.c b/src/core/window.c
index 9b53584..a9d6e12 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -2399,8 +2399,8 @@ intervening_user_event_occurred (MetaWindow *window)
* behavior is worthwhile. The basic idea is to get more feedback about how
* usage scenarios of "strict" focus users and what they expect. See #326159.
*/
-gboolean
-__window_is_terminal (MetaWindow *window)
+static gboolean
+window_is_terminal (MetaWindow *window)
{
if (window == NULL || window->res_class == NULL)
return FALSE;
@@ -2476,7 +2476,7 @@ window_state_on_map (MetaWindow *window,
if (*takes_focus &&
meta_prefs_get_focus_new_windows () == G_DESKTOP_FOCUS_NEW_WINDOWS_STRICT &&
!window->display->allow_terminal_deactivation &&
- __window_is_terminal (window->display->focus_window) &&
+ window_is_terminal (window->display->focus_window) &&
!meta_window_is_ancestor_of_transient (window->display->focus_window,
window))
{
@@ -9252,9 +9252,8 @@ meta_window_set_user_time (MetaWindow *window,
/* If this is a terminal, user interaction with it means the user likely
* doesn't want to have focus transferred for now due to new windows.
*/
- if (meta_prefs_get_focus_new_windows () ==
- G_DESKTOP_FOCUS_NEW_WINDOWS_STRICT &&
- __window_is_terminal (window))
+ if (meta_prefs_get_focus_new_windows () == G_DESKTOP_FOCUS_NEW_WINDOWS_STRICT &&
+ window_is_terminal (window))
window->display->allow_terminal_deactivation = FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]