isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: Remove gdk_screen property/getter

Browse Source 
It's used nowhere.
This commit is contained in:
Carlos Garnacho 2017-12-14 17:22:59 +01:00
parent d1bebba77a
commit 8c3f5b615f
3 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/ui/modalDialog.js
View File

@ -215,7 +215,7 @@ var ModalDialog = new Lang.Class({
else else
this._savedKeyFocus = null; this._savedKeyFocus = null;
Main.popModal(this._group, timestamp); Main.popModal(this._group, timestamp);
global.gdk_screen.get_display().sync(); Gdk.Display.get_default().sync();
this._hasModal = false; this._hasModal = false;
if (!this._shellReactive) if (!this._shellReactive)

28
src/shell-global.c
View File

@ -63,7 +63,6 @@ struct _ShellGlobal {
GdkDisplay *gdk_display; GdkDisplay *gdk_display;
Display *xdisplay; Display *xdisplay;
MetaScreen *meta_screen; MetaScreen *meta_screen;
GdkScreen *gdk_screen;
char *session_mode; char *session_mode;
@ -98,7 +97,6 @@ enum {
PROP_SESSION_MODE, PROP_SESSION_MODE,
PROP_SCREEN, PROP_SCREEN,
PROP_GDK_SCREEN,
PROP_DISPLAY, PROP_DISPLAY,
PROP_SCREEN_WIDTH, PROP_SCREEN_WIDTH,
PROP_SCREEN_HEIGHT, PROP_SCREEN_HEIGHT,
@ -168,9 +166,6 @@ shell_global_get_property(GObject *object,
case PROP_SCREEN: case PROP_SCREEN:
g_value_set_object (value, global->meta_screen); g_value_set_object (value, global->meta_screen);
break; break;
case PROP_GDK_SCREEN:
g_value_set_object (value, global->gdk_screen);
break;
case PROP_DISPLAY: case PROP_DISPLAY:
g_value_set_object (value, global->meta_display); g_value_set_object (value, global->meta_display);
break; break;
@ -379,14 +374,6 @@ shell_global_class_init (ShellGlobalClass *klass)
META_TYPE_SCREEN, META_TYPE_SCREEN,
G_PARAM_READABLE)); G_PARAM_READABLE));
g_object_class_install_property (gobject_class,
PROP_GDK_SCREEN,
g_param_spec_object ("gdk-screen",
"GdkScreen",
"Gdk screen object for the shell",
GDK_TYPE_SCREEN,
G_PARAM_READABLE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SCREEN_WIDTH, PROP_SCREEN_WIDTH,
g_param_spec_int ("screen-width", g_param_spec_int ("screen-width",
@ -695,19 +682,6 @@ shell_global_get_screen (ShellGlobal *global)
return global->meta_screen; return global->meta_screen;
} }
/**
* shell_global_get_gdk_screen:
*
* Return value: (transfer none): Gdk screen object for the shell
*/
GdkScreen *
shell_global_get_gdk_screen (ShellGlobal *global)
{
g_return_val_if_fail (SHELL_IS_GLOBAL (global), NULL);
return global->gdk_screen;
}
/** /**
* shell_global_get_display: * shell_global_get_display:
* *
@ -881,8 +855,6 @@ _shell_global_set_plugin (ShellGlobal *global,
global->xdisplay = meta_display_get_xdisplay (global->meta_display); global->xdisplay = meta_display_get_xdisplay (global->meta_display);
global->gdk_display = gdk_x11_lookup_xdisplay (global->xdisplay); global->gdk_display = gdk_x11_lookup_xdisplay (global->xdisplay);
global->gdk_screen = gdk_display_get_screen (global->gdk_display,
meta_screen_get_screen_number (global->meta_screen));
global->stage = CLUTTER_STAGE (meta_get_stage_for_screen (global->meta_screen)); global->stage = CLUTTER_STAGE (meta_get_stage_for_screen (global->meta_screen));

1
src/shell-global.h
View File

@ -17,7 +17,6 @@ ShellGlobal *shell_global_get (void);
ClutterStage *shell_global_get_stage (ShellGlobal *global); ClutterStage *shell_global_get_stage (ShellGlobal *global);
MetaScreen *shell_global_get_screen (ShellGlobal *global); MetaScreen *shell_global_get_screen (ShellGlobal *global);
GdkScreen *shell_global_get_gdk_screen (ShellGlobal *global);
MetaDisplay *shell_global_get_display (ShellGlobal *global); MetaDisplay *shell_global_get_display (ShellGlobal *global);
GList *shell_global_get_window_actors (ShellGlobal *global); GList *shell_global_get_window_actors (ShellGlobal *global);
GSettings *shell_global_get_settings (ShellGlobal *global); GSettings *shell_global_get_settings (ShellGlobal *global);