isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-04 07:34:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

frames: Use an early return

Browse Source 
To be more consistent with the rest of the code.
This commit is contained in:
Jasper St. Pierre 2014-12-31 22:42:31 -08:00
parent 015864da09
commit c8432cc430
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/ui/frames.c
View File

@ -554,33 +554,34 @@ meta_frames_unmanage_window (MetaFrames *frames,
frame = g_hash_table_lookup (frames->frames, &xwindow); frame = g_hash_table_lookup (frames->frames, &xwindow);
if (frame) if (!frame)
{ {
/* restore the cursor */ meta_warning ("Frame 0x%lx not managed, can't unmanage\n", xwindow);
meta_core_set_screen_cursor (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), return;
frame->xwindow,
META_CURSOR_DEFAULT);
gdk_window_set_user_data (frame->window, NULL);
if (frames->last_motion_frame == frame)
frames->last_motion_frame = NULL;
g_hash_table_remove (frames->frames, &frame->xwindow);
meta_style_info_unref (frame->style_info);
gdk_window_destroy (frame->window);
if (frame->text_layout)
g_object_unref (G_OBJECT (frame->text_layout));
g_free (frame->title);
g_free (frame);
} }
else
meta_warning ("Frame 0x%lx not managed, can't unmanage\n", xwindow); /* restore the cursor */
meta_core_set_screen_cursor (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
frame->xwindow,
META_CURSOR_DEFAULT);
gdk_window_set_user_data (frame->window, NULL);
if (frames->last_motion_frame == frame)
frames->last_motion_frame = NULL;
g_hash_table_remove (frames->frames, &frame->xwindow);
meta_style_info_unref (frame->style_info);
gdk_window_destroy (frame->window);
if (frame->text_layout)
g_object_unref (G_OBJECT (frame->text_layout));
g_free (frame->title);
g_free (frame);
} }
static MetaUIFrame* static MetaUIFrame*