sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not abort on X errors

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-04-04 14:11:38 +02:00
parent 164df7bf85
commit 29d518eb55
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/src/sugar-browser.cpp
View File

@ -98,10 +98,10 @@ error_handler (Display *d, XErrorEvent *e)
gchar buf[64]; gchar buf[64];
gchar *msg; gchar *msg;
XGetErrorText (d, e->error_code, buf, 63); XGetErrorText(d, e->error_code, buf, 63);
msg = msg =
g_strdup_printf ("The program '%s' received an X Window System error.\n" g_strdup_printf("The program '%s' received an X Window System error.\n"
"This probably reflects a bug in the program.\n" "This probably reflects a bug in the program.\n"
"The error was '%s'.\n" "The error was '%s'.\n"
" (Details: serial %ld error_code %d request_code %d minor_code %d)\n", " (Details: serial %ld error_code %d request_code %d minor_code %d)\n",
@ -112,7 +112,7 @@ error_handler (Display *d, XErrorEvent *e)
e->request_code, e->request_code,
e->minor_code); e->minor_code);
g_error ("%s", msg); g_warning ("%s", msg);
return 0; return 0;
/*return (*old_handler)(d, e);*/ /*return (*old_handler)(d, e);*/
@ -142,7 +142,7 @@ sugar_browser_startup(const char *profile_path, const char *profile_name)
gtk_moz_embed_set_profile_path(profile_path, profile_name); gtk_moz_embed_set_profile_path(profile_path, profile_name);
old_handler = XSetErrorHandler (error_handler); old_handler = XSetErrorHandler(error_handler);
gtk_moz_embed_push_startup(); gtk_moz_embed_push_startup();

2
tools/build-snapshot.sh
View File

@ -1,6 +1,6 @@
VERSION=0.63 VERSION=0.63
DATE=`date +%Y%m%d` DATE=`date +%Y%m%d`
RELEASE=2.69 RELEASE=2.72
TARBALL=sugar-$VERSION-$RELEASE.${DATE}git.tar.bz2 TARBALL=sugar-$VERSION-$RELEASE.${DATE}git.tar.bz2
rm sugar-$VERSION.tar.bz2 rm sugar-$VERSION.tar.bz2