This function can now officially return NULL. Two windows can't belong to

2008-07-12  Thomas Thurman  <tthurman@gnome.org>

        * src/core/group.c (meta_window_get_group): This function can now
        officially return NULL.
        * src/core/window.c (meta_window_same_application): Two windows can't
        belong to the same application unless they both belong to some
        application.  (Both belonging to no application is not the same.)
        
        Closes #453022.

svn path=/trunk/; revision=3785
This commit is contained in:
Thomas Thurman 2008-07-13 03:26:39 +00:00 committed by Thomas James Alexander Thurman
parent 77820c9697
commit 6bf62be4d0
3 changed files with 15 additions and 5 deletions

View File

@ -1,4 +1,12 @@
2008-06-30 Thomas Thurman <tthurman@gnome.org 2008-07-12 Thomas Thurman <tthurman@gnome.org>
* src/core/group.c (meta_window_get_group): This function can now
officially return NULL.
* src/core/window.c (meta_window_same_application): Two windows can't
belong to the same application unless they both belong to some
application. (Both belonging to no application is not the same.)
2008-06-30 Thomas Thurman <tthurman@gnome.org>
* src/core/bell.c (meta_bell_set_audible): Fix typo that * src/core/bell.c (meta_bell_set_audible): Fix typo that
slipped through. slipped through.

View File

@ -109,8 +109,6 @@ meta_window_get_group (MetaWindow *window)
if (window->unmanaging) if (window->unmanaging)
return NULL; return NULL;
g_assert (window->group != NULL);
return window->group; return window->group;
} }

View File

@ -7556,9 +7556,13 @@ gboolean
meta_window_same_application (MetaWindow *window, meta_window_same_application (MetaWindow *window,
MetaWindow *other_window) MetaWindow *other_window)
{ {
MetaGroup *group = meta_window_get_group (window);
MetaGroup *other_group = meta_window_get_group (other_window);
return return
meta_window_get_group (window) == group!=NULL &&
meta_window_get_group (other_window); other_group!=NULL &&
group==other_group;
} }
void void