From 04e26775a0a41e71295a9635fecd11fe1a9916fb Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 20 May 2003 21:30:21 +0000 Subject: [PATCH] Silently accept a missing gtk.immodules file, some people want to run Tue May 20 17:27:24 2003 Owen Taylor * gtk/gtkimmodule.c (gtk_im_module_init): Silently accept a missing gtk.immodules file, some people want to run without one. (#112406, patch from Arnaud Charlet) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkimmodule.c | 9 ++++++--- po/ChangeLog | 6 ++---- 7 files changed, 43 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1560cfbaf..8e240a26e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue May 20 17:27:24 2003 Owen Taylor + + * gtk/gtkimmodule.c (gtk_im_module_init): Silently + accept a missing gtk.immodules file, some people + want to run without one. (#112406, patch from + Arnaud Charlet) + Tue May 20 17:05:31 2003 Owen Taylor * gtk/gtkwindow.c (gtk_window_compute_hints): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1560cfbaf..8e240a26e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Tue May 20 17:27:24 2003 Owen Taylor + + * gtk/gtkimmodule.c (gtk_im_module_init): Silently + accept a missing gtk.immodules file, some people + want to run without one. (#112406, patch from + Arnaud Charlet) + Tue May 20 17:05:31 2003 Owen Taylor * gtk/gtkwindow.c (gtk_window_compute_hints): Fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1560cfbaf..8e240a26e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Tue May 20 17:27:24 2003 Owen Taylor + + * gtk/gtkimmodule.c (gtk_im_module_init): Silently + accept a missing gtk.immodules file, some people + want to run without one. (#112406, patch from + Arnaud Charlet) + Tue May 20 17:05:31 2003 Owen Taylor * gtk/gtkwindow.c (gtk_window_compute_hints): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1560cfbaf..8e240a26e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Tue May 20 17:27:24 2003 Owen Taylor + + * gtk/gtkimmodule.c (gtk_im_module_init): Silently + accept a missing gtk.immodules file, some people + want to run without one. (#112406, patch from + Arnaud Charlet) + Tue May 20 17:05:31 2003 Owen Taylor * gtk/gtkwindow.c (gtk_window_compute_hints): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1560cfbaf..8e240a26e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Tue May 20 17:27:24 2003 Owen Taylor + + * gtk/gtkimmodule.c (gtk_im_module_init): Silently + accept a missing gtk.immodules file, some people + want to run without one. (#112406, patch from + Arnaud Charlet) + Tue May 20 17:05:31 2003 Owen Taylor * gtk/gtkwindow.c (gtk_window_compute_hints): Fix diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c index 90193cfab..042c9024c 100644 --- a/gtk/gtkimmodule.c +++ b/gtk/gtkimmodule.c @@ -279,9 +279,12 @@ gtk_im_module_init () file = fopen (filename, "r"); if (!file) { - g_warning ("Can not open Input Method module file '%s': %s", - filename, g_strerror (errno)); - /* We are leaking all kinds of memory here. */ + /* In case someone wants only the default input method, + * we allow no file at all. + */ + g_string_free (line_buf, TRUE); + g_string_free (tmp_buf, TRUE); + g_free (filename); return; } diff --git a/po/ChangeLog b/po/ChangeLog index 3d79d9c1f..87ac54277 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,8 +1,6 @@ -2003-05-19 Arafat Medini - - * ar.po: Added Arabic translation by - Arabeyes. +2003-05-19 Arafat Medini + * ar.po: Added Arabic translation by Arabeyes. 2003-05-18 KAMAGASAKO Masatoshi -- 2.43.2