diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-05-20 21:29:19 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-05-20 21:29:19 +0000 |
| commit | 5f3ce6afb80b729f4d4656134878e6539a8d1763 (patch) | |
| tree | 135fee9e2b51981b3f0990fe2d036c9506d8c558 | |
| parent | 2775064ab95e3325dea1fca182b941b6c5b0014f (diff) | |
| download | gdk-pixbuf-5f3ce6afb80b729f4d4656134878e6539a8d1763.tar.gz | |
Silently accept a missing gtk.immodules file, some people want to run
Tue May 20 17:27:24 2003 Owen Taylor <otaylor@redhat.com>
* 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)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | gtk/gtkimmodule.c | 9 |
6 files changed, 41 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Tue May 20 17:27:24 2003 Owen Taylor <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * gtk/gtkwindow.c (gtk_window_compute_hints): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4a23acb99..836b421cc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Tue May 20 17:27:24 2003 Owen Taylor <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * gtk/gtkwindow.c (gtk_window_compute_hints): Fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4a23acb99..836b421cc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Tue May 20 17:27:24 2003 Owen Taylor <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * gtk/gtkwindow.c (gtk_window_compute_hints): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4a23acb99..836b421cc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Tue May 20 17:27:24 2003 Owen Taylor <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * gtk/gtkwindow.c (gtk_window_compute_hints): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4a23acb99..836b421cc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Tue May 20 17:27:24 2003 Owen Taylor <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * 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; } |