[metacity] ui: remove screen parameter from meta_ui_new
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] ui: remove screen parameter from meta_ui_new
- Date: Fri, 10 Mar 2017 23:09:22 +0000 (UTC)
commit 1cd29a45067ffce418f3219f9baee3f9ec648132
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Fri Mar 10 23:04:23 2017 +0200
ui: remove screen parameter from meta_ui_new
src/core/screen.c | 3 +--
src/include/ui.h | 3 +--
src/ui/ui.c | 5 +----
3 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/src/core/screen.c b/src/core/screen.c
index 460760a..316e936 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -580,8 +580,7 @@ meta_screen_new (MetaDisplay *display,
screen->keys_grabbed = FALSE;
meta_screen_grab_keys (screen);
- screen->ui = meta_ui_new (screen->display->xdisplay,
- screen->xscreen);
+ screen->ui = meta_ui_new (screen->display->xdisplay);
screen->tab_popup = NULL;
screen->tile_preview = NULL;
diff --git a/src/include/ui.h b/src/include/ui.h
index 9899e94..10e7398 100644
--- a/src/include/ui.h
+++ b/src/include/ui.h
@@ -53,8 +53,7 @@ void meta_ui_remove_event_func (Display *xdisplay,
MetaEventFunc func,
gpointer data);
-MetaUI* meta_ui_new (Display *xdisplay,
- Screen *screen);
+MetaUI* meta_ui_new (Display *xdisplay);
void meta_ui_free (MetaUI *ui);
void meta_ui_theme_get_frame_borders (MetaUI *ui,
diff --git a/src/ui/ui.c b/src/ui/ui.c
index 533d0a6..9951536 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -47,7 +47,6 @@ static void meta_ui_accelerator_parse (const char *accel,
struct _MetaUI
{
Display *xdisplay;
- Screen *xscreen;
MetaFrames *frames;
/* For double-click tracking */
@@ -280,15 +279,13 @@ meta_ui_remove_event_func (Display *xdisplay,
}
MetaUI*
-meta_ui_new (Display *xdisplay,
- Screen *screen)
+meta_ui_new (Display *xdisplay)
{
GdkDisplay *gdisplay;
MetaUI *ui;
ui = g_new0 (MetaUI, 1);
ui->xdisplay = xdisplay;
- ui->xscreen = screen;
gdisplay = gdk_x11_lookup_xdisplay (xdisplay);
g_assert (gdisplay == gdk_display_get_default ());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]