isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-05 16:14:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename errors.[ch] to meta-x11-errors.[ch]

Browse Source 
Also rename meta_error_trap_* to meta_x11_error_trap_* and
move meta-x11-errors.c to src/x11

https://bugzilla.gnome.org/show_bug.cgi?id=759538
This commit is contained in:
Armin Krezović
2017-08-27 20:48:55 +02:00
committed by Jonas Ådahl
parent 2ac7afe8a9
commit 390314adfb
33 changed files with 193 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/x11/meta-x11-errors.c Normal file
View File

@@ -0,0 +1,62 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/*
* Copyright (C) 2001 Havoc Pennington, error trapping inspired by GDK
* code copyrighted by the GTK team.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/**
* SECTION:errors
* @title: Errors
* @short_description: Mutter X error handling
*/
#include <config.h>
#include <meta/meta-x11-errors.h>
#include <errno.h>
#include <stdlib.h>
#include <gdk/gdkx.h>
#include "x11/meta-x11-display-private.h"
/* In GTK+-3.0, the error trapping code was significantly rewritten. The new code
* has some neat features (like knowing automatically if a sync is needed or not
* and handling errors asynchronously when the error code isn't needed immediately),
* but it's basically incompatible with the hacks we played with GTK+-2.0 to
* use a custom error handler along with gdk_error_trap_push().
*
* Since the main point of our custom error trap was to get the error logged
* to the right place, with GTK+-3.0 we simply omit our own error handler and
* use the GTK+ handling straight-up.
* (See https://bugzilla.gnome.org/show_bug.cgi?id=630216 for restoring logging.)
*/
void
meta_x11_error_trap_push (MetaX11Display *x11_display)
{
gdk_x11_display_error_trap_push (x11_display->gdk_display);
}
void
meta_x11_error_trap_pop (MetaX11Display *x11_display)
{
gdk_x11_display_error_trap_pop_ignored (x11_display->gdk_display);
}
int
meta_x11_error_trap_pop_with_return (MetaX11Display *x11_display)
{
return gdk_x11_display_error_trap_pop (x11_display->gdk_display);
}