applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bgo#629299 - Use gdk_display_get_default instead of GDK_DISPLAY

Browse source 
GDK_DISPLAY() was deprecated in GTK+ 2.22 and removed in GTK+ 3.
This commit is contained in:
Kalev Lember 2010-09-10 19:03:09 +03:00 • committed by Federico Mena Quintero
parent bfb92ffe9b
commit cd8a0ecbe2
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
panels/keybindings/eggcellrendererkeys.c
View file

@ -326,7 +326,7 @@ is_modifier (guint keycode)
XModifierKeymap *mod_keymap;
gboolean retval = FALSE;
mod_keymap = XGetModifierMapping (gdk_display);
mod_keymap = XGetModifierMapping (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
map_size = 8 * mod_keymap->max_keypermod;
i = 0;

7
typing-break/drw-monitor.c
View file

@ -146,7 +146,9 @@ drw_monitor_timeout (DrwMonitor *monitor)
priv = monitor->priv;
if (XScreenSaverQueryInfo (GDK_DISPLAY (), DefaultRootWindow (GDK_DISPLAY ()), priv->ss_info) != 0) {
if (XScreenSaverQueryInfo (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
DefaultRootWindow (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())),
priv->ss_info) != 0) {
if (priv->ss_info->idle < priv->last_idle) {
now = time (NULL);
@ -172,7 +174,8 @@ drw_monitor_setup (DrwMonitor *monitor)
priv = monitor->priv;
if (!XScreenSaverQueryExtension (GDK_DISPLAY (), &event_base, &error_base)) {
if (!XScreenSaverQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
&event_base, &error_base)) {
return FALSE;
}

4
typing-break/drw-selection.c
View file

@ -70,7 +70,7 @@ drw_selection_clear (GtkWidget *widget,
static gboolean
drw_selection_find_existing (DrwSelection *drw_selection)
{
Display *xdisplay = GDK_DISPLAY ();
Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
Window old;
gdk_error_trap_push ();
@ -120,7 +120,7 @@ drw_selection_claim (DrwSelection *drw_selection)
static void
drw_selection_negotiate (DrwSelection *drw_selection)
{
Display *xdisplay = GDK_DISPLAY ();
Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
gboolean found = FALSE;
/* We don't need both the XGrabServer() and the loop here;

2
typing-break/main.c
View file

@ -35,7 +35,7 @@ gboolean debug = FALSE;
static gboolean
have_tray (void)
{
Screen *xscreen = DefaultScreenOfDisplay (gdk_display);
Screen *xscreen = DefaultScreenOfDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
Atom selection_atom;
char *selection_atom_name;