Merged from 2.4:

Sun May 16 23:23:29 2004  Matthias Clasen  <maclas@gmx.de>

        Merged from 2.4:

	* glib/gcompletion.c (g_completion_add_items):
	(g_completion_remove_items): Remove unnecessary
	checks.  (#142559, Morten Welinder)
This commit is contained in:
Matthias Clasen 2004-05-17 03:24:41 +00:00 committed by Matthias Clasen
parent 38bb555ce3
commit 96ea214603
6 changed files with 40 additions and 2 deletions

View File

@ -1,3 +1,11 @@
Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de>
Merged from 2.4:
* glib/gcompletion.c (g_completion_add_items):
(g_completion_remove_items): Remove unnecessary
checks. (#142559, Morten Welinder)
2004-05-15 Tor Lillqvist <tml@iki.fi>
* glib/gutils.c (g_get_any_init): [Win32] Only believe HOME if it

View File

@ -1,3 +1,11 @@
Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de>
Merged from 2.4:
* glib/gcompletion.c (g_completion_add_items):
(g_completion_remove_items): Remove unnecessary
checks. (#142559, Morten Welinder)
2004-05-15 Tor Lillqvist <tml@iki.fi>
* glib/gutils.c (g_get_any_init): [Win32] Only believe HOME if it

View File

@ -1,3 +1,11 @@
Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de>
Merged from 2.4:
* glib/gcompletion.c (g_completion_add_items):
(g_completion_remove_items): Remove unnecessary
checks. (#142559, Morten Welinder)
2004-05-15 Tor Lillqvist <tml@iki.fi>
* glib/gutils.c (g_get_any_init): [Win32] Only believe HOME if it

View File

@ -1,3 +1,11 @@
Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de>
Merged from 2.4:
* glib/gcompletion.c (g_completion_add_items):
(g_completion_remove_items): Remove unnecessary
checks. (#142559, Morten Welinder)
2004-05-15 Tor Lillqvist <tml@iki.fi>
* glib/gutils.c (g_get_any_init): [Win32] Only believe HOME if it

View File

@ -1,3 +1,11 @@
Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de>
Merged from 2.4:
* glib/gcompletion.c (g_completion_add_items):
(g_completion_remove_items): Remove unnecessary
checks. (#142559, Morten Welinder)
2004-05-15 Tor Lillqvist <tml@iki.fi>
* glib/gutils.c (g_get_any_init): [Win32] Only believe HOME if it

View File

@ -60,7 +60,6 @@ g_completion_add_items (GCompletion* cmp,
GList* it;
g_return_if_fail (cmp != NULL);
g_return_if_fail (items != NULL);
/* optimize adding to cache? */
if (cmp->cache)
@ -90,7 +89,6 @@ g_completion_remove_items (GCompletion* cmp,
GList* it;
g_return_if_fail (cmp != NULL);
g_return_if_fail (items != NULL);
it = items;
while (cmp->items && it)