Mercurial > mplayer.hg

comparison gui/dialog/dialog.c @ 35636:840e473ba4c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restore GUI's X error handler after gtk_init(). GDK sets its own handler.
author ib
date Thu, 10 Jan 2013 15:40:43 +0000
parents 365dc9336f0d
children 78d9cfd68b34
comparison
equal deleted inserted replaced
35635:ac2a7944829c 35636:840e473ba4c0
135 #ifdef CONFIG_GTK2 135 #ifdef CONFIG_GTK2
136 gtk_disable_setlocale(); 136 gtk_disable_setlocale();
137 #endif 137 #endif
138 138
139 gtk_init(&argc, &argv); 139 gtk_init(&argc, &argv);
140 wsSetErrorHandler(); // GDK has just set its own handler
140 141
141 theme = gtk_icon_theme_get_default(); 142 theme = gtk_icon_theme_get_default();
142 143
143 if (gtkLoadIcon(theme, 16, &gdkIcon, &gdkIconMask)) { 144 if (gtkLoadIcon(theme, 16, &gdkIcon, &gdkIconMask)) {
144 guiIcon.small = GDK_PIXMAP_XID(gdkIcon); 145 guiIcon.small = GDK_PIXMAP_XID(gdkIcon);