* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
GdkDisplay *display;
display = _gdk_x11_display_open (name);
- if (manager_x11->default_display == NULL)
+ if (manager_x11->default_display == NULL && display != NULL)
gdk_display_manager_set_default_display (manager, display);
return display;
{
GDK_X11_DISPLAY_MANAGER (manager)->default_display = display;
- _gdk_x11_display_make_default (display);
+ if (display)
+ _gdk_x11_display_make_default (display);
}
static void
manager_class->get_atom_name = _gdk_x11_display_manager_get_atom_name;
manager_class->lookup_keyval = _gdk_x11_display_manager_lookup_keyval;
manager_class->get_keyval_name = _gdk_x11_display_manager_get_keyval_name;
+#ifdef HAVE_XCONVERTCASE
manager_class->keyval_convert_case = _gdk_x11_display_manager_keyval_convert_case;
+#endif
}
void