[metacity] window: rename meta_window_free to meta_window_unmanage



commit 28cbe93affa5a956e5215e1d3c37e753bdf634bc
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Mar 12 19:58:51 2017 +0200

    window: rename meta_window_free to meta_window_unmanage

 src/core/display.c        |    8 ++++----
 src/core/window-private.h |    4 ++--
 src/core/window-props.c   |    2 +-
 src/core/window.c         |    6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index c09cb58..7003d88 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -806,7 +806,7 @@ meta_display_unmanage_windows (MetaDisplay *display,
   tmp = winlist;
   while (tmp != NULL)
     {
-      meta_window_free (tmp->data, timestamp);
+      meta_window_unmanage (tmp->data, timestamp);
 
       tmp = tmp->next;
     }
@@ -860,7 +860,7 @@ meta_display_close (MetaDisplay *display,
     }
 #endif
 
-  /* Must be after all calls to meta_window_free() since they
+  /* Must be after all calls to meta_window_unmanage() since they
    * unregister windows
    */
   g_hash_table_destroy (display->window_ids);
@@ -2262,7 +2262,7 @@ event_callback (XEvent   *event,
           else
             {
               /* Unmanage destroyed window */
-              meta_window_free (window, timestamp);
+              meta_window_unmanage (window, timestamp);
               window = NULL;
             }
         }
@@ -2292,7 +2292,7 @@ event_callback (XEvent   *event,
 
                   /* Unmanage withdrawn window */
                   window->withdrawn = TRUE;
-                  meta_window_free (window, timestamp);
+                  meta_window_unmanage (window, timestamp);
                   window = NULL;
                 }
               else
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 379b41a..2987331 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -292,7 +292,7 @@ struct _MetaWindow
   /* Has this window not ever been shown yet? */
   guint showing_for_first_time : 1;
 
-  /* Are we in meta_window_free()? */
+  /* Are we in meta_window_unmanage()? */
   guint unmanaging : 1;
 
   /* Are we in meta_window_new()? */
@@ -460,7 +460,7 @@ MetaWindow* meta_window_new                (MetaDisplay    *display,
                                             Window          xwindow,
                                             gboolean        must_be_viewable,
                                             MetaEffectType  effect);
-void        meta_window_free               (MetaWindow  *window,
+void        meta_window_unmanage           (MetaWindow  *window,
                                             guint32      timestamp);
 void        meta_window_calc_showing       (MetaWindow  *window);
 void        meta_window_queue              (MetaWindow  *window,
diff --git a/src/core/window-props.c b/src/core/window-props.c
index c835431..07c47fb 100644
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -1676,7 +1676,7 @@ reload_transient_for (MetaWindow    *window,
 
           window->xtransient_for = old_transient_for;
           timestamp = meta_display_get_current_time_roundtrip (window->display);
-          meta_window_free (window, timestamp);
+          meta_window_unmanage (window, timestamp);
           return;
         }
     }
diff --git a/src/core/window.c b/src/core/window.c
index 254abf1..679b34a 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1011,8 +1011,8 @@ detach_foreach_func (MetaWindow *window,
 }
 
 void
-meta_window_free (MetaWindow  *window,
-                  guint32      timestamp)
+meta_window_unmanage (MetaWindow *window,
+                      guint32     timestamp)
 {
   GList *tmp;
 
@@ -1044,7 +1044,7 @@ meta_window_free (MetaWindow  *window,
                                      detach_foreach_func,
                                      &attached_children);
       for (iter = attached_children; iter; iter = iter->next)
-        meta_window_free (iter->data, timestamp);
+        meta_window_unmanage (iter->data, timestamp);
       g_list_free (attached_children);
     }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]