~ubuntu-dev/ubuntu/lucid/mutter/lucid-201002110959

« back to all changes in this revision

Viewing changes to src/core/errors.c

Committer: Bazaar Package Importer
Author(s): Didier Roche
Date: 2009-09-05 16:23:00 UTC
mfrom: (1.1.3 upstream)
Revision ID: james.westby@ubuntu.com-20090905162300-uh014j826cs7xe76

Tags: 2.27.4-0ubuntu1

* New upstream release
* add debian/watch

files added:
watch

files modified:
configure

configure.in

debian/changelog

mkinstalldirs

po/es.po

po/eu.po

po/gl.po

po/hu.po

po/sv.po

src/Makefile.am

src/Makefile.in

src/compositor/compositor-private.h

src/compositor/compositor.c

src/compositor/mutter-plugin-manager.c

src/compositor/mutter-plugin.c

src/compositor/mutter-window-group.c

src/compositor/mutter-window.c

src/core/boxes.c

src/core/constraints.c

src/core/display-private.h

src/core/display.c

src/core/edge-resistance.c

src/core/errors.c

src/core/keybindings-private.h

src/core/keybindings.c

src/core/main.c

src/core/place.c

src/core/screen-private.h

src/core/screen.c

src/core/stack.c

src/core/testboxes.c

src/core/window-private.h

src/core/window-props.c

src/core/window.c

src/core/workspace-private.h

src/core/workspace.c

src/include/all-keybindings.h

src/include/atomnames.h

src/include/boxes.h

src/include/common.h

src/include/display.h

src/include/errors.h

src/include/mutter-plugin.h

src/include/screen.h

src/include/window.h

src/include/workspace.h

src/mutter-enum-types.c

src/mutter-enum-types.h

src/mutter-wm.desktop

src/mutter-wm.desktop.in

src/mutter.desktop

src/mutter.desktop.in

src/mutter.schemas.in

src/tools/mutter-window-demo.c

src/ui/menu.c

src/ui/testgradient.c

src/ui/theme-viewer.c

Show diffs side-by-side

added added

removed removed

src/core/errors.c

XSetIOErrorHandler (x_io_error_handler);

}

typedef struct ForeignDisplay ForeignDisplay;

struct ForeignDisplay

{

Display *dpy;

ErrorHandler handler;

gpointer data;

ForeignDisplay *next;

};

static ForeignDisplay *foreign_displays;

void

meta_errors_register_foreign_display (Display *foreign_dpy,

ErrorHandler handler,

gpointer data)

{

ForeignDisplay *info = g_new0 (ForeignDisplay, 1);

info->dpy = foreign_dpy;

info->handler = handler;

info->data = data;

info->next = foreign_displays;

foreign_displays = info;

}

static void

meta_error_trap_push_internal (MetaDisplay *display,

gboolean need_sync)

206

181

int retval;

207

182

gchar buf[64];

208

183

MetaDisplay *display;

209

ForeignDisplay *foreign;

210

211

for (foreign = foreign_displays; foreign != NULL; foreign = foreign->next)

212

{

213

if (foreign->dpy == xdisplay)

214

{

215

foreign->handler (xdisplay, error, foreign->data);

216

217

return 0;

218

}

219

}

220

184

221

185

XGetErrorText (xdisplay, error->error_code, buf, 63);

222

186

223

187

display = meta_display_for_x_display (xdisplay);

Older »